Merge lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0rc1 into lp:ubuntu/precise/cairo-dock-plug-ins

[Matthieu Baerts]

Hello,

The Cairo-Dock team proposes a new "bugs fixed" version of their Cairo-Dock packages.

This is the Upstream (short) ChangeLog:
 * Upstream ChangeLog: (main changes)
   - Updated translations
   - MusicPlayer:
    + When choosing the player the first time, launch it and set the name
    + It seems the latest stable version of rhythmbox now re-uses this DBus
       address: org.mpris.MediaPlayer2.rhythmbox
   - Use the default bg color for always visible icons
   - GMenu: check if kde4-applications.menu and lxde-applications.menu
      are available
   - Dbus:
    + Bash interface: fixed a typo
    + Changed the third-party applets dir on the server for the 3.0
    + Enabling threads on the Python Interface
    + Modified the old SetEmblem method to use the new overlays
   - Enable GVFS if detected
   - Indicators: handle the case where the service crashes
   - Status-Notifier:
    + Indicator 0.4.90 (and newer) has a new variable (Title)
    + Display Label first if it's available instead of Title first
    + Fixed a bug with empty labels
    + KDE's watcher: if ItemIsMenu is true (e.g. Klipper) and if we only show
       the menu on left click, we emit a signal to the application to show
       its own menu
    + checked if the menu path is different that '/NO_DBUSMENU'
    + IAS: checked if an item is not already available in the systray
       (workaround) and fixed a few typos
    + Added a space between icons and fixed the wrong drawing of the icon
       on a vertical dock if the icon can be resized
    + Used cairo_dock_add_path_to_icon_theme
   - Sound control:
    + Fixed a small bug on reload (invisible icon)
    + Updated the Dbus names to match with Ubuntu 12.04
    + Backported the latest version of Ubuntu's indicator-sound into the
       Sound-Control applet
    + Make some items in the menu invisible if not available
    + Worked around a bug in libindicator, which keeps internally
       the service pointer
   - Logout:
    + Fixed a tiny memory leak
    + Look for a different icon's size if we want to display this icon in
       a menu/a dock/an emblem
   - PowerManager:
    + Removed an extraseparators in the menu
   - Clock:
    + Used the logical rectangle in order to fix the position of the text
    + Removed unused files
    + Removed useless translations (log.x and log.y = 0)
    + Only used this ratio to limit the deformation with the height
    + Fixed a problem with the ratio if this applet is displayed in
       a vertical dock
   - Remote Control: fixed a crash during the 'click' signal
   - Slider:
    + When reloading, display the changes immediately
    + Added the possibility to refresh the images list from the menu
    + Fixed the loading of the image on startup, when the applet's size is
       not yet stable
    + Code cleaning
   - Fixed an error when compiling without libindicator
   - A few minor changes (comments, factorisation, etc)
   - Recent-Events: if zeitgeist is not yet running on first search,
      try 3 times before giving up.

This bzr branch has been linked to this bug report: lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0rc1
This branch should be ready to be pushed on lp:ubuntu/cairo-dock-plug-ins (except the UNRELEASED version in debian/changelog)

Thank you for your help! ;)

PS: 'cairo-dock' package has to be uploaded before this package! (if possible, 30min before) ( LP: #961578 )

[lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0rc1]

26. By Matthieu Baerts on 2012-03-21

* New upstream release. (LP: #961579)
* Upstream ChangeLog: (main changes)
 - Updated translations
 - MusicPlayer:
  + When choosing the player the first time, launch it and set the name
  + It seems the latest stable version of rhythmbox now re-uses this DBus
     address: org.mpris.MediaPlayer2.rhythmbox
 - Use the default bg color for always visible icons
 - GMenu: check if kde4-applications.menu and lxde-applications.menu
    are available
 - Dbus:
  + Bash interface: fixed a typo
  + Changed the third-party applets dir on the server for the 3.0
  + Enabling threads on the Python Interface
  + Modified the old SetEmblem method to use the new overlays
 - Enable GVFS if detected
 - Indicators: handle the case where the service crashes
 - Status-Notifier:
  + Indicator 0.4.90 (and newer) has a new variable (Title)
  + Display Label first if it's available instead of Title first
  + Fixed a bug with empty labels
  + KDE's watcher: if ItemIsMenu is true (e.g. Klipper) and if we only show
     the menu on left click, we emit a signal to the application to show
     its own menu
  + checked if the menu path is different that '/NO_DBUSMENU'
  + IAS: checked if an item is not already available in the systray
     (workaround) and fixed a few typos
  + Added a space between icons and fixed the wrong drawing of the icon
     on a vertical dock if the icon can be resized
  + Used cairo_dock_add_path_to_icon_theme
 - Sound control:
  + Fixed a small bug on reload (invisible icon)
  + Updated the Dbus names to match with Ubuntu 12.04
  + Backported the latest version of Ubuntu's indicator-sound into the
     Sound-Control applet
  + Make some items in the menu invisible if not available
  + Worked around a bug in libindicator, which keeps internally
     the service pointer
 - Logout:
  + Fixed a tiny memory leak
  + Look for a different icon's size if we want to display this icon in
     a menu/a dock/an emblem
 - PowerManager:
  + Removed an extraseparators in the menu
 - Clock:
  + Used the logical rectangle in order to fix the position of the text
  + Removed unused files
  + Removed useless translations (log.x and log.y = 0)
  + Only used this ratio to limit the deformation with the height
  + Fixed a problem with the ratio if this applet is displayed in
     a vertical dock
 - Remote Control: fixed a crash during the 'click' signal
 - Slider:
  + When reloading, display the changes immediately
  + Added the possibility to refresh the images list from the menu
  + Fixed the loading of the image on startup, when the applet's size is
     not yet stable
  + Code cleaning
 - Fixed an error when compiling without libindicator
 - A few minor changes (comments, factorisation, etc)
 - Recent-Events: if zeitgeist is not yet running on first search,
    try 3 times before giving up.
* debian/control:
 - Updated the version of cairo-dock-[core;data;dev].

[Jamie Strandboge (jdstrand)]

Verified changes against the upstream tarball and successfully build locally. ACK. Thanks!

review: Approve

[Matthieu Baerts (matttbe)]

Thank you for your help :)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-02-16 01:45:57 +0000
+++ CMakeLists.txt	2012-03-21 20:37:19 +0000
@@ -11,7 +11,7 @@
 ########### project ###############
 
 project ("cairo-dock-plugins")
-set (VERSION "3.0.0.0beta1")
+set (VERSION "3.0.0.0rc1")
 
 add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration -Wstrict-prototypes) # removed for stable versions: -Wstrict-prototypes #-Wunreachable-code -Wno-unused-parameter -Wall
 if (NOT ${CMAKE_BUILD_TYPE})
@@ -178,7 +178,7 @@
 endif()
 pkg_check_modules (IDO ${IDO_MODULE})
 
-if ("${INDICATOR_APPLET_FOUND}" STREQUAL "1" AND "${DBUSMENU_FOUND}" STREQUAL "1" AND "${DBUSMENU_GTK_FOUND}" STREQUAL "1")
+if ("${DBUSMENU_FOUND}" STREQUAL "1" AND "${DBUSMENU_GTK_FOUND}" STREQUAL "1")
 	STRING (REGEX REPLACE "\\..*" "" DBUSMENU_MAJOR "${DBUSMENU_VERSION}")
 	STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" DBUSMENU_MINOR "${DBUSMENU_VERSION}")  # 0.1.7 => 1.7
 	STRING (REGEX REPLACE "\\.[0-9]*" "" DBUSMENU_MINOR "${DBUSMENU_MINOR}")
@@ -190,15 +190,28 @@
 	STRING (REGEX REPLACE "\\.[0-9]*" "" DBUSMENU_GTK_MINOR "${DBUSMENU_GTK_MINOR}")
 	STRING (REGEX REPLACE ".*\\." "" DBUSMENU_GTK_NANO "${DBUSMENU_GTK_VERSION}")
 	STRING (REGEX REPLACE "-.*" "" DBUSMENU_GTK_NANO "${DBUSMENU_GTK_NANO}")
+	
+	if (${DBUSMENU_GTK_MAJOR} GREATER 0 OR ${DBUSMENU_GTK_MINOR} GREATER 5
+	    OR (${DBUSMENU_GTK_MINOR} EQUAL 5 AND ${DBUSMENU_GTK_NANO} GREATER 89))
+		set (DBUSMENU_GTK3_NEW 1)
+		set (INDICATOR_APPLICATIONADDED_HAS_TITLE 1) # Status-Notifier: new parameter "Title" in the "added" signal since Precise
+	else()
+		set (INDICATOR_APPLICATIONADDED_HAS_TITLE 0)
+	endif()
+endif()
 
+if ("${INDICATOR_APPLET_FOUND}" STREQUAL "1")
 	STRING (REGEX REPLACE "\\..*" "" INDICATOR_MAJOR "${INDICATOR_APPLET_VERSION}")
 	STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" INDICATOR_MINOR "${INDICATOR_APPLET_VERSION}")  # 0.1.7 => 1.7
 	STRING (REGEX REPLACE "\\.[0-9]*" "" INDICATOR_MINOR "${INDICATOR_MINOR}")
 	STRING (REGEX REPLACE ".*\\." "" INDICATOR_NANO "${INDICATOR_APPLET_VERSION}")
 	STRING (REGEX REPLACE "-.*" "" INDICATOR_NANO "${INDICATOR_NANO}")
-
-	if (${DBUSMENU_GTK_MAJOR} GREATER 0 OR ${DBUSMENU_GTK_MINOR} GREATER 5 OR (${DBUSMENU_GTK_MINOR} EQUAL 5 AND ${DBUSMENU_GTK_NANO} GREATER 89))
-		set (DBUSMENU_GTK3_NEW 1)
+	
+	if (${INDICATOR_MAJOR} GREATER 0 OR ${INDICATOR_MINOR} GREATER 4
+	    OR (${INDICATOR_MINOR} EQUAL 4 AND ${INDICATOR_NANO} GREATER 89))
+		set (SOUND_SERVICE_VERSION 1) # Sound-Menu: new DBus path
+	else() # older than Precise.
+		set (SOUND_SERVICE_VERSION 0)
 	endif()
 
 	if ("${INDICATOR_NEW_VERSION}" STREQUAL "1")  # oneiric and newer
@@ -225,7 +238,9 @@
 	STRING (REGEX REPLACE "\n" "" INDICATORICONSDIR ${INDICATORICONSDIR})  # la commande rajoute un retour chariot ...
 	add_subdirectory (Indicator-applet)
 	set (with_indicator "yes")
-else()
+endif()
+
+if (NOT "${DBUSMENU_FOUND}" STREQUAL "1" OR NOT "${DBUSMENU_GTK_FOUND}" STREQUAL "1" OR NOT "${INDICATOR_APPLET_FOUND}" STREQUAL "1")
 	message (WARNING "These modules are required to compile Indicators applet (MeMenu, Messaging-Menu, Sound-Control, Status-Notifier and Global-Menu): ${INDICATOR_APPLET_MODULE}(-0.4), ${IDO_MODULE}, ${DBUSMENU_MODULE}(-0.4), ${DBUSMENU_GTK_MODULE}(-0.4)")
 	set (MODULES_MISSING "${MODULES_MISSING} ${INDICATOR_APPLET_MODULE}(-0.4) (${IDO_MODULE}) ${DBUSMENU_MODULE}(-0.4) ${DBUSMENU_GTK_MODULE}(-0.4)")
 endif()
@@ -248,6 +263,51 @@
 	message (STATUS "  Indicators: use old Ayatana Dbus names")
 endif()
 
+############# DISTRIBUTION #################
+message (STATUS "> Distribution:")
+# We try to detect if the user is on Ubuntu to know which bus we have to use...
+execute_process(
+	COMMAND lsb_release -i
+	OUTPUT_VARIABLE DISTRO_ID)  # -> "Distributor ID:	Ubuntu"
+if (NOT "${DISTRO_ID}" STREQUAL "") # this tool isn't available on all distributions
+	STRING (REGEX REPLACE "\n" "" DISTRO_ID ${DISTRO_ID})  # retour chariot
+	STRING (REGEX REPLACE ".*: *\t*" "" DISTRO_ID ${DISTRO_ID})
+
+	execute_process(
+		COMMAND lsb_release -r
+		OUTPUT_VARIABLE DISTRO_RELEASE)  # -> "Release:	10.10"
+	STRING (REGEX REPLACE "\n" "" DISTRO_RELEASE ${DISTRO_RELEASE})  # retour chariot
+	STRING (REGEX REPLACE ".*: *\t*" "" DISTRO_RELEASE ${DISTRO_RELEASE})
+else()
+	# on Ubuntu deb builders, lsb_release isn't available but we can have a look to /etc/issue.net
+	get_filename_component(ISSUE_NET "/etc/issue.net" ABSOLUTE)
+	if (EXISTS ${ISSUE_NET}) # to not have an error with cat
+		execute_process(
+			COMMAND cat ${ISSUE_NET}
+			OUTPUT_VARIABLE DISTRO_RELEASE)  # -> Ubuntu 10.10 || Ubuntu natty (development branch)
+		if (NOT "${DISTRO_RELEASE}" STREQUAL "")
+			STRING (REGEX REPLACE "\n" "" DISTRO_RELEASE ${DISTRO_RELEASE})  # retour chariot
+			STRING (REGEX REPLACE " (.+)" "" DISTRO_ID ${DISTRO_RELEASE})
+			if ("${DISTRO_ID}" STREQUAL "Ubuntu")
+				STRING (REGEX REPLACE ".[(]development branch[)]" "" DISTRO_RELEASE ${DISTRO_RELEASE})
+				STRING (REGEX REPLACE ".LTS" "" DISTRO_RELEASE ${DISTRO_RELEASE}) # Ubuntu 10.04.1 LTS
+				STRING (REGEX REPLACE "(.+) " "" DISTRO_RELEASE ${DISTRO_RELEASE})
+				if ("${DISTRO_RELEASE}" STREQUAL "natty")
+					set (DISTRO_RELEASE "11.04")
+				elseif ("${DISTRO_RELEASE}" STREQUAL "oneiric")
+					set (DISTRO_RELEASE "11.10")
+				elseif ("${DISTRO_RELEASE}" STREQUAL "precise")
+					set (DISTRO_RELEASE "12.04")
+				endif()
+			endif()
+		endif()
+	endif()
+endif()
+
+if (NOT "${DISTRO_ID}" STREQUAL "")
+	message (STATUS "  DISTRO_ID: ${DISTRO_ID}, DISTRO_RELEASE: ${DISTRO_RELEASE}")
+endif()
+
 ############# ALSA_MIXER #################
 message (STATUS "> AlsaMixer:")
 set (with_alsa "no")
@@ -809,49 +869,6 @@
 	add_subdirectory ("mail")
 endif()
 
-############# DISTRIBUTION #################
-message (STATUS "> Distribution:")
-# We try to detect if the user is on Ubuntu to know which bus we have to use...
-execute_process(
-	COMMAND lsb_release -i
-	OUTPUT_VARIABLE DISTRO_ID)  # -> "Distributor ID:	Ubuntu"
-if (NOT "${DISTRO_ID}" STREQUAL "") # this tool isn't available on all distributions
-	STRING (REGEX REPLACE "\n" "" DISTRO_ID ${DISTRO_ID})  # retour chariot
-	STRING (REGEX REPLACE ".*: *\t*" "" DISTRO_ID ${DISTRO_ID})
-
-	execute_process(
-		COMMAND lsb_release -r
-		OUTPUT_VARIABLE DISTRO_RELEASE)  # -> "Release:	10.10"
-	STRING (REGEX REPLACE "\n" "" DISTRO_RELEASE ${DISTRO_RELEASE})  # retour chariot
-	STRING (REGEX REPLACE ".*: *\t*" "" DISTRO_RELEASE ${DISTRO_RELEASE})
-else()
-	# on Ubuntu deb builders, lsb_release isn't available but we can have a look to /etc/issue.net
-	get_filename_component(ISSUE_NET "/etc/issue.net" ABSOLUTE)
-	if (EXISTS ${ISSUE_NET}) # to not have an error with cat
-		execute_process(
-			COMMAND cat ${ISSUE_NET}
-			OUTPUT_VARIABLE DISTRO_RELEASE)  # -> Ubuntu 10.10 || Ubuntu natty (development branch)
-		if (NOT "${DISTRO_RELEASE}" STREQUAL "")
-			STRING (REGEX REPLACE "\n" "" DISTRO_RELEASE ${DISTRO_RELEASE})  # retour chariot
-			STRING (REGEX REPLACE " (.+)" "" DISTRO_ID ${DISTRO_RELEASE})
-			if ("${DISTRO_ID}" STREQUAL "Ubuntu")
-				STRING (REGEX REPLACE ".[(]development branch[)]" "" DISTRO_RELEASE ${DISTRO_RELEASE})
-				STRING (REGEX REPLACE ".LTS" "" DISTRO_RELEASE ${DISTRO_RELEASE}) # Ubuntu 10.04.1 LTS
-				STRING (REGEX REPLACE "(.+) " "" DISTRO_RELEASE ${DISTRO_RELEASE})
-				if ("${DISTRO_RELEASE}" STREQUAL "natty")
-					set (DISTRO_RELEASE "11.04")
-				elseif ("${DISTRO_RELEASE}" STREQUAL "oneiric")
-					set (DISTRO_RELEASE "11.10")
-				endif()
-			endif()
-		endif()
-	endif()
-endif()
-
-if (NOT "${DISTRO_ID}" STREQUAL "")
-	message (STATUS "  DISTRO_ID: ${DISTRO_ID}, DISTRO_RELEASE: ${DISTRO_RELEASE}")
-endif()
-
 ############# GLOBAL-MENU #################
 set (with_global_menu "no")
 if ("${enable-global-menu}" STREQUAL "yes" AND "${INDICATOR_OLD_NAMES}" STREQUAL "0" AND "${DBUSMENU_FOUND}" AND "${DBUSMENU_GTK_FOUND}")  # currently only supported with new name of the indicator module and with newer version of dbusmenu
 
=== modified file 'Clipper/src/applet-clipboard.c'
--- Clipper/src/applet-clipboard.c	2012-02-16 01:45:57 +0000
+++ Clipper/src/applet-clipboard.c	2012-03-21 20:37:19 +0000
@@ -427,13 +427,14 @@
 	CDClipperCommand *pCommand;
 	gchar *cIconFilePath;
 	GList *pElement;
+	gint iDesiredIconSize = cairo_dock_search_icon_size (GTK_ICON_SIZE_LARGE_TOOLBAR); // 24px by default
 	for (pElement = pAction->pCommands; pElement != NULL; pElement = pElement->next)
 	{
 		pCommand = pElement->data;
 		if (pCommand->cIconFileName != NULL)
 		{
 			cd_debug (" icone %s", pCommand->cIconFileName);
-			cIconFilePath = cairo_dock_search_icon_s_path (pCommand->cIconFileName);
+			cIconFilePath = cairo_dock_search_icon_s_path (pCommand->cIconFileName, iDesiredIconSize);
 		}
 		else
 		{
@@ -442,14 +443,14 @@
 				tmp ++;
 			gchar *cIconName = g_strndup (pCommand->cFormat, tmp - pCommand->cFormat);
 			cd_debug (" icone %s", cIconName);
-			cIconFilePath = cairo_dock_search_icon_s_path (cIconName);
+			cIconFilePath = cairo_dock_search_icon_s_path (cIconName, iDesiredIconSize);
 			g_free (cIconName);
 		}
 		
 		pMenuItem = gtk_image_menu_item_new_with_mnemonic (pCommand->cDescription);
 		if (cIconFilePath != NULL)
 		{
-			GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size (cIconFilePath, 24, 24, NULL);
+			GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size (cIconFilePath, iDesiredIconSize, iDesiredIconSize, NULL);
 			pImage = gtk_image_new_from_pixbuf (pixbuf);
 			g_free (cIconFilePath);
 			g_object_unref (pixbuf);
 
=== modified file 'Dbus/interfaces/bash/CDBashApplet.sh'
--- Dbus/interfaces/bash/CDBashApplet.sh	2012-02-16 01:45:57 +0000
+++ Dbus/interfaces/bash/CDBashApplet.sh	2012-03-21 20:37:19 +0000
@@ -48,6 +48,8 @@
 EMBLEM_TOP=6
 EMBLEM_RIGHT=7
 EMBLEM_LEFT=8
+EMBLEM_PERSISTENT=0
+EMBLEM_PRINT=9
 MENU_ENTRY=0
 MENU_SUB_MENU=1
 MENU_SEPARATOR=2
 
=== modified file 'Dbus/interfaces/mono/CDApplet.cs'
--- Dbus/interfaces/mono/CDApplet.cs	2012-02-16 01:45:57 +0000
+++ Dbus/interfaces/mono/CDApplet.cs	2012-03-21 20:37:19 +0000
@@ -68,6 +68,10 @@
 		EMBLEM_RIGHT,
 		EMBLEM_LEFT
 	}
+	public enum EmblemModifier {
+		EMBLEM_PERSISTENT = 0,
+		EMBLEM_PRINT = 9
+	}
 	public enum MenuItemType {
 		MENU_ENTRY = 0,
 		MENU_SUB_MENU,
 
=== modified file 'Dbus/interfaces/python/CDApplet.py.in'
--- Dbus/interfaces/python/CDApplet.py.in	2012-02-16 01:45:57 +0000
+++ Dbus/interfaces/python/CDApplet.py.in	2012-03-21 20:37:19 +0000
@@ -30,6 +30,9 @@
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop
 
+gobject.threads_init()				          # Enabling threading
+dbus.mainloop.glib.threads_init()
+
 DBusGMainLoop(set_as_default=True)
 
 INSTALL_PREFIX = os.path.abspath("..")  # applets are launched from their install directory, so ".." is the folder containing all applets.
@@ -67,6 +70,8 @@
 	EMBLEM_TOP          = 6
 	EMBLEM_RIGHT        = 7
 	EMBLEM_LEFT         = 8
+	EMBLEM_PERSISTENT   = 0
+	EMBLEM_PRINT        = 9
 	# menu item types
 	MENU_ENTRY        = 0
 	MENU_SUB_MENU     = 1
 
=== modified file 'Dbus/interfaces/python/CairoDock.py.in'
--- Dbus/interfaces/python/CairoDock.py.in	2012-02-16 01:45:57 +0000
+++ Dbus/interfaces/python/CairoDock.py.in	2012-03-21 20:37:19 +0000
@@ -53,6 +53,9 @@
 	EMBLEM_TOP          = 6
 	EMBLEM_RIGHT        = 7
 	EMBLEM_LEFT         = 8
+	# emblem modifier (optionnal, add it to the emblem position)
+	EMBLEM_PERSISTENT   = 0
+	EMBLEM_PRINT        = 9
 	# module category
 	CATEGORY_BEHAVIOR         = 0
 	CATEGORY_THEME            = 1
 
=== modified file 'Dbus/interfaces/ruby/CDApplet.rb'
--- Dbus/interfaces/ruby/CDApplet.rb	2012-02-16 01:45:57 +0000
+++ Dbus/interfaces/ruby/CDApplet.rb	2012-03-21 20:37:19 +0000
@@ -44,6 +44,8 @@
 	EMBLEM_TOP          = 6
 	EMBLEM_RIGHT        = 7
 	EMBLEM_LEFT         = 8
+	EMBLEM_PERSISTENT   = 0
+	EMBLEM_PRINT        = 9
 	
 	MENU_ENTRY        = 0
 	MENU_SUB_MENU     = 1
 
=== modified file 'Dbus/interfaces/vala/CDApplet.vala'
--- Dbus/interfaces/vala/CDApplet.vala	2012-02-16 01:45:57 +0000
+++ Dbus/interfaces/vala/CDApplet.vala	2012-03-21 20:37:19 +0000
@@ -109,6 +109,10 @@
 		EMBLEM_RIGHT,
 		EMBLEM_LEFT
 	}
+	public enum EmblemModifier {
+		EMBLEM_PERSISTENT = 0,
+		EMBLEM_PRINT = 9
+	}
 	public enum MenuItemType {
 		MENU_ENTRY = 0,
 		MENU_SUB_MENU,
 
=== modified file 'Dbus/src/applet-dbus.c'
--- Dbus/src/applet-dbus.c	2012-02-16 01:45:57 +0000
+++ Dbus/src/applet-dbus.c	2012-03-21 20:37:19 +0000
@@ -48,7 +48,7 @@
 #include "interface-applet-signals.h"
 #include "applet-dbus.h"
 
-#define DISTANT_DIR "2.4.0"
+#define DISTANT_DIR "3.0.0"
 #define GETTEXT_NAME_EXTRAS "cairo-dock-plugins-extra"
 #define LOCALE_DIR_NAME "locale"
 
@@ -138,7 +138,7 @@
 		pVisitCard->cAuthor = g_strdup (cAuthor);
 		pVisitCard->iCategory = iCategory;
 		if (cIconName != NULL)
-			pVisitCard->cIconFilePath = cairo_dock_search_icon_s_path (cIconName);
+			pVisitCard->cIconFilePath = cairo_dock_search_icon_s_path (cIconName, CAIRO_DOCK_DEFAULT_ICON_SIZE);
 		if (pVisitCard->cIconFilePath == NULL)
 			pVisitCard->cIconFilePath = (cShareDataDir ? g_strdup_printf ("%s/icon", cShareDataDir) : NULL);
 		pVisitCard->iSizeOfConfig = 4;  // au cas ou ...
 
=== modified file 'Dbus/src/interface-applet-methods.c'
--- Dbus/src/interface-applet-methods.c	2012-02-16 01:45:57 +0000
+++ Dbus/src/interface-applet-methods.c	2012-03-21 20:37:19 +0000
@@ -269,7 +269,7 @@
 	v = g_hash_table_lookup (hDialogAttributes, "icon");
 	if (v && G_VALUE_HOLDS_STRING (v))
 	{
-		cImageFilePath = cairo_dock_search_icon_s_path (g_value_get_string (v));
+		cImageFilePath = cairo_dock_search_icon_s_path (g_value_get_string (v), MAX (pIcon->iImageWidth, pIcon->iImageHeight));
 		attr.cImageFilePath = cImageFilePath;
 	}
 	else
 
=== modified file 'Dbus/src/interface-main-methods.c'
--- Dbus/src/interface-main-methods.c	2012-02-16 01:45:57 +0000
+++ Dbus/src/interface-main-methods.c	2012-03-21 20:37:19 +0000
@@ -1282,12 +1282,12 @@
 		
 		if (cImage == NULL || *cImage == '\0' || strcmp (cImage, "none") == 0)
 		{
-			cairo_dock_remove_overlay_at_position (pIcon, iPosition);
+			cairo_dock_remove_overlay_at_position (pIcon, iPosition < CAIRO_OVERLAY_NB_POSITIONS ? iPosition : iPosition - CAIRO_OVERLAY_NB_POSITIONS);  // for ease of use, handle both case similarily.
 		}
 		else
 		{
-			if (iPosition < 0)  // [-N, -1] => print the overlay
-				cairo_dock_print_overlay_on_icon_from_image (pIcon, pContainer, cImage, - iPosition - 1);
+			if (iPosition >= CAIRO_OVERLAY_NB_POSITIONS)  // [N; 2N-1] => print the overlay
+				cairo_dock_print_overlay_on_icon_from_image (pIcon, pContainer, cImage, iPosition - CAIRO_OVERLAY_NB_POSITIONS);
 			else  // [0, N-1] => add it
 				cairo_dock_add_overlay_from_image (pIcon, cImage, iPosition);
 		}
 
=== modified file 'Folders/src/applet-notifications.c'
--- Folders/src/applet-notifications.c	2012-02-16 01:45:57 +0000
+++ Folders/src/applet-notifications.c	2012-03-21 20:37:19 +0000
@@ -385,6 +385,7 @@
 			gchar **pAppInfo;
 			gchar *cIconPath;
 			gpointer *app;
+			gint iDesiredIconSize = cairo_dock_search_icon_size (GTK_ICON_SIZE_LARGE_TOOLBAR); // 24px
 			for (a = pApps; a != NULL; a = a->next)
 			{
 				pAppInfo = a->data;
@@ -398,7 +399,7 @@
 				myData.pAppList = g_list_prepend (myData.pAppList, app);
 				
 				if (pAppInfo[2] != NULL)
-					cIconPath = cairo_dock_search_icon_s_path (pAppInfo[2]);
+					cIconPath = cairo_dock_search_icon_s_path (pAppInfo[2], iDesiredIconSize);
 				else
 					cIconPath = NULL;
 				CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (pAppInfo[0], cIconPath, _cd_folders_launch_with, pSubMenu, app);
@@ -433,6 +434,7 @@
 typedef struct {
 	gchar *cReceivedData;
 	double fOrder;
+	gchar *cDockName;
 } CDDropData;
 
 static void _on_answer_import (int iClickedButton, GtkWidget *pInteractiveWidget, CDDropData *data, CairoDialog *pDialog)
@@ -451,6 +453,7 @@
 		G_TYPE_STRING, "Configuration", "dir path", cReceivedData,
 		G_TYPE_BOOLEAN, "Configuration", "show files", bImportFiles,
 		G_TYPE_DOUBLE, "Icon", "order", fOrder,
+		G_TYPE_STRING, "Icon", "dock name", data->cDockName,
 		G_TYPE_INVALID);
 	
 	// instanciate the module from this conf file.
@@ -476,6 +479,7 @@
 static void _free_dialog_data (CDDropData *data)
 {
 	g_free (data->cReceivedData);
+	g_free (data->cDockName);
 	g_free (data);
 }
 gboolean cd_folders_on_drop_data (gpointer data, const gchar *cReceivedData, Icon *icon, double fOrder, CairoContainer *pContainer)
@@ -520,6 +524,8 @@
 		CDDropData *data = g_new0 (CDDropData, 1);
 		data->cReceivedData = g_strdup (cReceivedData);
 		data->fOrder = fOrder;
+		if (CAIRO_DOCK_IS_DOCK (pContainer))
+			data->cDockName = g_strdup (cairo_dock_search_dock_name (CAIRO_DOCK (pContainer)));
 		cairo_dock_show_dialog_full (D_("Do you want to import the content of the folder too?"),
 			pIcon, pContainer,
 			0,
 
=== modified file 'GMenu/src/applet-init.c'
--- GMenu/src/applet-init.c	2012-02-16 01:45:57 +0000
+++ GMenu/src/applet-init.c	2012-03-21 20:37:19 +0000
@@ -55,6 +55,7 @@
 	}
 	myData.pMenu = create_main_menu (myApplet);
 	myData.iShowQuit = myConfig.iShowQuit;
+	myData.iPanelDefaultMenuIconSize = cairo_dock_search_icon_size (GTK_ICON_SIZE_LARGE_TOOLBAR); // 24 by default
 	
 	CD_APPLET_REGISTER_FOR_CLICK_EVENT;
 	CD_APPLET_REGISTER_FOR_MIDDLE_CLICK_EVENT;
 
=== modified file 'GMenu/src/applet-menu-callbacks.c'
--- GMenu/src/applet-menu-callbacks.c	2012-02-16 01:45:57 +0000
+++ GMenu/src/applet-menu-callbacks.c	2012-03-21 20:37:19 +0000
@@ -183,19 +183,19 @@
 		GtkWidget *image = NULL;
 		if (*gtkStock == '/')
 		{
-			GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size (gtkStock, 24, 24, NULL);
+			GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size (gtkStock, myData.iPanelDefaultMenuIconSize, myData.iPanelDefaultMenuIconSize, NULL);
 			image = gtk_image_new_from_pixbuf (pixbuf);
 			g_object_unref (pixbuf);
 		}
 		else
 		{
-			const gchar *cIconPath = cairo_dock_search_icon_s_path (gtkStock);
+			const gchar *cIconPath = cairo_dock_search_icon_s_path (gtkStock, myData.iPanelDefaultMenuIconSize);
 			if (cIconPath == NULL)
 			{
 				cIconPath = g_strconcat (MY_APPLET_SHARE_DATA_DIR"/", gtkStock, NULL);
 				cIconPath = g_strconcat (cIconPath, ".svg", NULL);
 			}
-			GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size (cIconPath, 24, 24, NULL);
+			GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size (cIconPath, myData.iPanelDefaultMenuIconSize, myData.iPanelDefaultMenuIconSize, NULL);
 			image = gtk_image_new_from_pixbuf (pixbuf);
 			g_object_unref (pixbuf);
 		}
@@ -464,7 +464,7 @@
 		IconToAdd *icon_to_add;
 		char      *icon_name;
 		GdkPixbuf *pb;
-		int        icon_height = PANEL_DEFAULT_MENU_ICON_SIZE;
+		int        icon_height = myData.iPanelDefaultMenuIconSize;
 
 		gtk_icon_size_lookup (icon->icon_size, NULL, &icon_height);
 
@@ -513,7 +513,7 @@
 	else {*/
 		IconToAdd *icon_to_add;
 		GdkPixbuf *pb;
-		int        icon_height = PANEL_DEFAULT_MENU_ICON_SIZE;
+		int        icon_height = myData.iPanelDefaultMenuIconSize;
 
 		gtk_icon_size_lookup (icon->icon_size, NULL, &icon_height);
 
 
=== modified file 'GMenu/src/applet-menu.c'
--- GMenu/src/applet-menu.c	2012-02-16 01:45:57 +0000
+++ GMenu/src/applet-menu.c	2012-03-21 20:37:19 +0000
@@ -243,7 +243,7 @@
 {
 	IconToLoad *icon;
 	GtkWidget *image;
-	int        icon_height = PANEL_DEFAULT_MENU_ICON_SIZE;
+	int        icon_height = myData.iPanelDefaultMenuIconSize;
 
 	icon = g_new0 (IconToLoad, 1);
 
@@ -375,14 +375,14 @@
 					(GDestroyNotify) gmenu_tree_item_unref);
 
 	panel_load_menu_image_deferred (menuitem,
-					PANEL_DEFAULT_MENU_ICON_SIZE, //panel_menu_icon_get_size (),
+					myData.iPanelDefaultMenuIconSize, //panel_menu_icon_get_size (),
 					///NULL, NULL,
 					alias_directory ? gmenu_tree_directory_get_icon (alias_directory) :
 							  gmenu_tree_entry_get_icon (entry),
 					NULL);
 
 	setup_menuitem (menuitem,
-			PANEL_DEFAULT_MENU_ICON_SIZE, //panel_menu_icon_get_size (),
+			myData.iPanelDefaultMenuIconSize, //panel_menu_icon_get_size (),
 			///NULL,
 			alias_directory ? gmenu_tree_directory_get_name (alias_directory) :
 					  gmenu_tree_entry_get_name (entry));
@@ -715,9 +715,13 @@
 		cMenuFileName = "gnome-applications.menu";
 	else if (g_file_test (XDG_MENUS_PATH"/kde-applications.menu", G_FILE_TEST_EXISTS))
 		cMenuFileName = "kde-applications.menu";
+	else if (g_file_test (XDG_MENUS_PATH"/kde4-applications.menu", G_FILE_TEST_EXISTS))
+		cMenuFileName = "kde4-applications.menu";
 	else if (g_file_test (XDG_MENUS_PATH"/xfce-applications.menu", G_FILE_TEST_EXISTS))
 		cMenuFileName = "xfce-applications.menu";
-	else  // kde4-applications.menu, lxde-applications.menu, ...; let's check any *-applications.menu
+	else if (g_file_test (XDG_MENUS_PATH"/lxde-applications.menu", G_FILE_TEST_EXISTS))
+		cMenuFileName = "lxde-applications.menu";
+	else  // let's check any *-applications.menu
 	{
 		const gchar *cFileName;
 		GDir *dir = g_dir_open (XDG_MENUS_PATH, 0, NULL);
 
=== modified file 'GMenu/src/applet-menu.h'
--- GMenu/src/applet-menu.h	2012-02-16 01:45:57 +0000
+++ GMenu/src/applet-menu.h	2012-03-21 20:37:19 +0000
@@ -26,7 +26,7 @@
 #include <gmenu-tree.h>
 
 #define PANEL_ICON_FOLDER "folder"
-#define PANEL_DEFAULT_MENU_ICON_SIZE 24
+// #define PANEL_DEFAULT_MENU_ICON_SIZE 24
 
 
 GtkWidget * add_menu_separator (GtkWidget *menu);
 
=== modified file 'GMenu/src/applet-recent.c'
--- GMenu/src/applet-recent.c	2011-08-09 18:08:08 +0000
+++ GMenu/src/applet-recent.c	2012-03-21 20:37:19 +0000
@@ -55,11 +55,11 @@
 		
 		GtkWidget *pMenuItem = gtk_image_menu_item_new_with_label (D_("Recent Documents"));
 
-		const gchar *cIconPath = cairo_dock_search_icon_s_path ("document-open-recent");
+		const gchar *cIconPath = cairo_dock_search_icon_s_path ("document-open-recent", myData.iPanelDefaultMenuIconSize);
 		if (cIconPath == NULL)
 			cIconPath = MY_APPLET_SHARE_DATA_DIR"/icon-recent.png";
 
-		GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size (cIconPath, 24, 24, NULL);
+		GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size (cIconPath, myData.iPanelDefaultMenuIconSize, myData.iPanelDefaultMenuIconSize, NULL);
 		GtkWidget *image = gtk_image_new_from_pixbuf (pixbuf);
 		g_object_unref (pixbuf);
 #if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
 
=== modified file 'GMenu/src/applet-run-dialog.c'
--- GMenu/src/applet-run-dialog.c	2012-02-16 01:45:57 +0000
+++ GMenu/src/applet-run-dialog.c	2012-03-21 20:37:19 +0000
@@ -349,7 +349,7 @@
 }
 CairoDialog *cd_menu_create_quick_launch_dialog (CairoDockModuleInstance *myApplet)
 {
-	gchar *cIconPath = cairo_dock_search_icon_s_path (GTK_STOCK_EXECUTE);
+	gchar *cIconPath = cairo_dock_search_icon_s_path (GTK_STOCK_EXECUTE, myData.iPanelDefaultMenuIconSize);
 	CairoDialog *pDialog = cairo_dock_show_dialog_with_entry (D_("Enter a command to launch:"),
 		myIcon, myContainer,
 		cIconPath ? cIconPath : "same icon",
 
=== modified file 'GMenu/src/applet-struct.h'
--- GMenu/src/applet-struct.h	2012-02-16 01:45:57 +0000
+++ GMenu/src/applet-struct.h	2012-03-21 20:37:19 +0000
@@ -75,6 +75,7 @@
 	guint iSidFakeMenuIdle;
 	guint iSidCreateMenuIdle;
 	guint iSidTreeChangeIdle;
+	gint iPanelDefaultMenuIconSize;
 	
 	GtkRecentManager *pRecentManager;
 	GtkWidget *pRecentMenuItem;
 
=== modified file 'Global-Menu/src/applet-draw.c'
--- Global-Menu/src/applet-draw.c	2012-02-16 01:45:57 +0000
+++ Global-Menu/src/applet-draw.c	2012-03-21 20:37:19 +0000
@@ -74,10 +74,21 @@
 	}
 	
 	// draw current icon
+	const CairoDockImageBuffer *pImage = NULL, *pPrevImage = NULL;
+	
 	Icon *pAppli = cairo_dock_get_icon_with_Xid (myData.iCurrentWindow);
-	GLuint iTexture = (pAppli ? pAppli->iIconTexture : myData.defaultIcon.iTexture);
+	if (pAppli)
+	{
+		pImage = cairo_dock_appli_get_image_buffer (pAppli);
+	}
+	GLuint iTexture = (pImage ? pImage->iTexture : 0);
+	
 	Icon *pPrevIcon = cairo_dock_get_icon_with_Xid (myData.iPreviousWindow);
-	GLuint iPrevTexture = (pPrevIcon ? pPrevIcon->iIconTexture : myData.defaultIcon.iTexture);
+	if (pPrevIcon)
+	{
+		pPrevImage = cairo_dock_appli_get_image_buffer (pPrevIcon);
+	}
+	GLuint iPrevTexture = (pPrevImage ? pPrevImage->iTexture : 0);
 	
 	if (iPrevTexture != 0)
 	{
@@ -178,20 +189,34 @@
 		y = 0;  // on top
 	}
 	
-	Icon *pAppli = cairo_dock_get_icon_with_Xid (myData.iCurrentWindow);
-	cairo_surface_t *pSurface = (pAppli ? pAppli->pIconBuffer : myData.defaultIcon.pSurface);
+	const CairoDockImageBuffer *pImage = NULL, *pPrevImage = NULL;
+	
 	Icon *pPrevIcon = cairo_dock_get_icon_with_Xid (myData.iPreviousWindow);
-	cairo_surface_t *pPrevSurface = (pPrevIcon ? pPrevIcon->pIconBuffer : myData.defaultIcon.pSurface);
-	
-	if (pPrevSurface != NULL)
-	{
-		cairo_set_source_surface (myDrawContext, pPrevSurface, x, y);
+	if (pPrevIcon)
+	{
+		pPrevImage = cairo_dock_appli_get_image_buffer (pPrevIcon);
+	}
+	if (pPrevImage && pPrevImage->pSurface)
+	{
+		cairo_save (myDrawContext);
+		cairo_scale (myDrawContext, (double)w / pPrevImage->iWidth, (double)h / pPrevImage->iHeight);
+		cairo_set_source_surface (myDrawContext, pPrevImage->pSurface, x, y);
 		cairo_paint_with_alpha (myDrawContext, 1-f);
-	}
-	if (pSurface != NULL)
-	{
-		cairo_set_source_surface (myDrawContext, pSurface, x, y);
+		cairo_restore (myDrawContext);
+	}
+	
+	Icon *pAppli = cairo_dock_get_icon_with_Xid (myData.iCurrentWindow);
+	if (pAppli)
+	{
+		pImage = cairo_dock_appli_get_image_buffer (pAppli);
+	}
+	if (pImage && pImage->pSurface)
+	{
+		cairo_save (myDrawContext);
+		cairo_scale (myDrawContext, (double)w / pImage->iWidth, (double)h / pImage->iHeight);
+		cairo_set_source_surface (myDrawContext, pImage->pSurface, x, y);
 		cairo_paint_with_alpha (myDrawContext, f);
+		cairo_restore (myDrawContext);
 	}
 	
 	// draw window buttons
 
=== modified file 'Indicator-applet/indicator-applet.c'
--- Indicator-applet/indicator-applet.c	2012-02-16 01:45:57 +0000
+++ Indicator-applet/indicator-applet.c	2012-03-21 20:37:19 +0000
@@ -33,6 +33,12 @@
 	if (old_menu_pointer == (GObject*)pIndicator->pMenu)
 		pIndicator->pMenu = NULL;
 }
+static void _on_service_destroyed (CDAppletIndicator *pIndicator, GObject *old_menu_pointer)
+{
+	g_print (" --------- no more service (%p / %p\n", old_menu_pointer, pIndicator->service);
+	if (old_menu_pointer == (GObject*)pIndicator->service)
+		pIndicator->service = NULL;
+}
 
 static void _cd_indicator_make_menu (CDAppletIndicator *pIndicator)
 {
@@ -41,7 +47,7 @@
 		pIndicator->pMenu = dbusmenu_gtkmenu_new ((gchar*)pIndicator->cBusName, (gchar*)pIndicator->cMenuObject);  // the cast is unorthodox, but the function definition is clumsy (it should require 2 const gchar*, since it actually duplicates the strings).
 		if (pIndicator->pMenu != NULL)
 		{
-			g_object_ref_sink (G_OBJECT (pIndicator->pMenu));
+			g_object_ref_sink (G_OBJECT (pIndicator->pMenu));  // the object is floating -> take the reference
 			g_object_weak_ref (G_OBJECT (pIndicator->pMenu),
 				(GWeakNotify)_on_menu_destroyed,
 				pIndicator);
@@ -63,6 +69,7 @@
 static void
 connection_changed (IndicatorServiceManager * sm, gboolean connected, CDAppletIndicator *pIndicator)
 {
+	g_print ("%s (%s : %d)\n", __func__, pIndicator->cBusName, connected);
 	CairoDockModuleInstance *myApplet = pIndicator->pApplet;
 	if (connected)
 	{
@@ -71,7 +78,7 @@
 			// connect to the service.
 			if (pIndicator->pServiceProxy == NULL)
 			{
-				GError * error = NULL;
+				/**GError * error = NULL;
 				DBusGConnection * sbus = cairo_dock_get_session_connection ();
 				pIndicator->pServiceProxy = dbus_g_proxy_new_for_name_owner(sbus,
 					pIndicator->cBusName,
@@ -82,7 +89,11 @@
 				{
 					cd_warning ("'%s' service not found on the bus : %s", pIndicator->cServiceObject, error->message);
 					g_error_free(error);
-				}
+				}*/
+				pIndicator->pServiceProxy = cairo_dock_create_new_session_proxy (
+					pIndicator->cBusName,
+					pIndicator->cServiceObject,
+					pIndicator->cServiceInterface);
 				if (pIndicator->pServiceProxy == NULL)
 					return;
 				
@@ -111,6 +122,11 @@
 				g_print ("done.\n");
 				pIndicator->pMenu = NULL;
 			}
+			if (pIndicator->pServiceProxy != NULL)
+			{
+				g_object_unref (pIndicator->pServiceProxy);  // this removes all the signals connected on the proxy
+				pIndicator->pServiceProxy = NULL;
+			}
 			pIndicator->bConnected = FALSE;
 		}
 	}
@@ -133,8 +149,7 @@
 	if (!s_bIndicatorIconThemeAdded)
 	{
 		s_bIndicatorIconThemeAdded = TRUE;
-		gtk_icon_theme_append_search_path (gtk_icon_theme_get_default(),
-			INDICATOR_ICONS_DIR);
+		cairo_dock_add_path_to_icon_theme (INDICATOR_ICONS_DIR);  /// maybe we should add it back when the icons manager is reloaded ?...
 	}
 	CDAppletIndicator *pIndicator = g_new0 (CDAppletIndicator, 1);
 	pIndicator->pApplet = pApplet;
@@ -144,6 +159,10 @@
 	pIndicator->cMenuObject = cMenuObject;
 	
 	pIndicator->service = indicator_service_manager_new_version ((gchar*)cBusName, iVersion);
+	g_object_weak_ref (G_OBJECT (pIndicator->service),
+		(GWeakNotify)_on_service_destroyed,
+		pIndicator);  // most probably useless, but let's be parano, since we're using the dreadful "libindicator" :p
+		
 	g_signal_connect (G_OBJECT(pIndicator->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), pIndicator);  // on sera appele une fois la connexion etablie.  // pour le cast, cf plus haut.
 	
 	// indicators don't send the 'connection-change' signal if the connection couldn't be done, so we have to handle this case ourselves.
@@ -161,15 +180,28 @@
 		g_source_remove (pIndicator->iSidGetMenuOnce);
 	if (pIndicator->iSidCheckIndicator != 0)
 		g_source_remove (pIndicator->iSidCheckIndicator);
+	pIndicator->bConnected = FALSE;
 	pIndicator->on_disconnect = NULL;  // since the indicator has been explicitely destroyed, we don't want to call the callback when we'll disconnect from the service.
-	if (pIndicator->service)
-		g_object_unref (pIndicator->service);
+	g_print ("destroy indicator menu...\n");
+	if (pIndicator->pMenu)
+		g_object_unref (pIndicator->pMenu);
+	g_print ("done.\n");
 	if (pIndicator->pServiceProxy)
+	{
 		g_object_unref (pIndicator->pServiceProxy);
-	cd_debug ("destroy indicator menu...");
-	if (pIndicator->pMenu)
-		g_object_unref (pIndicator->pMenu);
-	cd_debug ("done.");
+		pIndicator->pServiceProxy = NULL;
+	}
+	g_print ("destroy service...\n");
+	if (pIndicator->service)
+	{
+		//g_object_unref (pIndicator->service);  // this causes a crash in libindicator (beacuse they keep the service as parameter of the callback 'service_proxy_name_changed'). so just be sure to disconnect from this object, and forget it.
+		g_signal_handlers_disconnect_by_func (G_OBJECT(pIndicator->service), G_CALLBACK(connection_changed), pIndicator);
+		g_object_weak_unref (G_OBJECT (pIndicator->service),
+			(GWeakNotify)_on_service_destroyed,
+			pIndicator);
+		pIndicator->service = NULL;
+	}
+	g_print ("done.\n");
 	g_free (pIndicator);
 }
 
@@ -187,7 +219,7 @@
 	
 	const gchar *cIconName = cStatusIcon;
 	gchar *tmp_icon_name = NULL;
-	gchar *cIconPath = cairo_dock_search_icon_s_path (cIconName);  // on regarde si l'icone sera trouvee.
+	gchar *cIconPath = cairo_dock_search_icon_s_path (cIconName, MAX (myIcon->iImageWidth, myIcon->iImageHeight));  // on regarde si l'icone sera trouvee.
 	gchar *cIconPathFallback = NULL;
 	if (cIconPath == NULL)  // l'icone ne sera pas trouvee, on regarde si ce n'est pas une icone en carton d'Ubuntu.
 	{
@@ -196,7 +228,7 @@
 		{
 			tmp_icon_name = g_strndup (cIconName, str - cIconName);
 			cIconName = tmp_icon_name;
-			cIconPath = cairo_dock_search_icon_s_path (cIconName);
+			cIconPath = cairo_dock_search_icon_s_path (cIconName, MAX (myIcon->iImageWidth, myIcon->iImageHeight));
 		}
 	}
 	if (cIconPath == NULL)  // l'icone ne sera pas trouvee, on met une icone par defaut.
 
=== modified file 'Messaging-Menu/data/Messaging-Menu.conf.in'
--- Messaging-Menu/data/Messaging-Menu.conf.in	2012-02-16 01:45:57 +0000
+++ Messaging-Menu/data/Messaging-Menu.conf.in	2012-03-21 20:37:19 +0000
@@ -20,8 +20,8 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#B Always display the icon, even when the dock is hidden?
-always visi = false
+#Y+[No;0;0;With default background;0;0;With custom background;1;1] Always display the icon, even when the dock is hidden?
+always_visi = 0
 
 #C+ Background color to add in this case
 bg color = .8;.8;.8;.5
 
=== modified file 'Network-Monitor/data/Network-Monitor.conf.in'
--- Network-Monitor/data/Network-Monitor.conf.in	2012-02-16 01:45:57 +0000
+++ Network-Monitor/data/Network-Monitor.conf.in	2012-03-21 20:37:19 +0000
@@ -21,8 +21,8 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#B Always display the icon, even when the dock is hidden?
-always visi = false
+#Y+[No;0;0;With default background;0;0;With custom background;1;1] Always display the icon, even when the dock is hidden?
+always_visi = 0
 
 #C+ Background color to add in this case
 bg color = .8;.8;.8;.5
 
=== modified file 'Recent-Events/data/Recent-Events.conf.in'
--- Recent-Events/data/Recent-Events.conf.in	2012-02-16 01:45:57 +0000
+++ Recent-Events/data/Recent-Events.conf.in	2012-03-21 20:37:19 +0000
@@ -14,7 +14,7 @@
 #v
 sep_display=
 
-#S+ Image filename:
+#S+[Default] Image filename:
 #{Leave empty to use the default one.}
 icon=folder-recent
 
 
=== modified file 'Recent-Events/src/applet-dialog.c'
--- Recent-Events/src/applet-dialog.c	2012-02-16 01:45:57 +0000
+++ Recent-Events/src/applet-dialog.c	2012-03-21 20:37:19 +0000
@@ -116,7 +116,7 @@
 			//\_____________ find the icon.
 			if (strncmp (cEventURI, "http", 4) == 0)  // gvfs is deadly slow to get info on distant URI...
 			{
-				cIconName = cairo_dock_search_icon_s_path ("text-html");
+				cIconName = cairo_dock_search_icon_s_path ("text-html", myData.iDesiredIconSize);
 			}
 			else
 			{
@@ -124,8 +124,8 @@
 			}
 			if (cIconName != NULL)
 			{
-				cIconPath = cairo_dock_search_icon_s_path (cIconName);
-				pixbuf = gdk_pixbuf_new_from_file_at_size (cIconPath, 32, 32, NULL);
+				cIconPath = cairo_dock_search_icon_s_path (cIconName, myData.iDesiredIconSize);
+				pixbuf = gdk_pixbuf_new_from_file_at_size (cIconPath, myData.iDesiredIconSize, myData.iDesiredIconSize, NULL);
 				g_free (cIconPath);
 			}
 			else
@@ -274,7 +274,7 @@
 					myData.pAppList = g_list_prepend (myData.pAppList, pAppInfo[1]);
 					
 					if (pAppInfo[2] != NULL)
-						cIconPath = cairo_dock_search_icon_s_path (pAppInfo[2]);
+						cIconPath = cairo_dock_search_icon_s_path (pAppInfo[2], cairo_dock_search_icon_size (GTK_ICON_SIZE_LARGE_TOOLBAR));
 					else
 						cIconPath = NULL;
 					CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (pAppInfo[0], cIconPath, _cd_launch_with, pSubMenu, pAppInfo[1]);
@@ -466,7 +466,24 @@
 static gboolean _show_dialog_delayed (gpointer data)
 {
 	cd_toggle_dialog ();
-	return FALSE;
+	if (myData.pDialog != NULL)  // dialog built with success, quit.
+	{
+		myData.iSidTryDialog = 0;
+		return FALSE;
+	}
+	else  // failed, retry up to 3 times.
+	{
+		myData.iNbTries ++;
+		cd_debug (" %d tries", myData.iNbTries);
+		if (myData.iNbTries >= 3)  // definitely no hope -> show a message to the user.
+		{
+			cairo_dock_remove_dialog_if_any (myIcon);
+			cairo_dock_show_temporary_dialog_with_icon (D_("You need to install the Zeitgeist data engine."), myIcon, myContainer, 6000, "same icon");
+			myData.iSidTryDialog = 0;
+			return FALSE;
+		}
+	}
+	return TRUE;
 }
 void cd_toggle_dialog (void)
 {
@@ -482,17 +499,15 @@
 		{
 			cd_debug ("first search");
 			myData.pLog = zeitgeist_log_new ();  // may launch the Zeitgeist daemon if it's not yet running.
-			if (! zeitgeist_log_is_connected (myData.pLog))  // the connection may not be immediate (even if the daemon is already running), in this case come back in 1s.
+		}
+		if (! zeitgeist_log_is_connected (myData.pLog))
+		{
+			cd_debug ("not yet connected");
+			if (myData.iSidTryDialog == 0)
 			{
-				cd_debug ("come back in 1s...");
-				g_timeout_add_seconds (1, _show_dialog_delayed, NULL);
-				return;
+				myData.iNbTries = 0;
+				myData.iSidTryDialog = g_timeout_add_seconds (1, _show_dialog_delayed, NULL);
 			}
-		}
-		else if (! zeitgeist_log_is_connected (myData.pLog))
-		{
-			cairo_dock_remove_dialog_if_any (myIcon);
-			cairo_dock_show_temporary_dialog_with_icon (D_("You need to install the Zeitgeist data engine."), myIcon, myContainer, 6000, "same icon");
 			return;
 		}
 		
 
=== modified file 'Recent-Events/src/applet-dialog.h'
--- Recent-Events/src/applet-dialog.h	2011-04-20 20:46:51 +0000
+++ Recent-Events/src/applet-dialog.h	2012-03-21 20:37:19 +0000
@@ -30,4 +30,7 @@
 void cd_toggle_dialog (void);
 
 
+void cd_folders_free_apps_list (CairoDockModuleInstance *myApplet);
+
+
 #endif
 
=== modified file 'Recent-Events/src/applet-init.c'
--- Recent-Events/src/applet-init.c	2012-02-16 01:45:57 +0000
+++ Recent-Events/src/applet-init.c	2012-03-21 20:37:19 +0000
@@ -22,6 +22,7 @@
 #include "applet-config.h"
 #include "applet-notifications.h"
 #include "applet-struct.h"
+#include "applet-dialog.h"
 #include "applet-init.h"
 
 
@@ -42,7 +43,8 @@
 	}
 	
 	CD_APPLET_SET_DEFAULT_IMAGE_ON_MY_ICON_IF_NONE;  // set the default icon if none is specified in conf.
-	
+
+	myData.iDesiredIconSize =  cairo_dock_search_icon_size (GTK_ICON_SIZE_DND); // 32px
 	
 	CD_APPLET_REGISTER_FOR_CLICK_EVENT;
 	CD_APPLET_REGISTER_FOR_MIDDLE_CLICK_EVENT;
@@ -66,6 +68,14 @@
 	cairo_dock_remove_notification_func_on_object (&myContainersMgr,
 		NOTIFICATION_BUILD_ICON_MENU, (CairoDockNotificationFunc) CD_APPLET_ON_BUILD_MENU_FUNC, myApplet);
 	
+	if (myData.iSidTryDialog != 0)
+		g_source_remove (myData.iSidTryDialog);
+	
+	cairo_dock_dialog_unreference (myData.pDialog);  // pModel will be destroyed with the viewport.
+	
+	g_free (myData.cCurrentUri);
+	cd_folders_free_apps_list (myApplet);
+	
 	cd_keybinder_unbind (myData.pKeyBinding);
 CD_APPLET_STOP_END
 
 
=== modified file 'Recent-Events/src/applet-notifications.c'
--- Recent-Events/src/applet-notifications.c	2012-02-16 01:45:57 +0000
+++ Recent-Events/src/applet-notifications.c	2012-03-21 20:37:19 +0000
@@ -106,6 +106,7 @@
 	double fOrder;
 	int iVolumeID;
 	gboolean bIsDirectory;
+	gint iDesiredIconSize = cairo_dock_search_icon_size (GTK_ICON_SIZE_LARGE_TOOLBAR); // 24px
 	
 	CD_APPLET_ADD_SEPARATOR_IN_MENU (s_pMenu);
 	
@@ -127,7 +128,7 @@
 			g_free (cPath);
 			s_pEventList = g_list_prepend (s_pEventList, cCommand);
 			
-			cIconPath = cairo_dock_search_icon_s_path (cIconName);
+			cIconPath = cairo_dock_search_icon_s_path (cIconName, iDesiredIconSize);
 			CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (zeitgeist_subject_get_text (subject), cIconPath, _open_file, pSubMenu, cCommand);
 			g_free (cIconPath);
 			g_free (cIconName);
 
=== modified file 'Recent-Events/src/applet-struct.h'
--- Recent-Events/src/applet-struct.h	2012-02-16 01:45:57 +0000
+++ Recent-Events/src/applet-struct.h	2012-03-21 20:37:19 +0000
@@ -68,6 +68,9 @@
 	CairoDialog *pDialog;
 	CDEventType iCurrentCaterogy;
 	CairoKeyBinding *pKeyBinding;
+	gint iDesiredIconSize;
+	guint iSidTryDialog;
+	gint iNbTries;
 	} ;
 
 
 
=== modified file 'Remote-Control/src/applet-notifications.c'
--- Remote-Control/src/applet-notifications.c	2012-02-16 01:45:57 +0000
+++ Remote-Control/src/applet-notifications.c	2012-03-21 20:37:19 +0000
@@ -37,6 +37,13 @@
 
 const int s_iNbPromptAnimationSteps = 40;
 
+static void cd_do_simulate_click (CairoContainer *pContainer, Icon *pIcon, int iModifierType)
+{
+	g_return_if_fail (pIcon != NULL);
+	myData.bIgnoreClick = TRUE;  // -> ignore the "click" notification, which would close the session and remove the notification while in the loop. the caller of this method should ensure to close the session after.
+	cairo_dock_notify_on_object (pContainer, NOTIFICATION_CLICK_ICON, pIcon, pContainer, iModifierType);
+	myData.bIgnoreClick = FALSE;
+}
 
 static inline int _orient_arrow (CairoContainer *pContainer, int iKeyVal)
 {
@@ -142,8 +149,8 @@
 	if (pNthIcon != NULL)
 	{
 		g_print ("click on %s\n", pNthIcon->cName);
-		///cairo_dock_notify_on_object (&myContainersMgr, NOTIFICATION_CLICK_ICON, pNthIcon, myData.pCurrentDock, iModifierType);
-		cairo_dock_notify_on_object (CAIRO_CONTAINER (myData.pCurrentDock), NOTIFICATION_CLICK_ICON, pNthIcon, myData.pCurrentDock, iModifierType);
+		///cairo_dock_notify_on_object (CAIRO_CONTAINER (myData.pCurrentDock), NOTIFICATION_CLICK_ICON, pNthIcon, myData.pCurrentDock, iModifierType);
+		cd_do_simulate_click (CAIRO_CONTAINER (myData.pCurrentDock), pNthIcon, iModifierType);
 
 		cairo_dock_start_icon_animation (pNthIcon, myData.pCurrentDock);
 		myData.bIgnoreIconState = FALSE;
@@ -241,7 +248,7 @@
 	{
 		if (myData.pCurrentIcon != NULL)
 		{
-			cd_debug ("on clique sur l'icone '%s' [%d, %d]\n", myData.pCurrentIcon->cName, iModifierType, GDK_SHIFT_MASK);
+			g_print ("on clique sur l'icone '%s' [%d, %d]\n", myData.pCurrentIcon->cName, iModifierType, GDK_SHIFT_MASK);
 			
 			myData.bIgnoreIconState = TRUE;
 			if (iModifierType & GDK_MOD1_MASK)  // ALT
@@ -264,8 +271,8 @@
 			}
 			else
 			{
-				///cairo_dock_notify_on_object (&myContainersMgr, NOTIFICATION_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock, iModifierType);
-				cairo_dock_notify_on_object (CAIRO_CONTAINER (myData.pCurrentDock), NOTIFICATION_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock, iModifierType);
+				///cairo_dock_notify_on_object (CAIRO_CONTAINER (myData.pCurrentDock), NOTIFICATION_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock, iModifierType);
+				cd_do_simulate_click (CAIRO_CONTAINER (myData.pCurrentDock), myData.pCurrentIcon, iModifierType);
 			}
 			cairo_dock_start_icon_animation (myData.pCurrentIcon, myData.pCurrentDock);
 			myData.bIgnoreIconState = FALSE;
@@ -585,7 +592,8 @@
 {
 	g_return_val_if_fail (!cd_do_session_is_off (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
 	
-	cd_do_close_session ();
+	if (! myData.bIgnoreClick)
+		cd_do_close_session ();
 	
 	return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 }
 
=== modified file 'Remote-Control/src/applet-struct.h'
--- Remote-Control/src/applet-struct.h	2012-02-16 01:45:57 +0000
+++ Remote-Control/src/applet-struct.h	2012-03-21 20:37:19 +0000
@@ -48,7 +48,7 @@
 	Icon *pCurrentIcon;
 	CairoDock *pCurrentDock;
 	gboolean bIgnoreIconState;
-	
+	gboolean bIgnoreClick;
 	int iPrevMouseX, iPrevMouseY;
 	int iMouseX, iMouseY;
 	int iMotionCount;
 
=== modified file 'Scooby-Do/src/applet-appli-finder.c'
--- Scooby-Do/src/applet-appli-finder.c	2010-08-10 00:05:57 +0000
+++ Scooby-Do/src/applet-appli-finder.c	2012-03-21 20:37:19 +0000
@@ -174,17 +174,18 @@
 	int iNbAppliLoaded = 0;
 	Icon *pIcon;
 	gboolean bLoadTexture = (CAIRO_CONTAINER_IS_OPENGL (g_pMainDock));
+	gint iDesiredIconSize = 10; // cairo_dock_search_icon_size (GTK_ICON_SIZE_MENU); // 16px (was 48px but why?) // to data?
 	GList *a;
 	for (a = myData.pCurrentApplicationToLoad; a != NULL && iNbAppliLoaded < 3; a = a->next)  // on en charge 3 d'un coup.
 	{
 		pIcon = a->data;
 		if (pIcon->pIconBuffer == NULL)
 		{
-			pIcon->fWidth = 48.;
-			pIcon->fHeight = 48.;
+			pIcon->fWidth = iDesiredIconSize;
+			pIcon->fHeight = iDesiredIconSize;
 			pIcon->fScale = 1.;
-			gchar *cIconPath = cairo_dock_search_icon_s_path (pIcon->cFileName);
-			pIcon->pIconBuffer = cairo_dock_create_surface_for_icon (cIconPath, 48., 48);
+			gchar *cIconPath = cairo_dock_search_icon_s_path (pIcon->cFileName, iDesiredIconSize);
+			pIcon->pIconBuffer = cairo_dock_create_surface_for_icon (cIconPath, iDesiredIconSize, iDesiredIconSize);
 			g_free (cIconPath);
 			if (bLoadTexture)
 				pIcon->iIconTexture = cairo_dock_create_texture_from_surface (pIcon->pIconBuffer);
@@ -230,14 +231,14 @@
 			bMatch = FALSE;
 		else
 		{
-			bMatch = (g_strncasecmp (pIcon->cCommand, myData.sCurrentText->str, myData.sCurrentText->len) == 0);
+			bMatch = (g_ascii_strncasecmp (pIcon->cCommand, myData.sCurrentText->str, myData.sCurrentText->len) == 0);
 			if (!bMatch)
 			{
 				gchar *str = strchr (pIcon->cCommand, '-');  // on se limite au 1er tiret.
 				if (str && *(str-1) != ' ')  // on verifie qu'il n'est pas un tiret d'option
 				{
 					str ++;
-					bMatch = (g_strncasecmp (str, myData.sCurrentText->str, myData.sCurrentText->len) == 0);
+					bMatch = (g_ascii_strncasecmp (str, myData.sCurrentText->str, myData.sCurrentText->len) == 0);
 				}
 			}
 		}
 
=== modified file 'Scooby-Do/src/applet-icon-finder.c'
--- Scooby-Do/src/applet-icon-finder.c	2011-09-26 12:56:12 +0000
+++ Scooby-Do/src/applet-icon-finder.c	2012-03-21 20:37:19 +0000
@@ -43,7 +43,7 @@
 			if (str && *(str-1) != ' ')  // on verifie qu'il n'est pas un tiret d'option
 			{
 				str ++;
-				bMatch = (g_strncasecmp (str, cCommandPrefix, length) == 0);
+				bMatch = (g_ascii_strncasecmp (str, cCommandPrefix, length) == 0);
 			}
 			if (!bMatch && pIcon->cName)
 				bMatch = (g_ascii_strncasecmp (cCommandPrefix, pIcon->cName, length) == 0);
 
=== modified file 'Status-Notifier/data/Status-Notifier.conf.in'
--- Status-Notifier/data/Status-Notifier.conf.in	2012-02-16 01:45:57 +0000
+++ Status-Notifier/data/Status-Notifier.conf.in	2012-03-21 20:37:19 +0000
@@ -22,8 +22,8 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#B Always display the icon, even when the dock is hidden?
-always visi = false
+#Y+[No;0;0;With default background;0;0;With custom background;1;1] Always display the icon, even when the dock is hidden?
+always_visi = 0
 
 #C+ Background color to add in this case
 bg color = .8;.8;.8;.5
 
=== modified file 'Status-Notifier/src/CMakeLists.txt'
--- Status-Notifier/src/CMakeLists.txt	2012-02-16 01:45:57 +0000
+++ Status-Notifier/src/CMakeLists.txt	2012-03-21 20:37:19 +0000
@@ -26,6 +26,7 @@
 add_definitions (-DMY_APPLET_ICON_FILE="icon.png")
 add_definitions (-DINDICATOR_OLD_NAMES=${INDICATOR_OLD_NAMES})
 add_definitions (-DINDICATOR_APPLICATIONADDED_HAS_HINT=${INDICATOR_APPLICATIONADDED_HAS_HINT})
+add_definitions (-DINDICATOR_APPLICATIONADDED_HAS_TITLE=${INDICATOR_APPLICATIONADDED_HAS_TITLE})
 add_definitions (-DCD_PLUGINS_DIR="${pluginsdir}")
 if (DBUSMENU_GTK3_NEW)
 	add_definitions (-DDBUSMENU_GTK3_NEW=1)
 
=== modified file 'Status-Notifier/src/applet-draw.c'
--- Status-Notifier/src/applet-draw.c	2012-02-16 01:45:57 +0000
+++ Status-Notifier/src/applet-draw.c	2012-03-21 20:37:19 +0000
@@ -101,21 +101,24 @@
 		myData.iNbLines = myConfig.iNbLines;
 		myData.iItemSize = MAX (1, iHeight / myConfig.iNbLines);
 		myData.iNbColumns = ceil ((float)iNbItems / myConfig.iNbLines);  // nb items by line.
-		w = MAX (w0, myData.iItemSize * myData.iNbColumns);
+		w = MAX (w0, myData.iItemSize * myData.iNbColumns + myIconsParam.iIconGap * (myData.iNbColumns - 1));
 	}
 	else
 	{
 		myData.iNbColumns = myConfig.iNbLines;
 		myData.iItemSize = MAX (1, iHeight / myConfig.iNbLines);
 		myData.iNbLines = ceil ((float)iNbItems / myConfig.iNbLines);  // nb items by line.
-		w = MAX (w0, myData.iItemSize * myData.iNbLines);
+		w = MAX (w0, myData.iItemSize * myData.iNbLines + myIconsParam.iIconGap * (myData.iNbLines - 1));
 	}
 	cd_debug ("=== required width: %d (now: %d)", w, iWidth);
 	
 	// if width has changed, update the icon size.
 	if (w != iWidth)
 	{
-		cairo_dock_resize_applet (myApplet, w, h0);
+		if (myContainer->bIsHorizontal)
+			cairo_dock_resize_applet (myApplet, w, h0);
+		else
+			cairo_dock_resize_applet (myApplet, w0, w);
 	}
 }
 
@@ -143,8 +146,13 @@
 		cairo_paint (myDrawContext);
 		cairo_restore (myDrawContext);
 	}
-	
-	int x_pad = (iWidth - myData.iItemSize * myData.iNbColumns) / 2;  // pad to center the drawing.
+
+	int iIconGap;
+	if (myConfig.bResizeIcon)
+		iIconGap = myIconsParam.iIconGap;
+	else
+		iIconGap = 0;
+	int x_pad = (iWidth - myData.iItemSize * myData.iNbColumns - iIconGap * (myData.iNbColumns - 1)) / 2;  // pad to center the drawing.
 	int y_pad = (iHeight - myData.iItemSize * myData.iNbLines) / 2;
 	cd_debug ("pad: %d;%d; grid: %dx%d, icon: %dx%d", x_pad, y_pad, myData.iNbLines, myData.iNbColumns, iWidth, iHeight);
 	
@@ -160,7 +168,7 @@
 			cd_debug ("===  draw %s (%d)", pItem->cId, pItem->iPosition);
 			cairo_set_source_surface (myDrawContext,
 				pItem->pSurface,
-				x_pad + j * myData.iItemSize,
+				x_pad + j * (myData.iItemSize + iIconGap),
 				y_pad + i * myData.iItemSize);
 			cairo_paint (myDrawContext);
 			
@@ -208,7 +216,7 @@
 		{
 			if (iPrevSize != myData.iItemSize || pItem->pSurface == NULL)
 			{
-				gchar *cIconPath = cd_satus_notifier_search_item_icon_s_path (pItem);
+				gchar *cIconPath = cd_satus_notifier_search_item_icon_s_path (pItem, myData.iItemSize);
 				if (cIconPath != NULL)
 				{
 					if (pItem->pSurface != NULL)
@@ -256,11 +264,16 @@
 	}
 	
 	// get index on the grid.
-	int x_pad = (iWidth - myData.iItemSize * myData.iNbColumns) / 2;
+	int iIconGap;
+	if (myConfig.bResizeIcon)
+		iIconGap = myIconsParam.iIconGap;
+	else
+		iIconGap = 0;
+	int x_pad = (iWidth - myData.iItemSize * myData.iNbColumns - iIconGap * (myData.iNbColumns - 1)) / 2;
 	int y_pad = (iHeight - myData.iItemSize * myData.iNbLines) / 2;
 	
 	int line, col;  // line, column
-	col = (iMouseX - x_pad) / myData.iItemSize;
+	col = (iMouseX - x_pad) / (myData.iItemSize + iIconGap);
 	line = (iMouseY - y_pad) / myData.iItemSize;
 	
 	// get item from index.
@@ -294,7 +307,7 @@
 {
 	if (myConfig.bCompactMode)
 	{
-		gchar *cIconPath = cd_satus_notifier_search_item_icon_s_path (pItem);
+		gchar *cIconPath = cd_satus_notifier_search_item_icon_s_path (pItem, myData.iItemSize);
 		if (cIconPath != NULL)
 		{
 			if (pItem->pSurface != NULL)
 
=== modified file 'Status-Notifier/src/applet-host-ias.c'
--- Status-Notifier/src/applet-host-ias.c	2012-02-16 01:45:57 +0000
+++ Status-Notifier/src/applet-host-ias.c	2012-03-21 20:37:19 +0000
@@ -94,7 +94,9 @@
 		data2);
 }
 #else  // Natty
-#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+static void _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING_STRING (
+#elif (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
 static void _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING (
 #else
 static void _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING (
@@ -107,7 +109,9 @@
 	gpointer marshal_data)
 {
 	//cd_debug ("=== %s ()\n", __func__);
-	#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+	#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+	typedef void (*GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING_STRING) (
+	#elif (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
 	typedef void (*GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING) (
 	#else
 	typedef void (*GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING) (
@@ -123,9 +127,14 @@
 		gchar      *arg_8,
 		#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
 		gchar      *arg_9,
+		#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+		gchar      *arg_10,
+		#endif
 		#endif
 		gpointer     data2);
-	#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+	#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+	register GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING_STRING callback;
+	#elif (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
 	register GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING callback;
 	#else
 	register GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING callback;
@@ -133,7 +142,9 @@
 	register GCClosure *cc = (GCClosure*) closure;
 	register gpointer data1, data2;
 	// return_value est NULL ici, car la callback ne renvoit rien.
-	#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+	#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+	g_return_if_fail (n_param_values == 11);
+	#elif (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
 	g_return_if_fail (n_param_values == 10);
 	#else
 	g_return_if_fail (n_param_values == 9);
@@ -149,7 +160,9 @@
 		data1 = g_value_peek_pointer (param_values + 0);
 		data2 = closure->data;
 	}
-	#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+	#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+	callback = (GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING_STRING)
+	#elif (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
 	callback = (GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING)
 	#else
 	callback = (GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING)
@@ -167,6 +180,9 @@
 		(char*) g_value_get_string (param_values + 8),
 		#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
 		(char*) g_value_get_string (param_values + 9),
+		#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+		(char*) g_value_get_string (param_values + 10),
+		#endif
 		#endif
 		data2);
 }
@@ -176,21 +192,27 @@
  /// Signals ///
 ///////////////
 
-static void on_new_application (DBusGProxy *proxy_watcher, const gchar *cIconName, gint iPosition, const gchar *cAdress, const gchar *cObjectPath, const gchar *cIconThemePath, const gchar *cLabel, const gchar *cLabelGuide,
+static void on_new_application (DBusGProxy *proxy_watcher, const gchar *cIconName, gint iPosition, const gchar *cAddress, const gchar *cObjectPath, const gchar *cIconThemePath, const gchar *cLabel, const gchar *cLabelGuide,
 #if (INDICATOR_OLD_NAMES == 0)  // Natty
 const gchar *cAccessbleDesc,  // WTF is this new param ??
 #if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
 const gchar *cHint,  // <irony> is this a hint to work around a clumsy API ? </irony>
+#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+const gchar *cTitle,
+#endif
 #endif
 #endif
 CairoDockModuleInstance *myApplet)
 {
 	CD_APPLET_ENTER;
-	cd_debug ("=== %s (%s, %s, %s, %s, %d)", __func__, cAdress, cObjectPath, cIconName, cIconThemePath, iPosition);
+	cd_debug ("=== %s (%s, %s, %s, %s, %d)", __func__, cAddress, cObjectPath, cIconName, cIconThemePath, iPosition);
 	#if (INDICATOR_OLD_NAMES == 0)  // Natty
 	cd_debug ("    %s", cAccessbleDesc);
 	#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
 	cd_debug ("    %s", cHint);
+	#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+	cd_debug ("    %s", cTitle);
+	#endif
 	#endif
 	#endif
 	
@@ -207,14 +229,21 @@
 		}
 	}
 	
-	cd_satus_notifier_add_new_item_with_default (cAdress, cObjectPath, iPosition,
+	cd_satus_notifier_add_new_item_with_default (cAddress, cObjectPath, iPosition,
 		#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
 		cIconName ? cIconName : cHint,
 		#else
 		cIconName,
 		#endif
 		cIconThemePath,
-		cLabel);
+		#if (INDICATOR_OLD_NAMES == 0)
+		cAccessbleDesc && *cAccessbleDesc != '\0' ? cAccessbleDesc :
+		#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+		cTitle && *cTitle != '\0' ? cTitle :
+		#endif
+		#endif
+		cLabel
+		);
 	
 	CD_APPLET_LEAVE ();
 }
@@ -264,6 +293,15 @@
 			G_TYPE_STRING,  // iconpath
 			G_TYPE_STRING,  // label
 			G_TYPE_STRING,  // labelguide
+			#if (INDICATOR_OLD_NAMES == 0)  // Natty
+			G_TYPE_STRING,  // accessibledesc
+			#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+			G_TYPE_STRING,  // hint
+			#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+			G_TYPE_STRING,  // title
+			#endif
+			#endif
+			#endif
 			G_TYPE_INVALID));
 	gboolean bSuccess = dbus_g_proxy_end_call (proxy,
 		call_id,
@@ -280,14 +318,15 @@
 		CD_APPLET_LEAVE ();
 	
 	//\______________________ build each items.
-	cd_debug ("=== got %d aplications", pApplications->len);
+	cd_debug ("=== got %d applications", pApplications->len);
 	guint i, j;
 	GValueArray *va;
 	GValue *v;
-	CDStatusNotifierItem *pItem=NULL;
+	CDStatusNotifierItem *pItem = NULL;
 	//cd_debug ("=== %d apps in the systray", pApplications->len);
 	for (i = 0; i < pApplications->len; i ++)
 	{
+		// get the properties of the item
 		cd_debug ("=== %d) %p", i, pApplications->pdata[i]);
 		va = pApplications->pdata[i];
 		if (! va)
@@ -295,11 +334,14 @@
 		
 		const gchar *cIconName = NULL;
 		gint iPosition = -1;
-		const gchar *cAdress = NULL;
+		const gchar *cAddress = NULL;
 		const gchar *cObjectPath = NULL;
 		const gchar *cIconThemePath = NULL;
 		const gchar *cLabel = NULL;
 		const gchar *cLabelGuide = NULL;
+		const gchar *cAccessibleDesc = NULL; // natty
+		// const gchar *cHint = NULL; // oneiric
+		const gchar *cTitle = NULL;  // precise
 		
 		v = g_value_array_get_nth (va, 0);
 		if (v && G_VALUE_HOLDS_STRING (v))
@@ -311,7 +353,7 @@
 		
 		v = g_value_array_get_nth (va, 2);
 		if (v && G_VALUE_HOLDS_STRING (v))
-			cAdress = g_value_get_string (v);
+			cAddress = g_value_get_string (v);
 		
 		v = g_value_array_get_nth (va, 3);
 		if (v && G_VALUE_HOLDS (v, DBUS_TYPE_G_OBJECT_PATH))
@@ -337,22 +379,59 @@
 		if (v && G_VALUE_HOLDS_STRING (v))
 			cLabelGuide = g_value_get_string (v);
 		
-		cd_debug ("===  + item {%s ; %d ; %s ; %s ; %s ; %s ; %s}",
+		#if (INDICATOR_OLD_NAMES == 0)
+		v = g_value_array_get_nth (va, 7);
+		if (v && G_VALUE_HOLDS_STRING (v))
+			cAccessibleDesc = g_value_get_string (v);
+		
+		#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+		v = g_value_array_get_nth (va, 9);
+		if (v && G_VALUE_HOLDS_STRING (v))
+			cTitle = g_value_get_string (v);
+		#endif
+		#endif
+		
+		cd_debug ("===  + item {%s ; %d ; %s ; %s ; %s ; %s ; %s ; %s ; %s}",
 			cIconName,
 			iPosition,
-			cAdress,
+			cAddress,
 			cObjectPath,
 			cIconThemePath,
 			cLabel,
-			cLabelGuide);
-		
-		pItem = cd_satus_notifier_create_item (cAdress, cObjectPath);
+			cLabelGuide,
+			cAccessibleDesc,
+			cTitle);
+		
+		if (!cAddress)
+			continue;
+		
+		// ensure we're not duplicating an existing item (this should never happen if the service is ok, but since it doesn't depend on us, let's be careful).
+		GList *it;
+		for (it = myData.pItems; it != NULL; it = it->next)
+		{
+			pItem = it->data;
+			if (strcmp (cAddress, pItem->cService) == 0)  // pItem->cService is never NULL
+			{
+				cd_warning ("Duplicated item: %s (%s)", cIconName, cAddress);
+				return;
+			}
+			if (iPosition != -1 && pItem->iPosition == iPosition)
+			{
+				cd_warning ("Possible duplicated item: %s/%s/%d , %s/%s/%d)", cIconName, cAddress, iPosition, pItem->cIconName, pItem->cService, pItem->iPosition);
+			}
+		}
+		
+		// make a new item based on these properties.
+		pItem = cd_satus_notifier_create_item (cAddress, cObjectPath);
 		if (! pItem)
 			continue;
 		if (pItem->iPosition == -1)
 			pItem->iPosition = iPosition;
-		if (pItem->cTitle == NULL && pItem->cLabel == NULL)
-			pItem->cLabel = g_strdup (cLabel && *cLabel != '\0' ? cLabel : pItem->cId);
+		if (pItem->cTitle == NULL && pItem->cLabel == NULL && pItem->cAccessibleDesc == NULL)
+			pItem->cLabel = g_strdup (cAccessibleDesc && *cAccessibleDesc != '\0' ? cAccessibleDesc :
+			                          cLabel && *cLabel != '\0' ? cLabel :
+			                          cTitle && *cTitle != '\0' ? cTitle :
+			                          NULL);  // don't use cId as a fallback, because it often has cryptic names (nm-applet ; dropbox-xxxx). If the appli doesn't provide a title, it's its fault.
 		myData.pItems = g_list_prepend (myData.pItems, pItem);
 	}
 	
@@ -396,7 +475,9 @@
 			G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
 	#else  // Natty
 	dbus_g_object_register_marshaller(
-	#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+	#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+	_cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING_STRING,
+	#elif (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
 	_cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING,
 	#else
 	_cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING,
@@ -406,6 +487,9 @@
 			G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
 			#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
 			G_TYPE_STRING,
+			#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+			G_TYPE_STRING,
+			#endif
 			#endif
 			G_TYPE_INVALID);
 	#endif
@@ -425,6 +509,9 @@
 		G_TYPE_STRING,  // accessibledesc
 		#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
 		G_TYPE_STRING, // hint => only with indicator-0.4 (Oneiric)
+		#if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1)
+		G_TYPE_STRING, // title => only with indicator-0.4.90 (Precise)
+		#endif
 		#endif
 		#endif
 		G_TYPE_INVALID);
@@ -436,6 +523,7 @@
 		G_TYPE_INVALID);
 	dbus_g_proxy_connect_signal(myData.pProxyIndicatorApplicationService, "ApplicationRemoved",
 		G_CALLBACK(on_removed_application), myApplet, NULL);
+	// TODO? ApplicationIconChanged, ApplicationIconThemePathChanged, ApplicationLabelChanged, ApplicationTitleChanged
 }
 
   //////////////////
 
=== modified file 'Status-Notifier/src/applet-host.c'
--- Status-Notifier/src/applet-host.c	2012-02-16 01:45:57 +0000
+++ Status-Notifier/src/applet-host.c	2012-03-21 20:37:19 +0000
@@ -203,7 +203,8 @@
 	g_hash_table_insert (myData.pThemePaths, g_strdup (cThemePath), GINT_TO_POINTER (ref));  // et on la met a jour dans la table.
 	
 	if (ref == 1)  // premiere fois qu'on voit ce chemin.
-		gtk_icon_theme_append_search_path (gtk_icon_theme_get_default(), cThemePath);  // append car ce sont des icones par defaut.
+		///gtk_icon_theme_append_search_path (gtk_icon_theme_get_default(), cThemePath);  // append car ce sont des icones par defaut.
+		cairo_dock_add_path_to_icon_theme (cThemePath);
 }
 
 void cd_satus_notifier_remove_theme_path (const gchar * cThemePath)
@@ -217,7 +218,8 @@
 	{
 		g_hash_table_remove (myData.pThemePaths, cThemePath);  // on le supprime de la table.
 		
-		GtkIconTheme *pIconTheme = gtk_icon_theme_get_default();  // et du theme.
+		cairo_dock_remove_path_from_icon_theme (cThemePath);
+		/**GtkIconTheme *pIconTheme = gtk_icon_theme_get_default();  // et du theme.
 		gchar **paths = NULL;
 		gint iNbPaths = 0;
 		gtk_icon_theme_get_search_path (pIconTheme, &paths, &iNbPaths);
@@ -239,7 +241,7 @@
 			gtk_icon_theme_set_search_path (pIconTheme, (const gchar **)paths, iNbPaths - 1);
 		}
 		
-		g_strfreev (paths);
+		g_strfreev (paths);*/
 	}
 	else  // on decremente la reference.
 	{
 
=== modified file 'Status-Notifier/src/applet-item.c'
--- Status-Notifier/src/applet-item.c	2012-02-16 01:45:57 +0000
+++ Status-Notifier/src/applet-item.c	2012-03-21 20:37:19 +0000
@@ -145,6 +145,8 @@
 	
 	g_free (pItem->cIconName);
 	pItem->cIconName = cairo_dock_dbus_get_property_as_string (pItem->pProxyProps, CD_STATUS_NOTIFIER_ITEM_IFACE, "IconName");
+	g_free (pItem->cAccessibleDesc);
+	pItem->cAccessibleDesc = cairo_dock_dbus_get_property_as_string (pItem->pProxyProps, CD_STATUS_NOTIFIER_ITEM_IFACE, "IconAccessibleDesc");
 	//g_print ("===  new icon : %s\n", pItem->cIconName);
 	
 	if (pItem->iStatus != CD_STATUS_NEEDS_ATTENTION)
@@ -328,7 +330,7 @@
 	CD_APPLET_LEAVE ();
 }
 
-gchar *cd_satus_notifier_search_item_icon_s_path (CDStatusNotifierItem *pItem)
+gchar *cd_satus_notifier_search_item_icon_s_path (CDStatusNotifierItem *pItem, gint iSize)
 {
 	g_return_val_if_fail (pItem != NULL, NULL);
 	gchar *cImageName = (pItem->iStatus == CD_STATUS_NEEDS_ATTENTION ? pItem->cAttentionIconName: pItem->cIconName);
@@ -346,7 +348,7 @@
 	
 	if (cIconPath == NULL)
 	{
-		cIconPath = cairo_dock_search_icon_s_path (cImageName);
+		cIconPath = cairo_dock_search_icon_s_path (cImageName, iSize);
 	}
 
 	if (cIconPath == NULL)
@@ -358,7 +360,7 @@
 CDStatusNotifierItem *cd_satus_notifier_create_item (const gchar *cService, const gchar *cObjectPath)
 {
 	g_return_val_if_fail  (cService != NULL, NULL);
-	g_print ("=== %s (%s, %s)\n", __func__, cService, cObjectPath);
+	cd_debug ("=== %s (%s, %s)", __func__, cService, cObjectPath);
 	
 	gchar *str = strchr (cService, '/');  // just to be sure.
 	if (str)
@@ -372,7 +374,6 @@
 		const gchar *str = strrchr (cObjectPath, '/');
 		if (str)
 		{
-			
 			cRealObjectPath = g_strndup (cObjectPath, str - cObjectPath);
 		}
 	}
@@ -470,7 +471,7 @@
 	
 	const gchar *cLabel = NULL;
 	v = g_hash_table_lookup (hProps, "XAyatanaLabel");
-	if (v && G_VALUE_HOLDS_BOXED(v))
+	if (v && G_VALUE_HOLDS_STRING(v))
 	{
 		cLabel = g_value_get_string (v);
 	}
@@ -478,11 +479,18 @@
 	
 	const gchar *cLabelGuide = NULL;
 	v = g_hash_table_lookup (hProps, "XAyatanaLabelGuide");
-	if (v && G_VALUE_HOLDS_BOXED(v))
+	if (v && G_VALUE_HOLDS_STRING(v))
 	{
 		cLabelGuide = g_value_get_string (v);
 	}
 	//g_print ("===   cLabelGuide '%s'\n", cLabelGuide);
+
+	const gchar *cAccessibleDesc = NULL;
+	v = g_hash_table_lookup (hProps, "IconAccessibleDesc");
+	if (v && G_VALUE_HOLDS_STRING(v))
+	{
+		cAccessibleDesc = g_value_get_string (v);
+	} // Updated with ApplicationIconChanged
 	
 	// properties supported by KDE.
 	const gchar *cTitle = NULL;
@@ -491,7 +499,7 @@
 	{
 		cTitle = g_value_get_string (v);
 	}
-	cd_debug ("===   Title '%s", cTitle);
+	cd_debug ("===   Title '%s'", cTitle);
 	
 	v = g_hash_table_lookup (hProps, "WindowId");
 	guint iWindowId = 0;
@@ -524,6 +532,13 @@
 		pToolTipTab = g_value_get_boxed (v);
 	}
 	
+	gboolean bItemIsMenu = FALSE;  // "when is true the dbusmenu will be shown instead of emitting Activate()"
+	v = g_hash_table_lookup (hProps, "ItemIsMenu");
+	if (v && G_VALUE_HOLDS_BOOLEAN (v))
+	{
+		bItemIsMenu = g_value_get_boolean (v);
+	}
+	
 	DBusGProxy *pProxyItem = cairo_dock_create_new_session_proxy (
 		cService,
 		cRealObjectPath ? cRealObjectPath : cObjectPath,
@@ -541,7 +556,9 @@
 	pItem->cTitle = g_strdup (cTitle);
 	pItem->cLabel = g_strdup (cLabel);
 	pItem->cLabelGuide = g_strdup (cLabelGuide);
-	pItem->cMenuPath = (cMenuPath ? g_strdup (cMenuPath) : g_strdup (cObjectPath));
+	pItem->cAccessibleDesc = g_strdup (cAccessibleDesc);
+	///pItem->cMenuPath = (cMenuPath ? g_strdup (cMenuPath) : g_strdup (cObjectPath));
+	pItem->cMenuPath = g_strdup (cMenuPath);  // if NULL, we'll just send the ContextMenu() signal.
 	pItem->iWindowId = iWindowId;
 	pItem->iCategory = _find_category (cCategory);
 	pItem->iStatus = _find_status (cStatus);
@@ -550,6 +567,7 @@
 	pItem->cAttentionIconName = g_strdup (cAttentionIconName);
 	pItem->cAttentionMovieName = g_strdup (cAttentionMovieName);
 	pItem->cOverlayIconName = g_strdup (cOverlayIconName);
+	pItem->bItemIsMenu = bItemIsMenu;
 	if (pToolTipTab)
 	{
 		pItem->pToolTip = _make_tooltip_from_dbus_struct (pToolTipTab);
@@ -630,6 +648,7 @@
 	g_free (pItem->cAttentionIconName);
 	g_free (pItem->cLabel);
 	g_free (pItem->cLabelGuide);
+	g_free (pItem->cAccessibleDesc);
 	g_free (pItem->cTitle);
 	g_free (pItem->cAttentionMovieName);
 	g_free (pItem->cOverlayIconName);
@@ -645,7 +664,7 @@
 	int iHeight = icon->iImageHeight;
 	
 	CDStatusNotifierItem *pItem = cd_satus_notifier_get_item_from_icon (icon);
-	gchar *cIconPath = cd_satus_notifier_search_item_icon_s_path (pItem);
+	gchar *cIconPath = cd_satus_notifier_search_item_icon_s_path (pItem, MAX (iWidth, iHeight));
 	if (cIconPath != NULL && *cIconPath != '\0')
 		icon->pIconBuffer = cairo_dock_create_surface_from_image_simple (cIconPath,
 			iWidth,
 
=== modified file 'Status-Notifier/src/applet-item.h'
--- Status-Notifier/src/applet-item.h	2012-02-16 01:45:57 +0000
+++ Status-Notifier/src/applet-item.h	2012-03-21 20:37:19 +0000
@@ -27,7 +27,7 @@
 
 void cd_free_item (CDStatusNotifierItem *pItem);
 
-gchar *cd_satus_notifier_search_item_icon_s_path (CDStatusNotifierItem *pItem);
+gchar *cd_satus_notifier_search_item_icon_s_path (CDStatusNotifierItem *pItem, gint iSize);
 
 Icon *cd_satus_notifier_create_icon_for_item (CDStatusNotifierItem *pItem);
 
 
=== modified file 'Status-Notifier/src/applet-notifications.c'
--- Status-Notifier/src/applet-notifications.c	2012-02-16 01:45:57 +0000
+++ Status-Notifier/src/applet-notifications.c	2012-03-21 20:37:19 +0000
@@ -87,7 +87,7 @@
 static inline gboolean _popup_menu (CDStatusNotifierItem *pItem, Icon *pIcon, CairoContainer *pContainer)
 {
 	gboolean r = FALSE;
-	if (pItem->cMenuPath != NULL)
+	if (pItem->cMenuPath != NULL && *pItem->cMenuPath != '\0' && strcmp (pItem->cMenuPath, "/NO_DBUSMENU") != 0)  // hopefully, if the item doesn't have a dbusmenu, it will not set something different as these 2 choices.
 	{
 		if (pItem->pMenu == NULL)
 			pItem->pMenu = dbusmenu_gtkmenu_new ((gchar *)pItem->cService, (gchar *)pItem->cMenuPath);
@@ -98,15 +98,17 @@
 		}
 	}
 
-	if (!r)
+	if (!r)  // no menu available, send the corresponding action
 	{
 		r = _emit_click (pItem, pIcon, pContainer, "ContextMenu");
 	}
 
-	if (!r)
+	if (!r)  // no luck, try to fallback on 'activate()'
 	{
 		r = _emit_click (pItem, pIcon, pContainer, "Activate");
 	}
+	
+	return r;
 }
 
 CD_APPLET_ON_CLICK_BEGIN
@@ -114,19 +116,22 @@
 	//g_print ("click on item '%s'\n", pItem?pItem->cService:"none");
 	if (pItem != NULL)
 	{
-		if (myConfig.bMenuOnLeftClick)
+		// Ubuntu-like: show the menu on left click as the sole action (right-click = usual Cairo-Dock menu).
+		if (myConfig.bMenuOnLeftClick || pItem->bItemIsMenu)  // if bItemIsMenu: "The item only support the context menu, the visualization should prefer sending ContextMenu() instead of Activate()"
 		{
 			_popup_menu (pItem, CD_APPLET_CLICKED_ICON, CD_APPLET_CLICKED_CONTAINER);
 		}
-		else
+		else  // KDE-like: activate the item on left click, and show its menu on right-click.
 		{
-			gboolean r = _emit_click (pItem, CD_APPLET_CLICKED_ICON, CD_APPLET_CLICKED_CONTAINER, "Activate");
+			gboolean r;
+			r = _emit_click (pItem, CD_APPLET_CLICKED_ICON, CD_APPLET_CLICKED_CONTAINER, "Activate");
+			
 			if (!r)
 			{
 				if (pItem->cId != NULL)
 				{
 					/// TODO: try to get the icon in the taskbar, because launch the command doesn't raise the window if it was already visible (but it does pop up it if it was hidden, usually).
-					cairo_dock_launch_command (pItem->cId);  // lancer une nouvelle fois l'appli montre sa fenetre (enfin, generalement).
+					cairo_dock_launch_command (pItem->cId);  // try to launch the application because generally this click shows its item's window.
 				}
 			}
 		}
@@ -197,7 +202,7 @@
 		gchar *cIconPath = NULL;
 		if (pItemData->pToolTip->cIconName)
 		{
-			cIconPath = cairo_dock_search_icon_s_path (pItemData->pToolTip->cIconName);
+			cIconPath = cairo_dock_search_icon_s_path (pItemData->pToolTip->cIconName, 32); // dialog
 		}
 		
 		cairo_dock_show_temporary_dialog_with_icon (cText, pIcon, CAIRO_CONTAINER (myIcon->pSubDock), 3000, cIconPath ? cIconPath : "same icon");
@@ -251,7 +256,13 @@
 		if (pItem == NULL)
 			CD_APPLET_SET_NAME_FOR_MY_ICON (NULL);
 		else
-			CD_APPLET_SET_NAME_FOR_MY_ICON (pItem->cLabel ? pItem->cLabel : pItem->cTitle ? pItem->cTitle : pItem->cId);
+			CD_APPLET_SET_NAME_FOR_MY_ICON (
+				pItem->cAccessibleDesc && *pItem->cAccessibleDesc != '\0' ? pItem->cAccessibleDesc :
+				pItem->cLabel && *pItem->cLabel != '\0' ? pItem->cLabel :
+				pItem->cTitle && *pItem->cTitle != '\0' ? pItem->cTitle :
+				NULL);
+				// pItem->cId && *pItem->cId != '\0' ? pItem->cId :
+				// maybe better to not display cId, e.g: nm-applet ; dropbox-xxxx ; etc.
 		
 		if (myDock)
 			CAIRO_DOCK_REDRAW_MY_CONTAINER;
 
=== modified file 'Status-Notifier/src/applet-struct.h'
--- Status-Notifier/src/applet-struct.h	2012-02-16 01:45:57 +0000
+++ Status-Notifier/src/applet-struct.h	2012-03-21 20:37:19 +0000
@@ -84,12 +84,13 @@
 	gchar *cLabel;
 	gchar *cLabelGuide;
 	gchar *cMenuPath;
+	gchar *cAccessibleDesc;
 	// additionnal props supported by KDE
 	Window iWindowId;
 	gchar *cAttentionMovieName;
 	gchar *cOverlayIconName;
 	CDToolTip *pToolTip;
-	
+	gboolean bItemIsMenu;
 	gint iPosition;  // donnee par l'indicator service
 	guint iSidPopupTooltip;
 	// data
 
=== modified file 'System-Monitor/data/System-Monitor.conf.in'
--- System-Monitor/data/System-Monitor.conf.in	2012-02-16 01:45:57 +0000
+++ System-Monitor/data/System-Monitor.conf.in	2012-03-21 20:37:19 +0000
@@ -20,8 +20,8 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#B Always display the icon, even when the dock is hidden?
-always visi = false
+#Y+[No;0;0;With default background;0;0;With custom background;1;1] Always display the icon, even when the dock is hidden?
+always_visi = 0
 
 #C+ Background color to add in this case
 bg color = .8;.8;.8;.5
 
=== modified file 'Toons/data/Toons.conf.in'
--- Toons/data/Toons.conf.in	2012-02-16 01:45:57 +0000
+++ Toons/data/Toons.conf.in	2012-03-21 20:37:19 +0000
@@ -20,8 +20,8 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#B Always display the icon, even when the dock is hidden?
-always visi = false
+#Y+[No;0;0;With default background;0;0;With custom background;1;1] Always display the icon, even when the dock is hidden?
+always_visi = 0
 
 #C+ Background color to add in this case
 bg color = .8;.8;.8;.5
 
=== modified file 'Toons/src/applet-notifications.c'
--- Toons/src/applet-notifications.c	2012-02-16 01:45:57 +0000
+++ Toons/src/applet-notifications.c	2012-03-21 20:37:19 +0000
@@ -36,7 +36,7 @@
 CD_APPLET_ON_UPDATE_ICON_BEGIN
 	//\_________________ On chope les coordonnees du curseur par rapport a notre container.
 	int iMouseX, iMouseY;
- 	gdk_window_get_pointer (gldi_container_get_gdk_window (myContainer), &iMouseX, &iMouseY, NULL);
+ 	gldi_display_get_pointer (&iMouseX, &iMouseY);
 	
 	//\_________________ On calcule les nouvelles coordonnees.
 	gboolean bNeedsUpdate = FALSE;
 
=== modified file 'alsaMixer/data/AlsaMixer.conf.in'
--- alsaMixer/data/AlsaMixer.conf.in	2012-02-16 01:45:57 +0000
+++ alsaMixer/data/AlsaMixer.conf.in	2012-03-21 20:37:19 +0000
@@ -21,8 +21,8 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#B Always display the icon, even when the dock is hidden?
-always visi = false
+#Y+[No;0;0;With default background;0;0;With custom background;1;1] Always display the icon, even when the dock is hidden?
+always_visi = 0
 
 #C+ Background color to add in this case
 bg color = .8;.8;.8;.5
 
=== modified file 'alsaMixer/data/preview.jpg'
 Binary files alsaMixer/data/preview.jpg	2010-04-20 01:52:21 +0000 and alsaMixer/data/preview.jpg	2012-03-21 20:37:19 +0000 differ
=== modified file 'alsaMixer/src/CMakeLists.txt'
--- alsaMixer/src/CMakeLists.txt	2012-02-16 01:45:57 +0000
+++ alsaMixer/src/CMakeLists.txt	2012-03-21 20:37:19 +0000
@@ -37,6 +37,7 @@
 add_definitions (-DMY_APPLET_ICON_FILE="icon.png")
 if ("${with_soundmenu}" STREQUAL "yes")
 	add_definitions (-DSOUND_SERVICE_SUPPORT="1")
+	add_definitions (-DSOUND_SERVICE_VERSION=${SOUND_SERVICE_VERSION})
 endif()
 if (DBUSMENU_GTK3_NEW)
 	add_definitions (-DDBUSMENU_GTK3_NEW=1)
 
=== modified file 'alsaMixer/src/applet-backend-sound-menu.c'
--- alsaMixer/src/applet-backend-sound-menu.c	2012-02-16 01:45:57 +0000
+++ alsaMixer/src/applet-backend-sound-menu.c	2012-03-21 20:37:19 +0000
@@ -23,7 +23,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#if (SOUND_SERVICE_VERSION < 1)
+#include "dbus-shared-names-old.h"
+#else
 #include "dbus-shared-names.h"
+#endif
 
 #include "common-defs.h"
 #include "volume-widget.h"
 
=== modified file 'alsaMixer/src/applet-draw.c'
--- alsaMixer/src/applet-draw.c	2012-02-16 01:45:57 +0000
+++ alsaMixer/src/applet-draw.c	2012-03-21 20:37:19 +0000
@@ -46,6 +46,7 @@
 
 static void mixer_draw_bar (cairo_surface_t *pSurface)
 {
+	g_print ("%s (%p, %d)\n", __func__, pSurface, myData.iCurrentVolume);
 	CD_APPLET_SET_SURFACE_ON_MY_ICON_WITH_BAR (pSurface, myData.iCurrentVolume * .01);
 }
 
@@ -148,7 +149,7 @@
 	
 	if (myConfig.cDefaultIcon != NULL)
 	{
-		gchar *cImagePath = cairo_dock_search_icon_s_path (myConfig.cDefaultIcon);
+		gchar *cImagePath = cairo_dock_search_icon_s_path (myConfig.cDefaultIcon, MAX (myIcon->iImageWidth, myIcon->iImageHeight));
 		if (cImagePath == NULL)
 			cImagePath = cairo_dock_search_image_s_path (myConfig.cDefaultIcon);
 		if (cImagePath != NULL)
@@ -174,7 +175,7 @@
 {
 	if (myConfig.cMuteIcon != NULL)
 	{
-		gchar *cImagePath = cairo_dock_search_icon_s_path (myConfig.cMuteIcon);
+		gchar *cImagePath = cairo_dock_search_icon_s_path (myConfig.cMuteIcon, MAX (myIcon->iImageWidth, myIcon->iImageHeight));
 		if (cImagePath == NULL)
 			cImagePath = cairo_dock_search_image_s_path (myConfig.cMuteIcon);
 		if (cImagePath != NULL)
 
=== modified file 'alsaMixer/src/applet-init.c'
--- alsaMixer/src/applet-init.c	2012-02-16 01:45:57 +0000
+++ alsaMixer/src/applet-init.c	2012-03-21 20:37:19 +0000
@@ -33,10 +33,9 @@
 	CAIRO_DOCK_CATEGORY_APPLET_SYSTEM,
 	N_("This applet lets you control the sound volume from the dock.\n"
 	"Scroll up/down on the icon to increase/decrease the volume.\n"
-	"Click on icon to show/hide volume control (you can bind a keyboard shortcut for it)\n"
-	"You can also hide the dialog by clicking on it.\n"
+	"Click on icon to show/hide the volume control (you can bind a keyboard shortcut for it)\n"
 	"Middle-click to set or unset to mute, double-click to raise the channels mixer.\n"
-	"This applet works with the Alsa sound driver."),
+	"The applet can either use the Ubuntu Sound-menu or the Alsa driver."),
 	"Fabounet (Fabrice Rey)")
 	CD_APPLET_DEFINE_COMMON_APPLET_INTERFACE
 	CD_APPLET_ALLOW_EMPTY_TITLE
@@ -247,11 +246,9 @@
 		if (myDesklet && myDesklet->container.iHeight <= 64)
 			gtk_widget_hide (myData.pScale);
 		
-		CD_APPLET_RELOAD_MY_DATA_RENDERER (NULL);
+		if (myConfig.iVolumeEffect == VOLUME_EFFECT_GAUGE)
+			CD_APPLET_RELOAD_MY_DATA_RENDERER (NULL);
 		
-		if (myData.pControledElement != NULL)
-		{
-			cd_update_icon ();
-		}
+		cd_update_icon ();
 	}
 CD_APPLET_RELOAD_END
 
=== modified file 'alsaMixer/src/applet-notifications.c'
--- alsaMixer/src/applet-notifications.c	2012-02-16 01:45:57 +0000
+++ alsaMixer/src/applet-notifications.c	2012-03-21 20:37:19 +0000
@@ -26,6 +26,7 @@
 #include "applet-generic.h"
 #include "applet-notifications.h"
 
+static const gchar *s_cMixerCmd = NULL;
 
 CD_APPLET_ON_CLICK_BEGIN
 	cd_show_hide ();
@@ -40,18 +41,9 @@
 	{
 		g_spawn_command_line_async (myConfig.cShowAdvancedMixerCommand, &erreur);
 	}
-	else
+	else if (s_cMixerCmd != NULL)
 	{
-		gchar *cResult = cairo_dock_launch_command_sync ("which gnome-volume-control");
-		if (cResult != NULL && *cResult == '/')
-		{
-			g_spawn_command_line_async ("gnome-volume-control -p applications", &erreur); // gnome 2
-		}
-		else  /// TODO: we need to handle the other DE too ...
-		{
-			g_spawn_command_line_async ("gnome-control-center sound", &erreur); // Gnome 3
-		}
-		g_free (cResult);
+		g_spawn_command_line_async (s_cMixerCmd, &erreur);
 	}
 	
 	if (erreur != NULL)
@@ -62,11 +54,33 @@
 	CD_APPLET_LEAVE();
 }
 CD_APPLET_ON_BUILD_MENU_BEGIN
+	static gboolean bMixerChecked = FALSE;
 	gchar *cLabel;
 	
-	cLabel = g_strdup_printf ("%s (%s)", D_("Adjust channels"), D_("double-click"));
-	CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel, GTK_STOCK_PREFERENCES, _mixer_show_advanced_mixer, CD_APPLET_MY_MENU);
-	g_free (cLabel);
+	if (!myConfig.cShowAdvancedMixerCommand && !bMixerChecked)
+	{
+		bMixerChecked = TRUE;
+		gchar *cResult = cairo_dock_launch_command_sync ("which gnome-control-center");  // Gnome3
+		if (cResult != NULL && *cResult == '/')
+		{
+			s_cMixerCmd = "gnome-control-center sound";
+		}
+		else
+		{
+			g_free (cResult);
+			cResult = cairo_dock_launch_command_sync ("which gnome-volume-control");  // Gnome2
+			if (cResult != NULL && *cResult == '/')  /// TODO: other DE...
+				s_cMixerCmd = "gnome-volume-control -p applications";
+		}  /// TODO: handle other DE ...
+		g_free (cResult);
+	}
+	
+	if (myConfig.cShowAdvancedMixerCommand || s_cMixerCmd)
+	{
+		cLabel = g_strdup_printf ("%s (%s)", D_("Adjust channels"), D_("double-click"));
+		CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel, GTK_STOCK_PREFERENCES, _mixer_show_advanced_mixer, CD_APPLET_MY_MENU);
+		g_free (cLabel);
+	}
 	
 	cLabel = g_strdup_printf ("%s (%s)", (myData.bIsMute ? D_("Unmute") : D_("Mute")), D_("middle-click"));
 	CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel, MY_APPLET_SHARE_DATA_DIR"/emblem-mute.svg", cd_toggle_mute, CD_APPLET_MY_MENU);
 
=== added file 'alsaMixer/src/dbus-shared-names-old.h'
--- alsaMixer/src/dbus-shared-names-old.h	1970-01-01 00:00:00 +0000
+++ alsaMixer/src/dbus-shared-names-old.h	2012-03-21 20:37:19 +0000
@@ -0,0 +1,37 @@
+/*
+A small wrapper utility to load indicators and put them as menu items
+into the gnome-panel using it's applet interface.
+
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Conor Curran <[e-mail]>
+    Ted Gould <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3, as published
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __DBUS_SHARED_NAMES_H__
+#define __DBUS_SHARED_NAMES_H__
+
+#define INDICATOR_SOUND_DBUS_NAME  "com.canonical.indicators.sound"
+#define INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH "/com/canonical/indicators/sound/menu"
+#define INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH "/com/canonical/indicators/sound/service"
+#define INDICATOR_SOUND_DBUS_INTERFACE "com.canonical.indicators.sound"
+#define INDICATOR_SOUND_DBUS_VERSION  0
+
+#define INDICATOR_SOUND_SIGNAL_STATE_UPDATE               "SoundStateUpdate"
+
+
+#endif /* __DBUS_SHARED_NAMES_H__ */
 
=== modified file 'alsaMixer/src/dbus-shared-names.h'
--- alsaMixer/src/dbus-shared-names.h	2012-02-16 01:45:57 +0000
+++ alsaMixer/src/dbus-shared-names.h	2012-03-21 20:37:19 +0000
@@ -25,10 +25,10 @@
 #ifndef __DBUS_SHARED_NAMES_H__
 #define __DBUS_SHARED_NAMES_H__
 
-#define INDICATOR_SOUND_DBUS_NAME  "com.canonical.indicators.sound"
-#define INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH "/com/canonical/indicators/sound/menu"
-#define INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH "/com/canonical/indicators/sound/service"
-#define INDICATOR_SOUND_DBUS_INTERFACE "com.canonical.indicators.sound"
+#define INDICATOR_SOUND_DBUS_NAME  "com.canonical.indicator.sound"
+#define INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH "/com/canonical/indicator/sound/menu"
+#define INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH "/com/canonical/indicator/sound/service"
+#define INDICATOR_SOUND_DBUS_INTERFACE "com.canonical.indicator.sound"
 #define INDICATOR_SOUND_DBUS_VERSION  0
 
 #define INDICATOR_SOUND_SIGNAL_STATE_UPDATE               "SoundStateUpdate"
 
=== modified file 'alsaMixer/src/metadata-widget.c'
--- alsaMixer/src/metadata-widget.c	2012-02-16 01:45:57 +0000
+++ alsaMixer/src/metadata-widget.c	2012-03-21 20:37:19 +0000
@@ -217,9 +217,9 @@
   // player label
   GtkWidget* player_label;
   player_label = gtk_label_new("");
-  gtk_misc_set_alignment(GTK_MISC(player_label), (gfloat)0, (gfloat)0.5);
-  gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)1, (gfloat)0);  
-  gtk_widget_set_size_request (player_label, 200, 24);
+  gtk_misc_set_alignment(GTK_MISC(player_label), (gfloat)0, (gfloat)0);
+  gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)1, (gfloat)4);  
+  gtk_widget_set_size_request (player_label, 150, 24);
   priv->player_label = player_label;
       
   gtk_box_pack_start (GTK_BOX(outer_v_box), priv->player_label, FALSE, FALSE, 0);
@@ -241,7 +241,12 @@
 
   if (priv->icon_buf != NULL){
     gdk_pixbuf_unref(priv->icon_buf);
+    priv->icon_buf = NULL;
   }
+  g_string_free (priv->image_path, TRUE);
+  priv->image_path = NULL;
+  g_string_free (priv->old_image_path, TRUE);
+  priv->old_image_path = NULL;
   G_OBJECT_CLASS (metadata_widget_parent_class)->dispose (object);
 }
 
@@ -410,36 +415,37 @@
   {
     return FALSE;
   }
-  
+
+  if(priv->image_path->len > 0){
+    if(g_string_equal(priv->image_path, priv->old_image_path) == FALSE ||
+       priv->theme_change_occured == TRUE){
+      priv->theme_change_occured = FALSE;
+      GdkPixbuf* pixbuf;
+      pixbuf = gdk_pixbuf_new_from_file_at_size(priv->image_path->str, 60, 60, NULL);
+
+      if(GDK_IS_PIXBUF(pixbuf) == FALSE){
+        gtk_image_clear ( GTK_IMAGE(priv->album_art));          
+        gtk_widget_set_size_request(GTK_WIDGET(priv->album_art), 60, 60);
+	  draw_album_border_gtk_3 (metadata, FALSE, cr);
+        draw_album_art_placeholder_gtk_3(metadata, cr);
+        return FALSE;
+      }
+
+      gtk_image_set_from_pixbuf(GTK_IMAGE(priv->album_art), pixbuf);
+      gtk_widget_set_size_request(GTK_WIDGET(priv->album_art),
+                                  gdk_pixbuf_get_width(pixbuf),
+                                  gdk_pixbuf_get_height(pixbuf));
+
+      draw_album_border_gtk_3 (metadata, FALSE, cr);
+	g_string_erase (priv->old_image_path, 0, -1);
+      g_string_overwrite (priv->old_image_path, 0, priv->image_path->str);
+      g_object_unref(pixbuf);
+    }
+    return FALSE;       
+  }
+  gtk_image_clear (GTK_IMAGE(priv->album_art));  
+  gtk_widget_set_size_request(GTK_WIDGET(priv->album_art), 60, 60);
   draw_album_border_gtk_3 (metadata, FALSE, cr);
-
-  if(priv->image_path->len > 0){
-    if(g_string_equal(priv->image_path, priv->old_image_path) == FALSE ||
-       priv->theme_change_occured == TRUE){
-      priv->theme_change_occured = FALSE;
-      GdkPixbuf* pixbuf;
-      pixbuf = gdk_pixbuf_new_from_file_at_size(priv->image_path->str, 60, 60, NULL);
-
-      if(GDK_IS_PIXBUF(pixbuf) == FALSE){
-        gtk_image_clear ( GTK_IMAGE(priv->album_art));          
-        gtk_widget_set_size_request(GTK_WIDGET(priv->album_art), 60, 60);
-        draw_album_art_placeholder_gtk_3(metadata, cr);
-        return FALSE;
-      }
-
-      gtk_image_set_from_pixbuf(GTK_IMAGE(priv->album_art), pixbuf);
-      gtk_widget_set_size_request(GTK_WIDGET(priv->album_art),
-                                  gdk_pixbuf_get_width(pixbuf),
-                                  gdk_pixbuf_get_height(pixbuf));
-
-      g_string_erase (priv->old_image_path, 0, -1);
-      g_string_overwrite (priv->old_image_path, 0, priv->image_path->str);
-      g_object_unref(pixbuf);
-    }
-    return FALSE;       
-  }
-  gtk_image_clear (GTK_IMAGE(priv->album_art));  
-  gtk_widget_set_size_request(GTK_WIDGET(priv->album_art), 60, 60);
   draw_album_art_placeholder_gtk_3(metadata, cr);
   return FALSE;
 }
@@ -907,8 +913,10 @@
   gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height);
   
   GString* banshee_string = g_string_new ( "banshee" );
-  GString* app_panel = g_string_new ( g_utf8_strdown (dbusmenu_menuitem_property_get(priv->twin_item, DBUSMENU_METADATA_MENUITEM_PLAYER_NAME),
-                                                     -1));
+  gchar * tmp = g_utf8_strdown (dbusmenu_menuitem_property_get(priv->twin_item, DBUSMENU_METADATA_MENUITEM_PLAYER_NAME), -1);
+  GString* app_panel = g_string_new (tmp);
+  g_free (tmp);
+  
   GdkPixbuf* icon_buf;
   
   // Banshee Special case!  
 
=== modified file 'alsaMixer/src/transport-widget.c'
--- alsaMixer/src/transport-widget.c	2012-02-16 01:45:57 +0000
+++ alsaMixer/src/transport-widget.c	2012-03-21 20:37:19 +0000
@@ -269,6 +269,13 @@
     }
   }
   #endif
+
+  TransportWidgetPrivate* priv = TRANSPORT_WIDGET_GET_PRIVATE(object);
+  if (priv->command_coordinates != NULL) {
+    g_hash_table_destroy (priv->command_coordinates);
+    priv->command_coordinates = NULL;
+  }
+
   G_OBJECT_CLASS (transport_widget_parent_class)->dispose (object);
 }
 
 
=== modified file 'alsaMixer/src/volume-widget.c'
--- alsaMixer/src/volume-widget.c	2012-02-16 01:45:57 +0000
+++ alsaMixer/src/volume-widget.c	2012-03-21 20:37:19 +0000
@@ -218,7 +218,7 @@
 
   volume_widget_update(mitem, new_value, "change-value");
 
-	/// I think we need to update the icon here.
+	// we need to update the icon here.
 	update_accessible_desc (new_value);
   return FALSE;
 }
 
=== modified file 'clock/data/clock.conf.in'
--- clock/data/clock.conf.in	2012-02-16 01:45:57 +0000
+++ clock/data/clock.conf.in	2012-03-21 20:37:19 +0000
@@ -21,8 +21,8 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#B Always display the icon, even when the dock is hidden?
-always visi = false
+#Y+[No;0;0;With default background;0;0;With custom background;1;1] Always display the icon, even when the dock is hidden?
+always_visi = 0
 
 #C+ Background color to add in this case
 bg color = .8;.8;.8;.5
@@ -151,6 +151,9 @@
 #X[Digital View;gtk-italic]
 numeric=
 
+#B+ Use a custom font
+custom font = false
+
 #P+ Font:
 font = Sans 16
 
 
=== modified file 'clock/src/CMakeLists.txt'
--- clock/src/CMakeLists.txt	2010-09-18 14:20:27 +0000
+++ clock/src/CMakeLists.txt	2012-03-21 20:37:19 +0000
@@ -47,55 +47,3 @@
 ########### install files ###############
 
 install(TARGETS ${PACKAGE_CLOCK} DESTINATION ${pluginsdir})
-
-
-#original Makefile.am contents follow:
-
-# #dnl Process this file with automake to produce Makefile.in
-#
-#lib_LTLIBRARIES = 
-#	libcd-clock.la
-#
-#
-#libcd_clock_la_SOURCES = 
-#	applet-struct.h
-#	applet-init.c
-#	applet-init.h
-#	applet-draw.c
-#	applet-draw.h
-#	applet-digital.c
-#	applet-digital.h
-#	applet-config.c
-#	applet-config.h
-#	applet-notifications.c
-#	applet-notifications.h
-#	applet-theme.c
-#	applet-theme.h
-#
-#
-#dock_version = `pkg-config --modversion cairo-dock`
-#
-#libcd_clock_la_CFLAGS = 
-#	-I$(top_srcdir)/src
-#	$(PACKAGE_CFLAGS)
-#	-DMY_APPLET_SHARE_DATA_DIR=""${clockdatadir)""
-#	-DMY_APPLET_PREVIEW_FILE=""preview.jpg""
-#	-DMY_APPLET_CONF_FILE=""clock.conf""
-#	-DMY_APPLET_USER_DATA_DIR=""${clockuserdirname)""
-#	-DMY_APPLET_VERSION=""${VERSION_CLOCK)""
-#	-DMY_APPLET_GETTEXT_DOMAIN=""${GETTEXT_CLOCK)""
-#	-DMY_APPLET_DOCK_VERSION=""${dock_version)""
-#	-DMY_APPLET_ICON_FILE=""icon.png""
-#	-DCD_APPLET_MULTI_INSTANCE="1"
-#	-DGL_GLEXT_PROTOTYPES=""1""
-#	-std=c99
-#	 -Wall
-##	-g -ggdb -W -Wall
-#
-#
-#libcd_clock_la_LIBADD = 
-#	$(PACKAGE_LIBS) -lm
-#
-#
-#libcd_clock_la_LDFLAGS =
-#	-avoid-version -module
 
=== modified file 'clock/src/applet-config.c'
--- clock/src/applet-config.c	2011-04-20 20:46:51 +0000
+++ clock/src/applet-config.c	2012-03-21 20:37:19 +0000
@@ -76,31 +76,42 @@
 	{
 		CD_CONFIG_GET_COLOR_WITH_DEFAULT ("Configuration", "text color", myConfig.fTextColor, couleur);
 		
-		gchar *cFontDescription = CD_CONFIG_GET_STRING ("Configuration", "font");
-		if (cFontDescription == NULL)
-		{
-			cFontDescription = g_strdup ("Sans");  // sinon fd est NULL. On ne precise pas la taille ici pour pouvoir intercepter ce cas.
-		}
-		PangoFontDescription *fd = pango_font_description_from_string (cFontDescription);
-		
-		myConfig.cFont = g_strdup (pango_font_description_get_family (fd));
-		myConfig.iWeight = pango_font_description_get_weight (fd);
-		myConfig.iStyle = pango_font_description_get_style (fd);
-		if (pango_font_description_get_size (fd) == 0)  // anciens parametres de font.
-		{
-			int iWeight = g_key_file_get_integer (pKeyFile, "Configuration", "weight", NULL);
-			myConfig.iWeight = cairo_dock_get_pango_weight_from_1_9 (iWeight);
-			myConfig.iStyle = PANGO_STYLE_NORMAL;
-			
-			pango_font_description_set_size (fd, 16 * PANGO_SCALE);
-			pango_font_description_set_weight (fd, myConfig.iWeight);
-			pango_font_description_set_style (fd, myConfig.iStyle);
+		gboolean bCustomFont = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "custom font", FALSE);  // false by default
+		if (bCustomFont)
+		{
+			gchar *cFontDescription = CD_CONFIG_GET_STRING ("Configuration", "font");
+			if (cFontDescription == NULL)
+			{
+				cFontDescription = g_strdup ("Sans");  // sinon fd est NULL. On ne precise pas la taille ici pour pouvoir intercepter ce cas.
+			}
+			PangoFontDescription *fd = pango_font_description_from_string (cFontDescription);
+			
+			myConfig.cFont = g_strdup (pango_font_description_get_family (fd));
+			myConfig.iWeight = pango_font_description_get_weight (fd);
+			myConfig.iStyle = pango_font_description_get_style (fd);
+			
+			if (pango_font_description_get_size (fd) == 0)  // anciens parametres de font.
+			{
+				int iWeight = g_key_file_get_integer (pKeyFile, "Configuration", "weight", NULL);
+				myConfig.iWeight = cairo_dock_get_pango_weight_from_1_9 (iWeight);
+				myConfig.iStyle = PANGO_STYLE_NORMAL;
+
+				pango_font_description_set_size (fd, 16 * PANGO_SCALE);
+				pango_font_description_set_weight (fd, myConfig.iWeight);
+				pango_font_description_set_style (fd, myConfig.iStyle);
+				g_free (cFontDescription);
+				cFontDescription = pango_font_description_to_string (fd);
+				g_key_file_set_string (pKeyFile, "Configuration", "font", cFontDescription);
+			}
+			pango_font_description_free (fd);
 			g_free (cFontDescription);
-			cFontDescription = pango_font_description_to_string (fd);
-			g_key_file_set_string (pKeyFile, "Configuration", "font", cFontDescription);
-		}
-		pango_font_description_free (fd);
-		g_free (cFontDescription);
+		}
+		else  // use the same font as the labels
+		{
+			myConfig.cFont = g_strdup (myIconsParam.iconTextDescription.cFont);
+			myConfig.iWeight = PANGO_WEIGHT_HEAVY;  // force to bold, it's much more readable.
+			myConfig.iStyle = myIconsParam.iconTextDescription.iStyle;
+		}
 		
 		myConfig.cNumericBackgroundImage = CD_CONFIG_GET_STRING ("Configuration", "numeric bg");
 		myConfig.fTextRatio = CD_CONFIG_GET_DOUBLE_WITH_DEFAULT ("Configuration", "text ratio", 1.);
@@ -456,9 +467,8 @@
 	s_pTimeZoneList = NULL;
 }
 
-void cd_clock_load_custom_widget (CairoDockModuleInstance *myApplet, GKeyFile* pKeyFile)
+void cd_clock_load_custom_widget (CairoDockModuleInstance *myApplet, GKeyFile* pKeyFile)  // warning: myApplet can be NULL if the applet has not been yet started.
 {
-	cd_debug ("%s (%s)", __func__, myIcon->cName);
 	//\____________ On recupere notre widget personnalise (un simple container vide qu'on va remplir avec nos trucs).
 	CairoDockGroupKeyWidget *pGroupKeyWidget = CD_APPLET_GET_CONFIG_PANEL_GROUP_KEY_WIDGET ("Alarm", "add new");
 	g_return_if_fail (pGroupKeyWidget != NULL);
 
=== removed file 'clock/src/applet-digital.c'
--- clock/src/applet-digital.c	2011-04-20 20:46:51 +0000
+++ clock/src/applet-digital.c	1970-01-01 00:00:00 +0000
@@ -1,239 +0,0 @@
-/**
-* This file is a part of the Cairo-Dock project
-*
-* Copyright : (C) see the 'copyright' file.
-* E-mail    : see the 'copyright' file.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 3
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <stdlib.h>
-#include <math.h>
-
-#include "applet-struct.h"
-#include "applet-config.h"
-#include "applet-digital.h"
-
-
-#define CD_CLOCK_DATE_BUFFER_LENGTH 50
-static char s_cDateBuffer[CD_CLOCK_DATE_BUFFER_LENGTH+1];
-
-void cd_clock_configure_digital (CairoDockModuleInstance *myApplet) {
-	cd_debug ("%s", __func__);
-	
-	GError *erreur = NULL;
-	GKeyFile *pKeyFile = g_key_file_new (); //On ouvre le fichier de conf
-	if (myConfig.cDigital == NULL)
-		myConfig.cDigital = g_strdup ("default");
-	
-	gchar *cConfPath = g_strdup_printf ("%s/digital/%s/config", MY_APPLET_SHARE_DATA_DIR, myConfig.cDigital);
-	cd_debug ("Clock: Using %s digital theme", cConfPath);
-	g_key_file_load_from_file (pKeyFile, cConfPath, G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS, &erreur);
-	
-	if (erreur != NULL) {
-		cd_warning ("Attention : %s", erreur->message);
-		g_error_free (erreur);
-		erreur = NULL;
-		return;
-	}
-	
-	myData.pDigitalClock.bSecondCapable = cairo_dock_get_boolean_key_value (pKeyFile, "configuration", "seconds", FALSE, FALSE, NULL, NULL);
-	myData.pDigitalClock.iFrameSpacing = cairo_dock_get_integer_key_value (pKeyFile, "configuration", "framespacing", FALSE, 2, NULL, NULL);
-	
-	myData.pDigitalClock.i12modeWidth = cairo_dock_get_integer_key_value (pKeyFile, "configuration", "12width", FALSE, 6, NULL, NULL);
-	myData.pDigitalClock.i12modeHeight = cairo_dock_get_integer_key_value (pKeyFile, "configuration", "12height", FALSE, 6, NULL, NULL);
-	myData.pDigitalClock.i12modeXOffset = cairo_dock_get_integer_key_value (pKeyFile, "configuration", "12offsetX", FALSE, 4, NULL, NULL);
-	myData.pDigitalClock.i12modeYOffset = cairo_dock_get_integer_key_value (pKeyFile, "configuration", "12offsetY", FALSE, 1, NULL, NULL);
-	myData.pDigitalClock.i12modeFrame = cairo_dock_get_integer_key_value (pKeyFile, "configuration", "12frame", FALSE, 4, NULL, NULL);
-	
-	int i = 0, j = (myData.pDigitalClock.bSecondCapable == TRUE ? 3 : 4);
-	//Avec secondes 3 frames, une par unités (hh : mm : ss)
-	//Sans secondes 4 frames, une par nombre (1|2:4|5)
-	for (i = 0; i < j; i++) {
-		gchar *cGroupName = g_strdup_printf ("frame_%d", i);
-		myData.pDigitalClock.pFrame[i].iWidth = cairo_dock_get_integer_key_value (pKeyFile, cGroupName, "width", FALSE, 4, NULL, NULL);
-		myData.pDigitalClock.pFrame[i].iHeight = cairo_dock_get_integer_key_value (pKeyFile, cGroupName, "height", FALSE, 4, NULL, NULL);
-		myData.pDigitalClock.pFrame[i].iXOffset = cairo_dock_get_integer_key_value (pKeyFile, cGroupName, "offsetX", FALSE, 0, NULL, NULL);
-		myData.pDigitalClock.pFrame[i].iYOffset = cairo_dock_get_integer_key_value (pKeyFile, cGroupName, "offsetY", FALSE, 0, NULL, NULL);
-		g_free (cGroupName);
-		
-		cGroupName = g_strdup_printf ("text_%d", i);
-		myData.pDigitalClock.pText[i].iXOffset = cairo_dock_get_integer_key_value (pKeyFile, cGroupName, "offsetX", FALSE, -1, NULL, NULL);
-		myData.pDigitalClock.pText[i].iYOffset = cairo_dock_get_integer_key_value (pKeyFile, cGroupName, "offsetY", FALSE, -1, NULL, NULL);
-		g_free (cGroupName);
-	}
-	
-	g_key_file_free (pKeyFile);
-	g_free (cConfPath);
-	
-	cd_clock_digital_load_frames (myApplet);
-}
-
-void cd_clock_digital_load_frames (CairoDockModuleInstance *myApplet) {
-	cd_debug ("%s", __func__);
-	
-	int i = 0, j = (myData.pDigitalClock.bSecondCapable == TRUE ? 3 : 4);
-	double fFrameWidth = 1, fFrameHeight = 1;
-	//Avec secondes 3 frames, une par unités (hh : mm : ss)
-	//Sans secondes 4 frames, une par nombre (1|2:4|5)
-	for (i = 0; i < j; i++) {
-		fFrameWidth = myIcon->fWidth / (double) myData.pDigitalClock.pFrame[i].iWidth;
-		cd_debug ("Clock: frame %d width %.02f (%.02f %d)", i+1, fFrameWidth, myIcon->fWidth, myData.pDigitalClock.pFrame[i].iWidth);
-		fFrameWidth = fFrameWidth - myData.pDigitalClock.iFrameSpacing;
-		fFrameHeight = myIcon->fHeight; /// myData.pDigitalClock.pFrame[i].iHeight;
-		double fImgW=0, fImgH=0;
-		
-		if (myConfig.cDigital == NULL)
-			myConfig.cDigital = g_strdup ("default");
-			
-		gchar *cImagePath = g_strdup_printf ("%s/digital/%s/frame_%d.svg", MY_APPLET_SHARE_DATA_DIR, myConfig.cDigital, i);
-		cd_debug ("Clock: Loading %s frame (%.02fx%.02f)", cImagePath, fFrameWidth, fFrameHeight);
-		cairo_t *pCairoContext = cairo_dock_create_context_from_window (myContainer);
-		myData.pDigitalClock.pFrame[i].pFrameSurface = cairo_dock_create_surface_from_image (cImagePath,
-			1.,
-			fFrameWidth, fFrameHeight,
-			FALSE,
-			&fImgW, &fImgH,
-			NULL, NULL);
-		cairo_destroy (pCairoContext);
-		g_free (cImagePath);
-	}
-}
-
-void cd_clock_draw_frames (CairoDockModuleInstance *myApplet) {
-	cd_debug ("%s", __func__);
-	
-	cairo_set_source_rgba (myDrawContext, 0., 0., 0., 0.);
-	cairo_set_operator (myDrawContext, CAIRO_OPERATOR_SOURCE);
-	cairo_paint (myDrawContext);
-	cairo_set_operator (myDrawContext, CAIRO_OPERATOR_OVER);
-	
-	int i = 0, j = (myData.pDigitalClock.bSecondCapable == TRUE ? 3 : 4);
-	double fX, fY;
-	//Avec secondes 3 frames, une par unité (hh | mm | ss)
-	//Sans secondes 4 frames, une par nombre (1|2 | 4|5)
-	for (i = 0; i < j; i++) {
-		fX = (myIcon->fWidth / j) * i + myData.pDigitalClock.pFrame[i].iXOffset;
-		fY = myData.pDigitalClock.pFrame[i].iYOffset;
-		cd_debug ("Clock: frame:%d ; fX:%.02f ; fY:%.02f", i+1, fX, fY);
-		cairo_set_source_surface (myDrawContext, myData.pDigitalClock.pFrame[i].pFrameSurface, fX, fY);
-		cairo_paint (myDrawContext);
-	}
-	
-	CD_APPLET_REDRAW_MY_ICON;
-}
-
-void cd_clock_put_text_on_frames (CairoDockModuleInstance *myApplet, int width, int height, double fMaxScale, struct tm *pTime) {
-	cd_debug ("%s", __func__);
-	
-	cairo_t *pSourceContext = myDrawContext;
-	GString *sFormat = g_string_new ("");
-	
-	if (myConfig.b24Mode) {
-		if (myData.pDigitalClock.bSecondCapable)
-			g_string_printf (sFormat, "%%T");
-		else
-			g_string_printf (sFormat, " %%R");
-	}
-	else {
-		if (myData.pDigitalClock.bSecondCapable)
-			g_string_printf (sFormat, "%%r%%s");
-		else
-			g_string_printf (sFormat, "%%I:%%M");
-	}
-
-	if (myConfig.iShowDate == CAIRO_DOCK_INFO_ON_ICON)
-		cd_clock_draw_date_on_frame (myApplet);
-		//Erf! Comment bien gérer ca ...
-	
-	strftime (s_cDateBuffer, CD_CLOCK_DATE_BUFFER_LENGTH, sFormat->str, pTime);
-	g_string_free (sFormat, TRUE);
-	
-	/// Attention : soit on passe un char a cd_clock_fill_text_surface(), soit un char *, il faut choisir.
-	/// Ne pas modifier le pointeur d'une chaine ! utiliser un pointeur secondaire qu'on balade dessus, sinon au free ca fait mal ;-)
-	gchar *cTime = g_strdup (s_cDateBuffer), *cT1 = NULL;
-	if (myData.pDigitalClock.bSecondCapable) { //On coupe aux ':' donc on arrive a 12|45|32
-		cT1 = g_strdup (cTime);
-		gchar *str = strchr (cT1, ':'); //On récupère [12]:45:32
-		if (str != NULL)
-			*str = '\0';
-		cd_clock_fill_text_surface (myApplet, cT1, 0);
-		
-		cT1 = g_strdup (cTime);
-		str = strrchr (cT1, ':'); //On récupère [12:45]:32
-		if (str != NULL)
-			*str = '\0';
-		str = strchr (cT1, ':'); //On récupère 12:[45]:32
-		str++;
-		cd_clock_fill_text_surface (myApplet, str, 1);
-		
-		cT1 = g_strdup (cTime);
-		str = strrchr (cT1, ':'); //On récupère 12:45:[32]
-		str++;
-		cd_clock_fill_text_surface (myApplet, str, 2);
-	}
-	else { //On coupe au ':' puis on sépare les chiffres donc on arrive a 1|2 | 4|5
-		cT1 = g_strdup (cTime);
-		gchar *str = strchr (cT1, ':'); //On récupère [12]:45
-		if (str != NULL)
-			*str = '\0';
-		cd_clock_fill_text_surface (myApplet, *cT1, 0);
-		cT1++; /// GLUPS !
-		cd_clock_fill_text_surface (myApplet, *cT1, 1);
-		
-		cT1 = g_strdup (cTime);
-		str = strrchr (cT1, ':'); //On récupère 12:[45]
-		str++;
-		cd_clock_fill_text_surface (myApplet, *str, 2);
-		str++;
-		cd_clock_fill_text_surface (myApplet, *str, 3);
-	}
-	g_free (cTime);
-	g_free (cT1);
-	
-	int i = 0, j = (myData.pDigitalClock.bSecondCapable == TRUE ? 3 : 4);
-	for (i = 0; i < j; i++) {
-		//On dessine le texte dans les frames
-		cd_clock_draw_text_from_surface (myApplet, i);
-	}
-	
-	//On ajoute le am/pm s'il le faut
-	if (! myConfig.b24Mode) {
-		if (pTime->tm_hour > 12)
-			cd_clock_draw_ampm (myApplet, "PM");
-		else
-			cd_clock_draw_ampm (myApplet, "AM");
-	}
-}
-
-void cd_clock_draw_ampm (CairoDockModuleInstance *myApplet, gchar *cMark) {
-	cd_debug ("Adding %s to the last frame", cMark);
-	//Ca s'est gérer dans la config.
-	//Vérifier les structures necessaires.
-}
-
-void cd_clock_draw_text_from_surface (CairoDockModuleInstance *myApplet, int iNumber) {
-	cd_debug ("Printing text #%d on corresponding frame", iNumber);
-	//Il faudra surment scale down la surface avant de cairo_print
-	//TODO prendre le code sur slider.
-}
-
-void cd_clock_fill_text_surface (CairoDockModuleInstance *myApplet, gchar *cStr, int iNumber) {
-	cd_debug ("Filling the #%d surface with %s", iNumber, cStr);
-	//Aucune idée de comment faire!
-	//TODO demander a fabounet des indices ici.
-}
-
-void cd_clock_draw_date_on_frame (CairoDockModuleInstance *myApplet) {
-	cd_debug ("Add date on frame");
-}
 
=== removed file 'clock/src/applet-digital.h'
--- clock/src/applet-digital.h	2009-10-05 19:27:17 +0000
+++ clock/src/applet-digital.h	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/**
-* This file is a part of the Cairo-Dock project
-*
-* Copyright : (C) see the 'copyright' file.
-* E-mail    : see the 'copyright' file.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 3
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef __CD_CLOCK_DIGITAL__
-#define  __CD_CLOCK_DIGITAL__
-
-
-#include <cairo-dock.h>
-#include "applet-struct.h"
-
-void cd_clock_configure_digital (CairoDockModuleInstance *myApplet);
-void cd_clock_digital_load_frames (CairoDockModuleInstance *myApplet);
-void cd_clock_draw_frames (CairoDockModuleInstance *myApplet);
-void cd_clock_put_text_on_frames (CairoDockModuleInstance *myApplet, int width, int height, double fMaxScale, struct tm *pTime);
-void cd_clock_draw_ampm (CairoDockModuleInstance *myApplet, gchar *cMark);
-void cd_clock_draw_text_from_surface (CairoDockModuleInstance *myApplet, int iNumber);
-void cd_clock_fill_text_surface (CairoDockModuleInstance *myApplet, gchar *cStr, int iNumber);
-void cd_clock_draw_date_on_frame (CairoDockModuleInstance *myApplet);
-
-
-#endif
 
=== modified file 'clock/src/applet-draw.c'
--- clock/src/applet-draw.c	2012-02-16 01:45:57 +0000
+++ clock/src/applet-draw.c	2012-03-21 20:37:19 +0000
@@ -76,8 +76,8 @@
 	
 	strftime (s_cDateBuffer, CD_CLOCK_DATE_BUFFER_LENGTH, cFormat, pTime);
 	pango_layout_set_text (pLayout, s_cDateBuffer, -1);
-	PangoRectangle ink, log;
-	pango_layout_get_pixel_extents (pLayout, &ink, &log);
+	PangoRectangle log;
+	pango_layout_get_pixel_extents (pLayout, NULL, &log);
 	
 	//\______________ On dessine le texte.
 	cairo_save (myDrawContext);
@@ -88,40 +88,45 @@
 		
 		strftime (s_cDateBuffer, CD_CLOCK_DATE_BUFFER_LENGTH, "%a %d %b", pTime);
 		pango_layout_set_text (pLayout2, s_cDateBuffer, -1);
-		PangoRectangle ink2, log2;
-		pango_layout_get_pixel_extents (pLayout2, &ink2, &log2);
+		PangoRectangle log2;
+		pango_layout_get_pixel_extents (pLayout2, NULL, &log2);
 		
 		double h=0, w=0, fZoomX=0, fZoomY=0;  // parametres d'affichage 2 lignes
 		double h_=0, w_=0, fZoomX_=0, fZoomY_=0;  // parametres d'affichage 1 ligne
 		if (myData.iTextLayout == CD_TEXT_LAYOUT_2_LINES || myData.iTextLayout == CD_TEXT_LAYOUT_AUTO)
 		{
-			h = ink.height + ink2.height + GAPY * iHeight;
-			w = MAX (ink.width, ink2.width);
+			h = log.height + log2.height + GAPY * iHeight;
+			w = MAX (log.width, log2.width);
 			fZoomX = (double) iWidth / w;
 			fZoomY = (double) iHeight / h;
-			if (myDock && fZoomY > MAX_RATIO * fZoomX)  // on ne garde pas le ratio car ca ferait un texte trop petit en hauteur, toutefois on limite un peu la deformation en hauteur.
-				fZoomY = MAX_RATIO * fZoomX;
+			if (myDock)
+			{
+				if (myContainer->bIsHorizontal && fZoomY > MAX_RATIO * fZoomX)  // we limit the deformation
+					fZoomY = MAX_RATIO * fZoomX;
+				else if (myContainer->bIsHorizontal && fZoomX > MAX_RATIO * fZoomY)
+					fZoomX = MAX_RATIO * fZoomY;
+			}
 			
 			if (myConfig.fTextRatio < 1)
-			{
-				fZoomX *= myConfig.fTextRatio;
 				fZoomY *= myConfig.fTextRatio;
-			}
 		}
 		if (myData.iTextLayout == CD_TEXT_LAYOUT_1_LINE || myData.iTextLayout == CD_TEXT_LAYOUT_AUTO)
 		{
-			h_ = MAX (ink.height, ink2.height);
-			w_ = ink.width + ink2.width + GAPX * iWidth;
+			h_ = MAX (log.height, log2.height);
+			w_ = log.width + log2.width + GAPX * iWidth;
 			fZoomX_ = (double) iWidth / w_;
 			fZoomY_ = (double) iHeight / h_;
-			if (myDock && fZoomY_ > MAX_RATIO * fZoomX_)  // on ne garde pas le ratio car ca ferait un texte trop petit en hauteur, toutefois on limite un peu la deformation en hauteur.
-				fZoomY_ = MAX_RATIO * fZoomX_;
+			if (myDock)
+			{
+				if (myContainer->bIsHorizontal && fZoomY_ > MAX_RATIO * fZoomX_)  // we limit the deformation
+					fZoomY_ = MAX_RATIO * fZoomX_;
+				else if (myContainer->bIsHorizontal && fZoomX_ > MAX_RATIO * fZoomY_)
+					fZoomX_ = MAX_RATIO * fZoomY_;
+			}
 			
 			if (myConfig.fTextRatio < 1)
-			{
-				fZoomX_ *= myConfig.fTextRatio;
 				fZoomY_ *= myConfig.fTextRatio;
-			}
+
 			if (fZoomY_ > fZoomX_)
 			{
 				double fMaxScale = cairo_dock_get_icon_max_scale (myIcon);
@@ -143,52 +148,50 @@
 		{
 			cairo_translate (myDrawContext, (iWidth - fZoomX_ * w_) / 2, (iHeight - fZoomY_ * h_)/2);  // centre verticalement.
 			cairo_scale (myDrawContext, fZoomX_, fZoomY_);
-			cairo_translate (myDrawContext, -ink2.x, -ink2.y);
 			pango_cairo_show_layout (myDrawContext, pLayout2);
 			
 			cairo_restore (myDrawContext);
 			cairo_save (myDrawContext);
 			
-			cairo_translate (myDrawContext, (iWidth + fZoomX_ * w_) / 2 - fZoomX_ * ink.width, (iHeight - fZoomY_ * h_)/2);
+			cairo_translate (myDrawContext, (iWidth + fZoomX_ * w_) / 2 - fZoomX_ * log.width, (iHeight - fZoomY_ * h_)/2);
 			cairo_scale (myDrawContext, fZoomX_, fZoomY_);
-			cairo_translate (myDrawContext, -ink.x, -ink.y);
 			pango_cairo_show_layout (myDrawContext, pLayout);
 		}
 		else  // mode 2 lignes
 		{
-			cairo_translate (myDrawContext, (iWidth - fZoomX * ink.width) / 2, (iHeight - fZoomY * h)/2);  // centre verticalement.
+			cairo_translate (myDrawContext, (iWidth - fZoomX * log.width) / 2, (iHeight - fZoomY * h)/2);  // centre verticalement.
 			cairo_scale (myDrawContext, fZoomX, fZoomY);
-			cairo_translate (myDrawContext, -ink.x, -ink.y);
 			pango_cairo_show_layout (myDrawContext, pLayout);
 			
 			cairo_restore (myDrawContext);
 			cairo_save (myDrawContext);
 			
-			cairo_translate (myDrawContext, (iWidth - fZoomX * ink2.width) / 2, (iHeight + fZoomY * GAPY)/2);
+			cairo_translate (myDrawContext, (iWidth - fZoomX * log2.width) / 2, (iHeight + fZoomY * GAPY)/2);
 			cairo_scale (myDrawContext, fZoomX, fZoomY);
-			cairo_translate (myDrawContext, -ink2.x, -ink2.y);
 			pango_cairo_show_layout (myDrawContext, pLayout2);
 		}
 		g_object_unref (pLayout2);
 	}
-	else  // affichage simple de l'heure sur 1 ligne.
+	else  // only the hour with 1 line.
 	{
-		double fZoomX = (double) iWidth / ink.width;
-		double fZoomY = (double) iHeight / ink.height;
-		if (myDock && fZoomY > MAX_RATIO * fZoomX)  // on ne garde pas le ratio car ca ferait un texte trop petit en hauteur, toutefois on limite un peu la deformation en hauteur.
-			fZoomY = MAX_RATIO * fZoomX;
-		
+		double fZoomX = (double) iWidth / log.width;
+		double fZoomY = (double) iHeight / log.height;
+		if (myDock)
+		{
+			if (myContainer->bIsHorizontal && fZoomY > MAX_RATIO * fZoomX)  // we limit the deformation
+				fZoomY = MAX_RATIO * fZoomX;
+			else if (myContainer->bIsHorizontal && fZoomX > MAX_RATIO * fZoomY)
+				fZoomX = MAX_RATIO * fZoomY;
+		}
+
 		if (myConfig.fTextRatio < 1)
 		{
-			fZoomX *= myConfig.fTextRatio;
-			fZoomY *= myConfig.fTextRatio;
+			fZoomY *= myConfig.fTextRatio; // only for the height
+			cairo_translate (myDrawContext,
+				0,
+				(iHeight - fZoomY * log.height)/2);  // this text will be centred.
 		}
-		
-		cairo_translate (myDrawContext,
-			(iWidth - fZoomX * ink.width)/2,
-			(iHeight - fZoomY * ink.height)/2);  // le texte sera centre.
 		cairo_scale (myDrawContext, fZoomX, fZoomY);
-		cairo_translate (myDrawContext, -ink.x, -ink.y);
 		pango_cairo_show_layout (myDrawContext, pLayout);
 	}
 	cairo_restore (myDrawContext);
 
=== modified file 'clock/src/applet-timer.c'
--- clock/src/applet-timer.c	2012-02-16 01:45:57 +0000
+++ clock/src/applet-timer.c	2012-03-21 20:37:19 +0000
@@ -25,7 +25,6 @@
 
 #include "applet-struct.h"
 #include "applet-config.h"
-#include "applet-digital.h" //Digital html like renderer
 #include "applet-calendar.h"
 #include "applet-draw.h"
 #include "applet-timer.h"
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-02-16 01:45:57 +0000
+++ debian/changelog	2012-03-21 20:37:19 +0000
@@ -1,3 +1,72 @@
+cairo-dock-plug-ins (3.0.0.0rc1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release. (LP: #961579)
+  * Upstream ChangeLog: (main changes)
+   - Updated translations
+   - MusicPlayer:
+    + When choosing the player the first time, launch it and set the name
+    + It seems the latest stable version of rhythmbox now re-uses this DBus
+       address: org.mpris.MediaPlayer2.rhythmbox
+   - Use the default bg color for always visible icons
+   - GMenu: check if kde4-applications.menu and lxde-applications.menu
+      are available
+   - Dbus:
+    + Bash interface: fixed a typo
+    + Changed the third-party applets dir on the server for the 3.0
+    + Enabling threads on the Python Interface
+    + Modified the old SetEmblem method to use the new overlays
+   - Enable GVFS if detected
+   - Indicators: handle the case where the service crashes
+   - Status-Notifier:
+    + Indicator 0.4.90 (and newer) has a new variable (Title)
+    + Display Label first if it's available instead of Title first
+    + Fixed a bug with empty labels
+    + KDE's watcher: if ItemIsMenu is true (e.g. Klipper) and if we only show
+       the menu on left click, we emit a signal to the application to show
+       its own menu
+    + checked if the menu path is different that '/NO_DBUSMENU'
+    + IAS: checked if an item is not already available in the systray
+       (workaround) and fixed a few typos
+    + Added a space between icons and fixed the wrong drawing of the icon
+       on a vertical dock if the icon can be resized
+    + Used cairo_dock_add_path_to_icon_theme
+   - Sound control:
+    + Fixed a small bug on reload (invisible icon)
+    + Updated the Dbus names to match with Ubuntu 12.04
+    + Backported the latest version of Ubuntu's indicator-sound into the
+       Sound-Control applet
+    + Make some items in the menu invisible if not available
+    + Worked around a bug in libindicator, which keeps internally
+       the service pointer
+   - Logout:
+    + Fixed a tiny memory leak
+    + Look for a different icon's size if we want to display this icon in
+       a menu/a dock/an emblem
+   - PowerManager:
+    + Removed an extraseparators in the menu
+   - Clock:
+    + Used the logical rectangle in order to fix the position of the text
+    + Removed unused files
+    + Removed useless translations (log.x and log.y = 0)
+    + Only used this ratio to limit the deformation with the height
+    + Fixed a problem with the ratio if this applet is displayed in
+       a vertical dock
+   - Remote Control: fixed a crash during the 'click' signal
+   - Slider:
+    + When reloading, display the changes immediately
+    + Added the possibility to refresh the images list from the menu
+    + Fixed the loading of the image on startup, when the applet's size is
+       not yet stable
+    + Code cleaning
+   - Fixed an error when compiling without libindicator
+   - A few minor changes (comments, factorisation, etc)
+   - Recent-Events: if zeitgeist is not yet running on first search,
+      try 3 times before giving up.
+  * debian/control:
+   - Updated the version of cairo-dock-[core;data;dev].
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Wed, 21 Mar 2012 21:31:34 +0100
+
 cairo-dock-plug-ins (3.0.0.0beta1-0ubuntu1) precise; urgency=low
 
   * New upstream release. (LP: #932042)
 
=== modified file 'debian/control'
--- debian/control	2012-02-16 01:45:57 +0000
+++ debian/control	2012-03-21 20:37:19 +0000
@@ -17,7 +17,7 @@
 		libgl1-mesa-dev | libgl-dev,
 		libglu1-mesa-dev | libglu-dev,
 		libpango1.0-dev,
-		libgldi-dev (>= 3.0.0.0beta1),
+		libgldi-dev (>= 3.0.0.0rc1),
 		libasound2-dev,
 		libvte-2.90-dev,
 		x11proto-xf86vidmode-dev,
@@ -55,7 +55,7 @@
 Conflicts: 	cairo-dock-plug-ins (<= 2.0.8.0)
 Replaces: 	cairo-dock-plug-ins (<= 2.0.8.0)
 Depends: 	cairo-dock-plug-ins-data (>= ${source:Version}),
-		cairo-dock-core (>= 3.0.0.0beta1),
+		cairo-dock-core (>= 3.0.0.0rc1),
 		${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Suggests:	gvfs
@@ -72,7 +72,7 @@
 Architecture: any
 Conflicts: 	cairo-dock-plug-ins (<= 2.0.8.0)
 Depends: 	cairo-dock-plug-ins-data (>= ${source:Version}),
-		cairo-dock-core (>= 3.0.0.0beta1),
+		cairo-dock-core (>= 3.0.0.0rc1),
 		curl,
 		wget,
 		${shlibs:Depends},
 
=== modified file 'dnd2share/src/applet-notifications.c'
--- dnd2share/src/applet-notifications.c	2012-02-16 01:45:57 +0000
+++ dnd2share/src/applet-notifications.c	2012-03-21 20:37:19 +0000
@@ -423,6 +423,7 @@
 		gboolean bIsDirectory;
 		int iVolumeID;
 		double fOrder;
+		gint iDesiredIconSize = cairo_dock_search_icon_size (GTK_ICON_SIZE_LARGE_TOOLBAR); // 24px by default
 		int i;
 		GList *it;
 		for (it = myData.pUpoadedItems; it != NULL; it = it->next)
@@ -437,22 +438,22 @@
 				if (! g_file_test (cPreview, G_FILE_TEST_EXISTS))
 				{
 					g_free (cPreview);
-					cPreview = cairo_dock_search_icon_s_path ("image-x-generic");;
+					cPreview = cairo_dock_search_icon_s_path ("image-x-generic", iDesiredIconSize);
 				}
 			}
 			else if (pItem->iFileType == CD_TYPE_TEXT)
 			{
-				cPreview = cairo_dock_search_icon_s_path ("text-x-generic");
+				cPreview = cairo_dock_search_icon_s_path ("text-x-generic", iDesiredIconSize);
 			}
 			else if (pItem->iFileType == CD_TYPE_VIDEO)
 			{
-				cPreview = cairo_dock_search_icon_s_path ("video-x-generic");
+				cPreview = cairo_dock_search_icon_s_path ("video-x-generic", iDesiredIconSize);
 			}
 			if (cPreview == NULL)
 			{
 				gchar *cIconName = NULL;
 				cairo_dock_fm_get_file_info (pItem->cLocalPath, &cName, &cURI, &cIconName, &bIsDirectory, &iVolumeID, &fOrder, 0);
-				cPreview = cairo_dock_search_icon_s_path (cIconName);
+				cPreview = cairo_dock_search_icon_s_path (cIconName, iDesiredIconSize);
 				g_free (cIconName);
 				g_free (cName);
 				cName = NULL;
 
=== modified file 'drop-indicator/src/applet-notifications.c'
--- drop-indicator/src/applet-notifications.c	2012-02-16 01:45:57 +0000
+++ drop-indicator/src/applet-notifications.c	2012-03-21 20:37:19 +0000
@@ -382,6 +382,7 @@
 			iHeight,
 			CAIRO_DOCK_KEEP_RATIO);
 	}
+	g_print (" %p, %d, %d\n", myData.hoverIndicator.pSurface, myData.hoverIndicator.iTexture, g_bUseOpenGL);
 }
 
 void cd_drop_indicator_free_buffers (void)
 
=== modified file 'dustbin/src/applet-init.c'
--- dustbin/src/applet-init.c	2011-09-26 12:56:12 +0000
+++ dustbin/src/applet-init.c	2012-03-21 20:37:19 +0000
@@ -40,7 +40,7 @@
 	// get the user images first, as they overwrite the theme.
 	if (myConfig.cEmptyUserImage != NULL)
 	{
-		gchar *cPath = cairo_dock_search_icon_s_path (myConfig.cEmptyUserImage);
+		gchar *cPath = cairo_dock_search_icon_s_path (myConfig.cEmptyUserImage, CAIRO_DOCK_DEFAULT_ICON_SIZE);
 		if (! g_file_test (cPath, G_FILE_TEST_EXISTS))
 		{
 			g_free (myConfig.cEmptyUserImage);
@@ -50,13 +50,13 @@
 	}
 	if (myConfig.cFullUserImage != NULL)
 	{
-		gchar *cPath = cairo_dock_search_icon_s_path (myConfig.cFullUserImage);
+		gchar *cPath = cairo_dock_search_icon_s_path (myConfig.cFullUserImage, CAIRO_DOCK_DEFAULT_ICON_SIZE);
 		if (! g_file_test (cPath, G_FILE_TEST_EXISTS))
 		{
 			g_free (myConfig.cFullUserImage);
 			myConfig.cFullUserImage = NULL;
 		}
-                g_free (cPath);
+		g_free (cPath);
 	}
 	// if a theme is defined, and user images are not defined, use the theme.
 	if (myConfig.cThemePath != NULL)
 
=== modified file 'gnome-integration/src/applet-init.c'
--- gnome-integration/src/applet-init.c	2012-02-16 01:45:57 +0000
+++ gnome-integration/src/applet-init.c	2012-03-21 20:37:19 +0000
@@ -32,25 +32,34 @@
 	"It is auto-activated, so you don't need to activate it.\n"
 	"It is designed for the a GNOME version >= 2.22",
 	"Fabounet (Fabrice Rey)")
-	if (g_iDesktopEnv == CAIRO_DOCK_GNOME && (glib_major_version > 2 || glib_minor_version >= 16))
+	
+	CairoDockDesktopEnvBackend *pVFSBackend = NULL;
+	if (! cairo_dock_fm_vfs_backend_is_defined ())  // the Gnome backend will register the GVFS functions, even if it's not a Gnome environment. It will not overwrite the other functions of the backend, and if another backend comes later, it can set its own functions.
 	{
-		cd_debug ("GNOME");
 		if (cairo_dock_gio_vfs_init ())
 		{
 			cd_debug ("GVFS");
-			CairoDockDesktopEnvBackend *pVFSBackend = g_new0 (CairoDockDesktopEnvBackend, 1);
-			
-			cairo_dock_gio_vfs_fill_backend(pVFSBackend);
-			
-			pVFSBackend->logout = env_backend_logout;
-			pVFSBackend->shutdown = env_backend_shutdown;
-			pVFSBackend->reboot = env_backend_shutdown;
-			pVFSBackend->lock_screen = env_backend_lock_screen;
-			pVFSBackend->setup_time = env_backend_setup_time;
-			pVFSBackend->show_system_monitor = env_backend_show_system_monitor;
-			cairo_dock_fm_register_vfs_backend (pVFSBackend);
+			pVFSBackend = g_new0 (CairoDockDesktopEnvBackend, 1);
+			cairo_dock_gio_vfs_fill_backend (pVFSBackend);
 		}
 	}
+	
+	if (g_iDesktopEnv == CAIRO_DOCK_GNOME && (glib_major_version > 2 || glib_minor_version >= 16))
+	{
+		cd_debug ("GNOME");
+		if (pVFSBackend == NULL)
+			pVFSBackend = g_new0 (CairoDockDesktopEnvBackend, 1);
+			
+		pVFSBackend->logout = env_backend_logout;
+		pVFSBackend->shutdown = env_backend_shutdown;
+		pVFSBackend->reboot = env_backend_shutdown;
+		pVFSBackend->lock_screen = env_backend_lock_screen;
+		pVFSBackend->setup_time = env_backend_setup_time;
+		pVFSBackend->show_system_monitor = env_backend_show_system_monitor;
+	}
+	
+	if (pVFSBackend != NULL)
+		cairo_dock_fm_register_vfs_backend (pVFSBackend);
 	else
 		return FALSE;
 	CD_APPLET_SET_CONTAINER_TYPE (CAIRO_DOCK_MODULE_IS_PLUGIN);
 
=== modified file 'gnome-integration/src/applet-utils.c'
--- gnome-integration/src/applet-utils.c	2012-02-16 01:45:57 +0000
+++ gnome-integration/src/applet-utils.c	2012-03-21 20:37:19 +0000
@@ -53,6 +53,7 @@
 void env_backend_setup_time (void)
 {
 	cairo_dock_launch_command ("time-admin");  // it uses PolicyKit => no gksudo.
+	/// TODO: use gnome-control-center ...
 }
 
 void env_backend_show_system_monitor (void)
 
=== modified file 'gvfs-integration/cairo-dock-gio-vfs.c'
--- gvfs-integration/cairo-dock-gio-vfs.c	2011-09-26 12:56:12 +0000
+++ gvfs-integration/cairo-dock-gio-vfs.c	2012-03-21 20:37:19 +0000
@@ -92,7 +92,7 @@
 		{
 			//g_print (" une icone possible est : %s\n", cFileNames[i]);
 			
-			gchar *path = cairo_dock_search_icon_s_path (cFileNames[i]);
+			gchar *path = cairo_dock_search_icon_s_path (cFileNames[i], CAIRO_DOCK_DEFAULT_ICON_SIZE);
 			if (path)
 			{
 				g_free (path);
@@ -169,7 +169,7 @@
 			if (iFileType == G_FILE_TYPE_MOUNTABLE)
 			{
 				const gchar *cFileName = g_file_info_get_name (pFileInfo);
-				cd_message ("  test de  %s...", cFileName);
+				cd_debug ("  test of  %s...", cFileName);
 				const gchar *cTargetURI = g_file_info_get_attribute_string (pFileInfo, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
 				
 				GMount *pMount = NULL;
@@ -185,7 +185,7 @@
 					cd_message ("    mount : %s", cName);
 					if (cName != NULL && strcmp (cName, cVolumeName) == 0)
 					{
-						cd_message ("TROUVE");
+						cd_debug ("Found");
 						*pFoundMount = pMount;
 						*cURI = g_strconcat ("computer:///", cFileName, NULL);
 						GIcon *pSystemIcon = g_mount_get_icon (pMount);
 
=== modified file 'kde-integration/src/applet-vfs.c'
--- kde-integration/src/applet-vfs.c	2011-04-20 20:46:51 +0000
+++ kde-integration/src/applet-vfs.c	2012-03-21 20:37:19 +0000
@@ -79,7 +79,7 @@
 		for (i = 0; cFileNames[i] != NULL && cIconPath == NULL; i ++)
 		{
 			//cd_message (" une icone possible est : %s\n", cFileNames[i]);
-			cIconPath = cairo_dock_search_icon_s_path (cFileNames[i]);
+			cIconPath = cairo_dock_search_icon_s_path (cFileNames[i], CAIRO_DOCK_DEFAULT_ICON_SIZE);
 			//cd_message ("  chemin trouve : %s\n", cIconPath);
 		}
 	}
 
=== modified file 'keyboard-indicator/data/keyboard-indicator.conf.in'
--- keyboard-indicator/data/keyboard-indicator.conf.in	2012-02-16 01:45:57 +0000
+++ keyboard-indicator/data/keyboard-indicator.conf.in	2012-03-21 20:37:19 +0000
@@ -20,8 +20,8 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#B Always display the icon, even when the dock is hidden?
-always visi = false
+#Y+[No;0;0;With default background;0;0;With custom background;1;1] Always display the icon, even when the dock is hidden?
+always_visi = 0
 
 #C+ Background color to add in this case
 bg color = .8;.8;.8;.5
 
=== modified file 'logout/src/applet-init.c'
--- logout/src/applet-init.c	2012-02-16 01:45:57 +0000
+++ logout/src/applet-init.c	2012-03-21 20:37:19 +0000
@@ -53,6 +53,8 @@
 		CD_APPLET_MANAGE_APPLICATION ("xfce4-session-logout");  // x-session-manager before 4.8
 	else if (g_iDesktopEnv == CAIRO_DOCK_KDE)
 		CD_APPLET_MANAGE_APPLICATION ("ksmserver");  /// pas du tout sur...
+
+	myData.iDesiredIconSize = cairo_dock_search_icon_size (GTK_ICON_SIZE_MENU);
 	
 	//\_______________ On enregistre nos notifications.
 	CD_APPLET_REGISTER_FOR_CLICK_EVENT;
 
=== modified file 'logout/src/applet-logout.c'
--- logout/src/applet-logout.c	2012-02-16 01:45:57 +0000
+++ logout/src/applet-logout.c	2012-03-21 20:37:19 +0000
@@ -32,6 +32,7 @@
 typedef struct {
 	gchar *cUserName;
 	gchar *cIconFile;
+	gchar *cRealName;
 } CDUser;
 
 static void cd_logout_shut_down (void);
@@ -60,7 +61,7 @@
 	// get capabilities from UPower.
 	#ifdef CD_UPOWER_AVAILABLE
 	UpClient *pUPowerClient = up_client_new ();
-	up_client_get_properties_sync (pUPowerClient, NULL, &error);  // this function always returns false ...
+	up_client_get_properties_sync (pUPowerClient, NULL, &error);  // this function always returns false ... and it crashes the dock (Debian 6) ! :-O
 	if (error)
 	{
 		cd_warning ("UPower error: %s", error->message);
@@ -115,6 +116,7 @@
 			seat,
 			DBUS_INTERFACE_PROPERTIES);
 		pSharedMemory->bHasGuestAccount = cairo_dock_dbus_get_property_as_boolean (pProxy, "org.freedesktop.DisplayManager.Seat", "HasGuestAccount");
+		g_object_unref (pProxy);
 	}
 }
 
@@ -167,9 +169,9 @@
  /// MENU ///
 ////////////
 
-static gchar *_check_icon (const gchar *cIconStock)
+static gchar *_check_icon (const gchar *cIconStock, gint iIconSize)
 {
-	gchar *cImagePath = cairo_dock_search_icon_s_path (cIconStock);
+	gchar *cImagePath = cairo_dock_search_icon_s_path (cIconStock, iIconSize);
 	if (cImagePath != NULL && g_file_test (cImagePath, G_FILE_TEST_EXISTS))
 		return cImagePath;
 	else
@@ -194,26 +196,26 @@
 	GtkWidget *pMenuItem;
 
 	gchar *cImagePath;
-	cImagePath = _check_icon ("system-shutdown");
+	cImagePath = _check_icon ("system-shutdown", myData.iDesiredIconSize);
 	pMenuItem = CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Shut down"), cImagePath ? cImagePath : MY_APPLET_SHARE_DATA_DIR"/system-shutdown.svg", cd_logout_shut_down, pMenu);
 	g_free (cImagePath);
 	if (!myData.bCanStop && ! myConfig.cUserAction2)
 		gtk_widget_set_sensitive (pMenuItem, FALSE);
 	
-	cImagePath = _check_icon (GTK_STOCK_REFRESH);
+	cImagePath = _check_icon (GTK_STOCK_REFRESH, myData.iDesiredIconSize);
 	pMenuItem = CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Restart"), cImagePath ? cImagePath : MY_APPLET_SHARE_DATA_DIR"/system-restart.svg", cd_logout_restart, pMenu);
 	g_free (cImagePath);
 	if (!myData.bCanRestart)
 		gtk_widget_set_sensitive (pMenuItem, FALSE);
 	
-	cImagePath = _check_icon ("sleep");
+	cImagePath = _check_icon ("sleep", myData.iDesiredIconSize);
 	pMenuItem = CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Hibernate"), cImagePath ? cImagePath : MY_APPLET_SHARE_DATA_DIR"/system-hibernate.svg", cd_logout_hibernate, pMenu);
 	g_free (cImagePath);
 	gtk_widget_set_tooltip_text (pMenuItem, D_("Your computer will not consume any energy."));
 	if (!myData.bCanHibernate)
 		gtk_widget_set_sensitive (pMenuItem, FALSE);
 	
-	cImagePath = _check_icon ("clock");
+	cImagePath = _check_icon ("clock", myData.iDesiredIconSize);
 	pMenuItem = CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Suspend"), cImagePath ? cImagePath : MY_APPLET_SHARE_DATA_DIR"/system-suspend.svg", cd_logout_suspend, pMenu);
 	g_free (cImagePath);
 	gtk_widget_set_tooltip_text (pMenuItem, D_("Your computer will still consume a small amount of energy."));
@@ -222,7 +224,7 @@
 	
 	if (g_getenv ("SESSION_MANAGER") != NULL)  // needs a session manager for this.
 	{
-		cImagePath = _check_icon ("system-log-out");
+		cImagePath = _check_icon ("system-log-out", myData.iDesiredIconSize);
 		pMenuItem = CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Log out"), cImagePath ? cImagePath : MY_APPLET_SHARE_DATA_DIR"/system-log-out.svg", cd_logout_close_session, pMenu);
 		g_free (cImagePath);
 		gtk_widget_set_tooltip_text (pMenuItem, D_("Close your session and allow to open a new one."));
@@ -245,14 +247,16 @@
 		for (u = myData.pUserList; u != NULL; u = u->next)
 		{
 			pUser = u->data;
-			pMenuItem = CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (pUser->cUserName, pUser->cIconFile, _switch_to_user, pUsersSubMenu, pUser->cUserName);
-			if (cCurrentUser && strcmp (cCurrentUser, pUser->cUserName) == 0)
+			pMenuItem = CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (
+				(pUser->cRealName && *(pUser->cRealName) != '\0') ? pUser->cRealName : pUser->cUserName,
+				pUser->cIconFile, _switch_to_user, pUsersSubMenu, pUser->cUserName);
+			if (! bFoundUser && cCurrentUser && strcmp (cCurrentUser, pUser->cUserName) == 0)
 			{
 				bFoundUser = TRUE;
 				gtk_widget_set_sensitive (pMenuItem, FALSE);
 			}
 		}
-		
+
 		if (myData.bHasGuestAccount && bFoundUser)  // if we didn't find the user yet, it means we are the guest, so don't show this entry.
 		{
 			CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Guest session"), NULL, _switch_to_user, pUsersSubMenu, NULL);  // NULL will mean "guest"
@@ -261,12 +265,12 @@
 	
 	CD_APPLET_ADD_SEPARATOR_IN_MENU (pMenu);
 	
-	cImagePath = _check_icon ("system-lock-screen");
+	cImagePath = _check_icon ("system-lock-screen", myData.iDesiredIconSize);
 	CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Lock screen"), cImagePath ? cImagePath : MY_APPLET_SHARE_DATA_DIR"/locked.svg", cairo_dock_fm_lock_screen, pMenu);  /// TODO: same question...
 	g_free (cImagePath);
 	if (myData.bCanStop)
 	{
-		cImagePath = _check_icon ("document-open-recent");
+		cImagePath = _check_icon ("document-open-recent", myData.iDesiredIconSize);
 		CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Program an automatic shut-down"), cImagePath ? cImagePath : MY_APPLET_SHARE_DATA_DIR"/icon-scheduling.svg", cd_logout_program_shutdown, pMenu);
 		g_free (cImagePath);
 	}
@@ -414,10 +418,17 @@
 			CD_APPLET_DEMANDS_ATTENTION ("pulse", 20);
 			cairo_dock_show_temporary_dialog_with_icon (myIcon->cName, myIcon, myContainer, 5e3, "same icon");
 
-			gchar *cImagePath = _check_icon (myConfig.cEmblemPath);
+			gint iIconSize = MAX (myIcon->iImageWidth, myIcon->iImageHeight);
+			gchar *cImagePath = _check_icon (myConfig.cEmblemPath,
+				(myConfig.iRebootNeededImage == CD_DISPLAY_EMBLEM ?
+						iIconSize / 2 :
+						iIconSize));
 			if (! cImagePath)
 			{
-				cImagePath = _check_icon (GTK_STOCK_REFRESH);
+				cImagePath = _check_icon (GTK_STOCK_REFRESH,
+					(myConfig.iRebootNeededImage == CD_DISPLAY_EMBLEM ?
+						iIconSize / 2 :
+						iIconSize));
 				if (! cImagePath)
 					cImagePath = g_strdup (MY_APPLET_SHARE_DATA_DIR"/system-restart.svg");
 			}
@@ -491,7 +502,7 @@
 }
 static void _demand_confirmation (const gchar *cMessage, const gchar *cIconStock, const gchar *cIconImage, void (*callback) (void))
 {
-	gchar *cImagePath = _check_icon (cIconStock);
+	gchar *cImagePath = _check_icon (cIconStock, 32); // dialog
 	myData.pConfirmationDialog = cairo_dock_show_dialog_full (cMessage, myIcon, myContainer, 0, cImagePath ? cImagePath : cIconImage, NULL, (CairoDockActionOnAnswerFunc) _exec_action, callback, NULL);
 	g_free (cImagePath);
 }
@@ -697,6 +708,7 @@
 {
 	g_free (pUser->cUserName);
 	g_free (pUser->cIconFile);
+	g_free (pUser->cRealName);
 	g_free (pUser);
 }
 
@@ -745,6 +757,7 @@
 		if (pUser->cUserName == NULL) // shouldn't happen
 			continue;
 		pUser->cIconFile = cairo_dock_dbus_get_property_as_string (pProxy, "org.freedesktop.Accounts.User", "IconFile");
+		pUser->cRealName = cairo_dock_dbus_get_property_as_string (pProxy, "org.freedesktop.Accounts.User", "RealName");
 		pUserList = g_list_insert_sorted (pUserList, pUser, (GCompareFunc)_compare_user_name);
 		
 		g_object_unref (pProxy);
 
=== modified file 'logout/src/applet-struct.h'
--- logout/src/applet-struct.h	2012-02-16 01:45:57 +0000
+++ logout/src/applet-struct.h	2012-03-21 20:37:19 +0000
@@ -79,6 +79,7 @@
 	gint iCountDown;
 	guint iSidShutDown;
 	CairoDialog *pConfirmationDialog;
+	gint iDesiredIconSize;
 	} ;
 
 #endif
 
=== modified file 'mail/data/mail.conf.in'
--- mail/data/mail.conf.in	2012-02-16 01:45:57 +0000
+++ mail/data/mail.conf.in	2012-03-21 20:37:19 +0000
@@ -20,8 +20,8 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#B Always display the icon, even when the dock is hidden?
-always visi = false
+#Y+[No;0;0;With default background;0;0;With custom background;1;1] Always display the icon, even when the dock is hidden?
+always_visi = 0
 
 #C+ Background color to add in this case
 bg color = .8;.8;.8;.5
 
=== modified file 'mail/src/cd-mail-applet-config.c'
--- mail/src/cd-mail-applet-config.c	2012-02-16 01:45:57 +0000
+++ mail/src/cd-mail-applet-config.c	2012-03-21 20:37:19 +0000
@@ -105,7 +105,7 @@
 		
 		for( j = 0; j < MAIL_NB_STORAGE_TYPES; j++ )
 		{
-			if (g_strcasecmp(storage_tab[j].name, cMailAccountType) == 0)
+			if (g_ascii_strcasecmp (storage_tab[j].name, cMailAccountType) == 0)
 			{
 				break;
 			}
@@ -141,7 +141,7 @@
 	if (path != NULL) { \
 		_found_image = cairo_dock_search_image_s_path (path); \
 		if (_found_image == NULL)\
-			_found_image = cairo_dock_search_icon_s_path (path); }\
+			_found_image = cairo_dock_search_icon_s_path (path, MAX (myIcon->iImageWidth, myIcon->iImageHeight)); }\
 	_found_image; })
 CD_APPLET_GET_CONFIG_BEGIN
 	//\_________________ On recupere toutes les valeurs de notre fichier de conf.
 
=== modified file 'mail/src/cd-mail-applet-init.c'
--- mail/src/cd-mail-applet-init.c	2010-08-10 00:05:57 +0000
+++ mail/src/cd-mail-applet-init.c	2012-03-21 20:37:19 +0000
@@ -103,7 +103,7 @@
 	//\_______________ On charge le theme si necessaire, avec en priorite les images utilisateur.
 	if (myConfig.cNoMailUserImage != NULL)
 	{
-		gchar *cPath = cairo_dock_search_icon_s_path (myConfig.cNoMailUserImage);
+		gchar *cPath = cairo_dock_search_icon_s_path (myConfig.cNoMailUserImage, MAX (myIcon->iImageWidth, myIcon->iImageHeight));
 		if (! g_file_test (cPath, G_FILE_TEST_EXISTS))
 		{
 			g_free (myConfig.cNoMailUserImage);
@@ -113,7 +113,7 @@
 	}
 	if (myConfig.cHasMailUserImage != NULL)
 	{
-		gchar *cPath = cairo_dock_search_icon_s_path (myConfig.cHasMailUserImage);
+		gchar *cPath = cairo_dock_search_icon_s_path (myConfig.cHasMailUserImage, MAX (myIcon->iImageWidth, myIcon->iImageHeight));
 		if (! g_file_test (cPath, G_FILE_TEST_EXISTS))
 		{
 			g_free (myConfig.cHasMailUserImage);
 
=== modified file 'musicPlayer/data/musicPlayer.conf.in'
--- musicPlayer/data/musicPlayer.conf.in	2012-02-16 01:45:57 +0000
+++ musicPlayer/data/musicPlayer.conf.in	2012-03-21 20:37:19 +0000
@@ -22,8 +22,8 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#B Always display the icon, even when the dock is hidden?
-always visi = false
+#Y+[No;0;0;With default background;0;0;With custom background;1;1] Always display the icon, even when the dock is hidden?
+always_visi = 0
 
 #C+ Background color to add in this case
 bg color = .8;.8;.8;.5
 
=== modified file 'musicPlayer/src/applet-draw.c'
--- musicPlayer/src/applet-draw.c	2012-02-16 01:45:57 +0000
+++ musicPlayer/src/applet-draw.c	2012-03-21 20:37:19 +0000
@@ -212,7 +212,7 @@
 		gchar *cUserIcon = myConfig.cUserImage[iStatus];
 		if (cUserIcon != NULL)  // l'utilisateur a defini une icone perso pour ce statut => on essaye de la charger.
 		{
-			gchar *cUserImagePath = cairo_dock_search_icon_s_path (cUserIcon);
+			gchar *cUserImagePath = cairo_dock_search_icon_s_path (cUserIcon, MAX (myIcon->iImageWidth, myIcon->iImageHeight));
 			myData.pSurfaces[iStatus] = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (cUserImagePath ? cUserImagePath : cUserIcon);  // si on a trouve une icone, on la prend, sinon on considere le fichier comme une image.
 			g_free (cUserImagePath);
 		}
 
=== modified file 'musicPlayer/src/applet-musicplayer.c'
--- musicPlayer/src/applet-musicplayer.c	2012-02-16 01:45:57 +0000
+++ musicPlayer/src/applet-musicplayer.c	2012-03-21 20:37:19 +0000
@@ -503,11 +503,11 @@
 	cd_musicplayer_apply_status_surface (PLAYER_NONE);  // until we detect any service, consider it's not running.
 	if (myConfig.cDefaultTitle == NULL)
 	{
-		if (myIcon->cName != NULL)
+		/**if (myIcon->cName != NULL)
 		{
 			CD_APPLET_SET_NAME_FOR_MY_ICON (myIcon->cName);
 		}
-		else if (strcmp (myData.pCurrentHandler->name, "Mpris2") != 0)
+		else */if (strcmp (myData.pCurrentHandler->name, "Mpris2") != 0)
 		{
 			CD_APPLET_SET_NAME_FOR_MY_ICON (myData.pCurrentHandler->name);
 		}
 
=== modified file 'musicPlayer/src/applet-notifications.c'
--- musicPlayer/src/applet-notifications.c	2012-02-16 01:45:57 +0000
+++ musicPlayer/src/applet-notifications.c	2012-03-21 20:37:19 +0000
@@ -130,6 +130,8 @@
 	myConfig.cMusicPlayer = g_strdup (cPlayerName);
 	// set the handler with this value.
 	cd_musicplayer_set_current_handler (myConfig.cMusicPlayer);
+	// launch it, if it's already running, it's likely to have no effect
+	cairo_dock_launch_command (myData.pCurrentHandler->launch);
 }
 static void _show_players_list_dialog (void)
 {
 
=== modified file 'musicPlayer/src/applet-rhythmbox.c'
--- musicPlayer/src/applet-rhythmbox.c	2012-02-16 01:45:57 +0000
+++ musicPlayer/src/applet-rhythmbox.c	2012-03-21 20:37:19 +0000
@@ -345,7 +345,7 @@
 	pHandler->appclass = "rhythmbox";
 	pHandler->launch = "rhythmbox";
 	pHandler->cMprisService = "org.gnome.Rhythmbox";  // they used MPRIS from version 2.90.1~20110908 with org.mpris.MediaPlayer2.rhythmbox, but we don't care as they quickly switched to MPRIS2 in version 2.90.1~20111126
-	pHandler->cMpris2Service = "org.mpris.MediaPlayer2.rhythmbox3"; // 2.90.1~20111126
+	pHandler->cMpris2Service = "org.mpris.MediaPlayer2.rhythmbox"; // after 2.90.1~20111126 (on a previous development version, they used rhythmbox3...)
 	pHandler->path = "/org/gnome/Rhythmbox/Player"; // <= 0.13
 	pHandler->interface = "org.gnome.Rhythmbox.Player";
 	pHandler->path2 = "/org/gnome/Rhythmbox/Shell";
 
=== modified file 'netspeed/data/netspeed.conf.in'
--- netspeed/data/netspeed.conf.in	2012-02-16 01:45:57 +0000
+++ netspeed/data/netspeed.conf.in	2012-03-21 20:37:19 +0000
@@ -20,8 +20,8 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#B Always display the icon, even when the dock is hidden?
-always visi = false
+#Y+[No;0;0;With default background;0;0;With custom background;1;1] Always display the icon, even when the dock is hidden?
+always_visi = 0
 
 #C+ Background color to add in this case
 bg color = .8;.8;.8;.5
 
=== modified file 'po/ar.po'
--- po/ar.po	2012-02-16 01:45:57 +0000
+++ po/ar.po	2012-03-21 20:37:19 +0000
@@ -7,16 +7,15 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-plug-ins\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-02-12 03:52+0000\n"
 "PO-Revision-Date: 2011-09-16 00:48+0000\n"
 "Last-Translator: Fabounet <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2012-02-13 04:54+0000\n"
 "X-Generator: Launchpad (build 14781)\n"
-"Language: ar\n"
 
 #: ../Animated-icons/src/applet-init.c:32
 msgid "Animated icons"
@@ -28,47 +27,77 @@
 
 #: ../Animated-icons/src/applet-init.c:80 ../Animated-icons/data/messages:9
 #: ../Animated-icons/data/messages:27 ../Animated-icons/data/messages:47
-#: ../Animated-icons/data/messages:67 ../Animated-icons/data/messages:177
+#: ../Animated-icons/data/messages:157
 msgid "Bounce"
 msgstr "ارتداد"
 
 #: ../Animated-icons/src/applet-init.c:81 ../Animated-icons/data/messages:11
 #: ../Animated-icons/data/messages:29 ../Animated-icons/data/messages:49
-#: ../Animated-icons/data/messages:69
 msgid "Rotate"
 msgstr "تدوير"
 
 #: ../Animated-icons/src/applet-init.c:82 ../Animated-icons/data/messages:13
 #: ../Animated-icons/data/messages:31 ../Animated-icons/data/messages:51
-#: ../Animated-icons/data/messages:71 ../Animated-icons/data/messages:191
+#: ../Animated-icons/data/messages:171
 msgid "Blink"
 msgstr "وميض"
 
 #: ../Animated-icons/src/applet-init.c:83 ../Animated-icons/data/messages:15
 #: ../Animated-icons/data/messages:33 ../Animated-icons/data/messages:53
-#: ../Animated-icons/data/messages:73 ../Animated-icons/data/messages:165
+#: ../Animated-icons/data/messages:145
 msgid "Pulse"
 msgstr "نبض"
 
 #: ../Animated-icons/src/applet-init.c:84 ../Animated-icons/data/messages:17
 #: ../Animated-icons/data/messages:35 ../Animated-icons/data/messages:55
-#: ../Animated-icons/data/messages:75 ../Animated-icons/data/messages:137
+#: ../Animated-icons/data/messages:117
 msgid "Wobbly"
 msgstr "متهاد"
 
 #: ../Animated-icons/src/applet-init.c:85 ../Animated-icons/data/messages:19
 #: ../Animated-icons/data/messages:37 ../Animated-icons/data/messages:57
-#: ../Animated-icons/data/messages:77 ../Animated-icons/data/messages:153
+#: ../Animated-icons/data/messages:133
 msgid "Wave"
 msgstr "تموج"
 
 #: ../Animated-icons/src/applet-init.c:86 ../Animated-icons/data/messages:21
 #: ../Animated-icons/data/messages:39 ../Animated-icons/data/messages:59
-#: ../Animated-icons/data/messages:79 ../Animated-icons/data/messages:101
-#: ../Animated-icons/data/messages:109
+#: ../Animated-icons/data/messages:81 ../Animated-icons/data/messages:89
 msgid "Spot"
 msgstr "بقعة"
 
+#: ../Application-Menu/src/applet-init.c:30
+#, fuzzy
+msgid "Application Menu"
+msgstr "قائمة البرامج"
+
+#: ../Application-Menu/src/applet-init.c:33
+#: ../Global-Menu/src/applet-init.c:33
+msgid ""
+"This applet allows you to control the current active window:\n"
+"  close, minimize, maximize, and display the application menu.To display the "
+"menu, applications have to support this feature, which is the case on Ubuntu "
+"by default.\n"
+"You can bind a shortkey to this action."
+msgstr ""
+
+#: ../Application-Menu/src/applet-init.c:83
+#: ../Application-Menu/src/applet-init.c:148
+#: ../Global-Menu/src/applet-init.c:108 ../Global-Menu/src/applet-init.c:210
+msgid "Show/hide the current application menu"
+msgstr ""
+
+#: ../Application-Menu/src/applet-notifications.c:52
+#: ../Global-Menu/src/applet-notifications.c:52
+msgid "The application didn't send its menu to us."
+msgstr ""
+
+#: ../Application-Menu/src/indicator-sound.c:228
+#: ../Sound-Menu/src/indicator-sound.c:228
+#, c-format
+msgid "Volume (%'.0f%%)"
+msgstr ""
+
 #: ../Cairo-Penguin/src/applet-init.c:33
 msgid ""
 "Add a lively Penguin in your dock !\n"
@@ -96,8 +125,7 @@
 #: ../Cairo-Penguin/src/applet-notifications.c:31
 msgid ""
 "I don't have time to play with you, I have to dig and mine all these icons."
-msgstr ""
-"ليس لدي مايكفي من الوقت للعب معك, علي أن احفر وألغم كل هذه الأيقونات."
+msgstr "ليس لدي مايكفي من الوقت للعب معك, علي أن احفر وألغم كل هذه الأيقونات."
 
 #: ../Cairo-Penguin/src/applet-notifications.c:32
 msgid "Your dock is so messy! Let me clean it."
@@ -252,7 +280,7 @@
 msgstr ""
 
 #: ../Composite-Manager/src/applet-notifications.c:120
-#: ../Composite-Manager/data/messages:131
+#: ../Composite-Manager/data/messages:129
 msgid "Edit Window-Manager settings"
 msgstr ""
 
@@ -267,10 +295,10 @@
 #: ../RSSreader/src/applet-notifications.c:129
 #: ../System-Monitor/src/applet-notifications.c:106
 #: ../Xgamma/src/applet-notifications.c:87
-#: ../alsaMixer/src/applet-notifications.c:71
+#: ../alsaMixer/src/applet-notifications.c:85
 #: ../dustbin/src/applet-notifications.c:136
 #: ../mail/src/cd-mail-applet-notifications.c:154
-#: ../musicPlayer/src/applet-notifications.c:276
+#: ../musicPlayer/src/applet-notifications.c:278
 #: ../netspeed/src/applet-notifications.c:94
 #: ../quick-browser/src/applet-notifications.c:41
 #: ../shortcuts/src/applet-notifications.c:249
@@ -278,8 +306,8 @@
 #: ../showDesktop/src/applet-notifications.c:153
 #: ../showDesktop/src/applet-notifications.c:165
 #: ../showDesktop/src/applet-notifications.c:177
-#: ../slider/src/applet-notifications.c:227
-#: ../slider/src/applet-notifications.c:268
+#: ../slider/src/applet-notifications.c:223
+#: ../slider/src/applet-notifications.c:265
 #: ../stack/src/applet-notifications.c:181
 #: ../switcher/src/applet-notifications.c:300
 #: ../switcher/src/applet-notifications.c:305
@@ -289,15 +317,15 @@
 msgstr "ضغط وسطي"
 
 #: ../Composite-Manager/src/applet-notifications.c:127
-#: ../Composite-Manager/data/messages:133
+#: ../Composite-Manager/data/messages:131
 msgid "Reload Window-Manager"
 msgstr ""
 
 #: ../Composite-Manager/src/applet-notifications.c:136
 #: ../showDesktop/src/applet-notifications.c:153
 #: ../showDesktop/src/applet-notifications.c:155
-#: ../Composite-Manager/data/messages:135 ../showDesktop/data/messages:105
-#: ../showDesktop/data/messages:119 ../switcher/data/messages:107
+#: ../Composite-Manager/data/messages:133 ../showDesktop/data/messages:103
+#: ../showDesktop/data/messages:117 ../switcher/data/messages:113
 msgid "Show desktop"
 msgstr ""
 
@@ -305,22 +333,22 @@
 #: ../showDesktop/src/applet-notifications.c:165
 #: ../showDesktop/src/applet-notifications.c:167
 #: ../switcher/src/applet-notifications.c:314
-#: ../Composite-Manager/data/messages:137 ../showDesktop/data/messages:113
-#: ../showDesktop/data/messages:127 ../switcher/data/messages:109
+#: ../Composite-Manager/data/messages:135 ../showDesktop/data/messages:111
+#: ../showDesktop/data/messages:125 ../switcher/data/messages:115
 msgid "Expose all the desktops"
 msgstr ""
 
 #: ../Composite-Manager/src/applet-notifications.c:154
 #: ../switcher/src/applet-notifications.c:323
-#: ../Composite-Manager/data/messages:139 ../switcher/data/messages:111
+#: ../Composite-Manager/data/messages:137 ../switcher/data/messages:117
 msgid "Expose all the windows"
 msgstr ""
 
 #: ../Composite-Manager/src/applet-notifications.c:163
 #: ../showDesktop/src/applet-notifications.c:177
 #: ../showDesktop/src/applet-notifications.c:179
-#: ../Composite-Manager/data/messages:141 ../showDesktop/data/messages:111
-#: ../showDesktop/data/messages:125
+#: ../Composite-Manager/data/messages:139 ../showDesktop/data/messages:109
+#: ../showDesktop/data/messages:123
 msgid "Show the Widget Layer"
 msgstr ""
 
@@ -344,8 +372,7 @@
 
 #: ../Dbus/src/interface-applet-signals.c:466
 #, c-format
-msgid ""
-"The applet '%s' has been succefully updated and automatically reloaded"
+msgid "The applet '%s' has been succefully updated and automatically reloaded"
 msgstr "البريمج '%s' تم تحديثه وإعادة تشغيله تلقائياً بنجاح"
 
 #: ../Dbus/src/interface-applet-signals.c:466
@@ -500,7 +527,7 @@
 msgid "Properties:"
 msgstr ""
 
-#: ../Folders/src/applet-notifications.c:136 ../Folders/data/messages:119
+#: ../Folders/src/applet-notifications.c:136 ../Folders/data/messages:117
 msgid "Size"
 msgstr ""
 
@@ -534,21 +561,30 @@
 
 #: ../Folders/src/applet-notifications.c:184
 #: ../Folders/src/applet-notifications.c:185
-#: ../Folders/src/applet-notifications.c:186 ../Disks/data/messages:107
-#: ../System-Monitor/data/messages:111 ../alsaMixer/data/messages:155
-#: ../netspeed/data/messages:107 ../slider/data/messages:165
+#: ../Folders/src/applet-notifications.c:186 ../Disks/data/messages:105
+#: ../System-Monitor/data/messages:115 ../alsaMixer/data/messages:147
+#: ../netspeed/data/messages:115 ../slider/data/messages:169
 msgid "Yes"
 msgstr ""
 
 #: ../Folders/src/applet-notifications.c:184
 #: ../Folders/src/applet-notifications.c:185
-#: ../Folders/src/applet-notifications.c:186 ../Disks/data/messages:103
-#: ../Disks/data/messages:139 ../Network-Monitor/data/messages:113
-#: ../RSSreader/data/messages:115 ../System-Monitor/data/messages:107
-#: ../System-Monitor/data/messages:159 ../alsaMixer/data/messages:121
-#: ../alsaMixer/data/messages:151 ../clock/data/messages:101
-#: ../netspeed/data/messages:103 ../netspeed/data/messages:151
-#: ../shortcuts/data/messages:121 ../slider/data/messages:163
+#: ../Folders/src/applet-notifications.c:186
+#: ../Application-Menu/data/messages:293 ../Disks/data/messages:101
+#: ../Disks/data/messages:137 ../Messaging-Menu/data/messages:15
+#: ../Network-Monitor/data/messages:17 ../Network-Monitor/data/messages:117
+#: ../RSSreader/data/messages:113 ../Sound-Menu/data/messages:183
+#: ../Status-Notifier/data/messages:19 ../System-Monitor/data/messages:15
+#: ../System-Monitor/data/messages:111 ../System-Monitor/data/messages:163
+#: ../Toons/data/messages:15 ../alsaMixer/data/messages:17
+#: ../alsaMixer/data/messages:113 ../alsaMixer/data/messages:143
+#: ../clock/data/messages:17 ../clock/data/messages:105
+#: ../keyboard-indicator/data/messages:15 ../mail/data/messages:15
+#: ../musicPlayer/data/messages:17 ../netspeed/data/messages:15
+#: ../netspeed/data/messages:111 ../netspeed/data/messages:159
+#: ../powermanager/data/messages:17 ../shortcuts/data/messages:119
+#: ../slider/data/messages:15 ../slider/data/messages:167
+#: ../weather/data/messages:17 ../wifi/data/messages:15
 msgid "No"
 msgstr ""
 
@@ -630,47 +666,47 @@
 
 #: ../Folders/src/applet-notifications.c:380
 #: ../Recent-Events/src/applet-dialog.c:263
-#: ../slider/src/applet-notifications.c:237
+#: ../slider/src/applet-notifications.c:233
 msgid "Open with"
 msgstr "فتح بـ"
 
-#: ../Folders/src/applet-notifications.c:412
+#: ../Folders/src/applet-notifications.c:413
 msgid "Properties"
 msgstr "الخصائص"
 
-#: ../Folders/src/applet-notifications.c:415
+#: ../Folders/src/applet-notifications.c:416
 msgid "Create a new file"
 msgstr "أنشئ ملفًا جديدًا"
 
-#: ../Folders/src/applet-notifications.c:416
+#: ../Folders/src/applet-notifications.c:417
 msgid "Create a new folder"
 msgstr "تكوين مجلد جديد"
 
-#: ../Folders/src/applet-notifications.c:421
+#: ../Folders/src/applet-notifications.c:422
 msgid "Sort by"
 msgstr ""
 
-#: ../Folders/src/applet-notifications.c:422
+#: ../Folders/src/applet-notifications.c:423
 msgid "By name"
 msgstr ""
 
-#: ../Folders/src/applet-notifications.c:423
+#: ../Folders/src/applet-notifications.c:424
 msgid "By date"
 msgstr ""
 
-#: ../Folders/src/applet-notifications.c:424
+#: ../Folders/src/applet-notifications.c:425
 msgid "By size"
 msgstr ""
 
-#: ../Folders/src/applet-notifications.c:425
+#: ../Folders/src/applet-notifications.c:426
 msgid "By type"
 msgstr ""
 
-#: ../Folders/src/applet-notifications.c:465
+#: ../Folders/src/applet-notifications.c:468
 msgid "The folder has been imported."
 msgstr ""
 
-#: ../Folders/src/applet-notifications.c:523
+#: ../Folders/src/applet-notifications.c:529
 msgid "Do you want to import the content of the folder too?"
 msgstr ""
 
@@ -692,19 +728,19 @@
 msgid "Applications Menu"
 msgstr "قائمة البرامج"
 
-#: ../GMenu/src/applet-init.c:65
+#: ../GMenu/src/applet-init.c:66
 msgid "Show/hide the Applications menu"
 msgstr ""
 
-#: ../GMenu/src/applet-init.c:70
+#: ../GMenu/src/applet-init.c:71
 msgid "Show/hide the quick-launch dialog"
 msgstr ""
 
-#: ../GMenu/src/applet-menu-callbacks.c:218 ../GMenu/data/messages:123
+#: ../GMenu/src/applet-menu-callbacks.c:218 ../GMenu/data/messages:121
 msgid "Logout"
 msgstr ""
 
-#: ../GMenu/src/applet-menu-callbacks.c:221 ../GMenu/data/messages:125
+#: ../GMenu/src/applet-menu-callbacks.c:221 ../GMenu/data/messages:123
 msgid "Shutdown"
 msgstr ""
 
@@ -736,23 +772,6 @@
 msgid "Global Menu"
 msgstr ""
 
-#: ../Global-Menu/src/applet-init.c:33
-msgid ""
-"This applet allows you to control the current active window:\n"
-"  close, minimize, maximize, and display the application menu.To display the "
-"menu, applications have to support this feature, which is the case on Ubuntu "
-"by default.\n"
-"You can bind a shortkey to this action."
-msgstr ""
-
-#: ../Global-Menu/src/applet-init.c:101 ../Global-Menu/src/applet-init.c:197
-msgid "Show/hide the current application menu"
-msgstr ""
-
-#: ../Global-Menu/src/applet-notifications.c:52
-msgid "The application didn't send its menu to us."
-msgstr ""
-
 #: ../Impulse/src/applet-impulse.c:170
 msgid ""
 "There is something wrong with PulseAudio.\n"
@@ -829,10 +848,10 @@
 
 #: ../Network-Monitor/src/applet-draw.c:30
 #: ../powermanager/src/powermanager-draw.c:172 ../wifi/src/applet-draw.c:31
-#: ../Clipper/data/messages:101 ../GMenu/data/messages:121
-#: ../Network-Monitor/data/messages:217 ../alsaMixer/data/messages:129
-#: ../dnd2share/data/messages:113 ../dustbin/data/messages:103
-#: ../wifi/data/messages:135 ../wifi/data/messages:185
+#: ../Clipper/data/messages:99 ../GMenu/data/messages:119
+#: ../Network-Monitor/data/messages:221 ../alsaMixer/data/messages:121
+#: ../dnd2share/data/messages:111 ../dustbin/data/messages:101
+#: ../wifi/data/messages:139 ../wifi/data/messages:189
 msgid "None"
 msgstr "لا شيء"
 
@@ -1064,7 +1083,7 @@
 msgid "Document"
 msgstr ""
 
-#: ../Recent-Events/src/applet-dialog.c:368
+#: ../Recent-Events/src/applet-dialog.c:368 ../logout/data/messages:129
 msgid "Image"
 msgstr ""
 
@@ -1100,19 +1119,19 @@
 msgid "Last access"
 msgstr ""
 
-#: ../Recent-Events/src/applet-dialog.c:495
+#: ../Recent-Events/src/applet-dialog.c:481
 msgid "You need to install the Zeitgeist data engine."
 msgstr ""
 
-#: ../Recent-Events/src/applet-dialog.c:501
+#: ../Recent-Events/src/applet-dialog.c:516
 msgid "Browse and search in recent events"
 msgstr ""
 
-#: ../Recent-Events/src/applet-init.c:28
+#: ../Recent-Events/src/applet-init.c:29
 msgid "Recent-Events"
 msgstr ""
 
-#: ../Recent-Events/src/applet-init.c:56
+#: ../Recent-Events/src/applet-init.c:58
 msgid "Show/hide the Recent Events"
 msgstr ""
 
@@ -1121,16 +1140,16 @@
 msgid "%d event(s) deleted"
 msgstr ""
 
-#: ../Recent-Events/src/applet-notifications.c:112
+#: ../Recent-Events/src/applet-notifications.c:113
 #: ../Scooby-Do/src/applet-backend-recent.c:212 ../Scooby-Do/data/messages:105
 msgid "Recent files"
 msgstr "آخر الملفات"
 
-#: ../Recent-Events/src/applet-notifications.c:160
+#: ../Recent-Events/src/applet-notifications.c:161
 msgid "Delete today's events"
 msgstr ""
 
-#: ../Recent-Events/src/applet-notifications.c:162
+#: ../Recent-Events/src/applet-notifications.c:163
 msgid "Delete all events"
 msgstr ""
 
@@ -1206,7 +1225,7 @@
 msgstr "فتح في نافذة جديدة"
 
 #: ../Scooby-Do/src/applet-backend-firefox.c:433
-#: ../dnd2share/src/applet-notifications.c:482
+#: ../dnd2share/src/applet-notifications.c:483
 msgid "Open file"
 msgstr "افتح ملفًا"
 
@@ -1293,6 +1312,31 @@
 msgid "Enter your search"
 msgstr "أدخال مادة البحث"
 
+#: ../Sound-Menu/src/applet-init.c:38
+#, fuzzy
+msgid "Sound Menu"
+msgstr "التحكم في الصوت"
+
+#: ../Sound-Menu/src/applet-init.c:41
+msgid ""
+"A menu to control the volume of each current audio sources.\n"
+"It requires the Sound service, which is available on Ubuntu by default."
+msgstr ""
+
+#: ../Sound-Menu/src/applet-init.c:91 ../alsaMixer/src/applet-init.c:118
+msgid "Show/hide the Sound menu"
+msgstr ""
+
+#: ../Sound-Menu/src/applet-notifications.c:35
+msgid ""
+"The Sound service did not reply.\n"
+"Please check that it is correctly installed."
+msgstr ""
+
+#: ../Sound-Menu/src/applet-sound.c:200 ../alsaMixer/src/applet-draw.c:64
+msgid "Volume"
+msgstr ""
+
 #: ../Status-Notifier/src/applet-init.c:33
 msgid ""
 "A <b>notification area</b> for your dock\n"
@@ -1472,80 +1516,78 @@
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:46
+#: ../alsaMixer/src/applet-mixer.c:51
 #, c-format
 msgid "I couldn't open card '%s'"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:51
+#: ../alsaMixer/src/applet-mixer.c:56
 #, c-format
 msgid "Card '%s' opened but I couldn't get any info"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:59
+#: ../alsaMixer/src/applet-mixer.c:64
 msgid "I couldn't open the mixer"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:66
+#: ../alsaMixer/src/applet-mixer.c:71
 msgid "I couldn't attach the mixer to the card"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:73
+#: ../alsaMixer/src/applet-mixer.c:78
 msgid "I couldn't register options"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:80
+#: ../alsaMixer/src/applet-mixer.c:86
 msgid "I couldn't load the mixer"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:261
+#: ../alsaMixer/src/applet-mixer.c:286
 msgid "Set up volume:"
 msgstr ""
 
-#: ../alsaMixer/src/applet-draw.c:63
-msgid "Volume"
-msgstr ""
-
 #: ../alsaMixer/src/applet-init.c:34
 msgid ""
 "This applet lets you control the sound volume from the dock.\n"
 "Scroll up/down on the icon to increase/decrease the volume.\n"
-"Click on icon to show/hide volume control (you can bind a keyboard shortcut "
-"for it)\n"
-"You can also hide the dialog by clicking on it.\n"
+"Click on icon to show/hide the volume control (you can bind a keyboard "
+"shortcut for it)\n"
 "Middle-click to set or unset to mute, double-click to raise the channels "
 "mixer.\n"
-"This applet works with the Alsa sound driver."
+"The applet can either use the Ubuntu Sound-menu or the Alsa driver."
 msgstr ""
 
-#: ../alsaMixer/src/applet-init.c:43
+#: ../alsaMixer/src/applet-init.c:42
 msgid "Sound Control"
 msgstr "التحكم في الصوت"
 
-#: ../alsaMixer/src/applet-init.c:119
-msgid "Show/hide the Sound menu"
-msgstr ""
-
-#: ../alsaMixer/src/applet-notifications.c:67
+#: ../alsaMixer/src/applet-notifications.c:80
 msgid "Adjust channels"
 msgstr ""
 
-#: ../alsaMixer/src/applet-notifications.c:67
+#: ../alsaMixer/src/applet-notifications.c:80
 msgid "double-click"
 msgstr "ضغط-مزدوج"
 
-#: ../alsaMixer/src/applet-notifications.c:71
+#: ../alsaMixer/src/applet-notifications.c:85
 msgid "Unmute"
 msgstr ""
 
-#: ../alsaMixer/src/applet-notifications.c:71
+#: ../alsaMixer/src/applet-notifications.c:85
 msgid "Mute"
 msgstr "كتم"
 
 #: ../clock/src/applet-calendar.c:193 ../clock/src/applet-calendar.c:274
 #: ../clock/src/applet-calendar.c:528 ../clock/src/applet-calendar.c:533
-#: ../clock/src/applet-task-editor.c:119 ../clock/src/applet-timer.c:88
-#: ../clock/src/applet-timer.c:176 ../clock/src/applet-timer.c:458
-#: ../clock/src/applet-timer.c:475 ../clock/src/applet-timer.c:495
+#: ../clock/src/applet-task-editor.c:119 ../clock/src/applet-timer.c:87
+#: ../clock/src/applet-timer.c:175 ../clock/src/applet-timer.c:457
+#: ../clock/src/applet-timer.c:474 ../clock/src/applet-timer.c:494
 msgid "No title"
 msgstr "لا عنوان"
 
@@ -1557,7 +1599,7 @@
 msgid "Calendar and tasks"
 msgstr "أجندة و مهام"
 
-#: ../clock/src/applet-config.c:36 ../clock/data/messages:169
+#: ../clock/src/applet-config.c:36 ../clock/data/messages:175
 msgid "Alarm"
 msgstr "منبه"
 
@@ -1641,7 +1683,7 @@
 msgid "E.g.:"
 msgstr ""
 
-#: ../clock/src/applet-config.c:495 ../weather/src/applet-config.c:207
+#: ../clock/src/applet-config.c:505 ../weather/src/applet-config.c:207
 msgid "Search for your location :"
 msgstr ""
 
@@ -1655,8 +1697,8 @@
 "2 view are available : <b>numeric</b> and <b>analogic</b>.\n"
 " Analogic view is compatible with the Cairo-Clock's themes, and you can "
 "detach the applet to be a perfect clone of Cairo-Clock.\n"
-"It displays a <b>calendar</b> on left-click, which lets you <b>manage "
-"tasks</b>.\n"
+"It displays a <b>calendar</b> on left-click, which lets you <b>manage tasks</"
+"b>.\n"
 "It also supports alarms, and allows you to setup time and date.\n"
 "Left-click to show/hide the calendar, Middle-click to stop a notification,\n"
 "Double-click on a day to edit the tasks for this day."
@@ -1723,13 +1765,13 @@
 msgstr ""
 
 #: ../clock/src/applet-task-editor.c:398 ../musicPlayer/src/applet-draw.c:153
-#: ../RSSreader/data/messages:137
+#: ../RSSreader/data/messages:135
 msgid "Title"
 msgstr ""
 
 #: ../clock/src/applet-task-editor.c:405
-#: ../dnd2share/src/applet-notifications.c:387 ../Doncky/data/messages:99
-#: ../RSSreader/data/messages:153
+#: ../dnd2share/src/applet-notifications.c:387 ../Doncky/data/messages:97
+#: ../RSSreader/data/messages:151
 msgid "Text"
 msgstr ""
 
@@ -1745,40 +1787,40 @@
 msgid "Tags"
 msgstr ""
 
-#: ../clock/src/applet-timer.c:59
+#: ../clock/src/applet-timer.c:58
 msgid "1mn"
 msgstr ""
 
-#: ../clock/src/applet-timer.c:64
+#: ../clock/src/applet-timer.c:63
 msgid "1h"
 msgstr ""
 
-#: ../clock/src/applet-timer.c:87
+#: ../clock/src/applet-timer.c:86
 msgid "The following task was scheduled at"
 msgstr ""
 
-#: ../clock/src/applet-timer.c:90 ../clock/src/applet-timer.c:460
-#: ../clock/src/applet-timer.c:497
+#: ../clock/src/applet-timer.c:89 ../clock/src/applet-timer.c:459
+#: ../clock/src/applet-timer.c:496
 msgid "Repeat this message every:"
 msgstr ""
 
-#: ../clock/src/applet-timer.c:174
+#: ../clock/src/applet-timer.c:173
 msgid "The following task has felt due:"
 msgstr ""
 
-#: ../clock/src/applet-timer.c:457
+#: ../clock/src/applet-timer.c:456
 msgid "It's time for the following task:"
 msgstr ""
 
-#: ../clock/src/applet-timer.c:474
+#: ../clock/src/applet-timer.c:473
 msgid "This task will begin in 15 minutes:"
 msgstr ""
 
-#: ../clock/src/applet-timer.c:494
+#: ../clock/src/applet-timer.c:493
 msgid "Today is the following anniversary:"
 msgstr ""
 
-#: ../clock/src/applet-timer.c:494
+#: ../clock/src/applet-timer.c:493
 msgid "Tomorrow is the following anniversary:"
 msgstr ""
 
@@ -1811,7 +1853,7 @@
 msgstr ""
 
 #: ../desklet-rendering/src/rendering-desklet-decorations.c:105
-#: ../slider/data/messages:133
+#: ../slider/data/messages:137
 msgid "none"
 msgstr ""
 
@@ -1851,8 +1893,7 @@
 msgstr ""
 
 #: ../dnd2share/src/applet-dnd2share.c:331
-msgid ""
-"Please wait for the current upload to finish before starting a new one."
+msgid "Please wait for the current upload to finish before starting a new one."
 msgstr ""
 
 #: ../dnd2share/src/applet-dnd2share.c:591
@@ -1941,19 +1982,19 @@
 msgid "History"
 msgstr ""
 
-#: ../dnd2share/src/applet-notifications.c:484
+#: ../dnd2share/src/applet-notifications.c:485
 msgid "Get text"
 msgstr ""
 
-#: ../dnd2share/src/applet-notifications.c:486
+#: ../dnd2share/src/applet-notifications.c:487
 msgid "Remove from history"
 msgstr ""
 
-#: ../dnd2share/src/applet-notifications.c:489
+#: ../dnd2share/src/applet-notifications.c:490
 msgid "Clear History"
 msgstr ""
 
-#: ../dnd2share/src/applet-notifications.c:494
+#: ../dnd2share/src/applet-notifications.c:495
 msgid "Use only a files hosting site"
 msgstr ""
 
@@ -1966,18 +2007,18 @@
 msgstr ""
 
 #: ../dock-rendering/src/rendering-init.c:36
-#: ../dock-rendering/data/messages:85
+#: ../dock-rendering/data/messages:87
 msgid "Parabolic"
 msgstr ""
 
 #: ../dock-rendering/src/rendering-init.c:37
-#: ../dock-rendering/data/messages:109
+#: ../dock-rendering/data/messages:111
 msgid "Rainbow"
 msgstr ""
 
 #: ../dock-rendering/src/rendering-init.c:39
-#: ../dock-rendering/data/messages:27 ../shortcuts/data/messages:113
-#: ../stack/data/messages:105
+#: ../dock-rendering/data/messages:29 ../shortcuts/data/messages:111
+#: ../stack/data/messages:103
 msgid "Slide"
 msgstr ""
 
@@ -2084,37 +2125,37 @@
 
 #: ../icon-effect/src/applet-init.c:101 ../icon-effect/data/messages:7
 #: ../icon-effect/data/messages:23 ../icon-effect/data/messages:39
-#: ../icon-effect/data/messages:55 ../icon-effect/data/messages:71
+#: ../icon-effect/data/messages:55
 msgid "Fire"
 msgstr ""
 
 #: ../icon-effect/src/applet-init.c:104 ../icon-effect/data/messages:9
 #: ../icon-effect/data/messages:25 ../icon-effect/data/messages:41
-#: ../icon-effect/data/messages:57 ../icon-effect/data/messages:99
+#: ../icon-effect/data/messages:83
 msgid "Stars"
 msgstr ""
 
 #: ../icon-effect/src/applet-init.c:107 ../icon-effect/data/messages:11
 #: ../icon-effect/data/messages:27 ../icon-effect/data/messages:43
-#: ../icon-effect/data/messages:59 ../icon-effect/data/messages:143
+#: ../icon-effect/data/messages:127
 msgid "Rain"
 msgstr ""
 
 #: ../icon-effect/src/applet-init.c:110 ../icon-effect/data/messages:13
 #: ../icon-effect/data/messages:29 ../icon-effect/data/messages:45
-#: ../icon-effect/data/messages:61 ../icon-effect/data/messages:121
+#: ../icon-effect/data/messages:105
 msgid "Snow"
 msgstr ""
 
 #: ../icon-effect/src/applet-init.c:113 ../icon-effect/data/messages:15
 #: ../icon-effect/data/messages:31 ../icon-effect/data/messages:47
-#: ../icon-effect/data/messages:63 ../icon-effect/data/messages:165
+#: ../icon-effect/data/messages:149
 msgid "Storm"
 msgstr ""
 
 #: ../icon-effect/src/applet-init.c:116 ../icon-effect/data/messages:17
 #: ../icon-effect/data/messages:33 ../icon-effect/data/messages:49
-#: ../icon-effect/data/messages:65 ../icon-effect/data/messages:185
+#: ../icon-effect/data/messages:169
 msgid "Firework"
 msgstr ""
 
@@ -2158,89 +2199,89 @@
 "You can bind a <b>shortcut</b> to it, and also to lock the screen."
 msgstr ""
 
-#: ../logout/src/applet-init.c:38 ../logout/src/applet-logout.c:226
-#: ../logout/data/messages:99 ../logout/data/messages:107
+#: ../logout/src/applet-init.c:38 ../logout/src/applet-logout.c:228
+#: ../logout/data/messages:97
 msgid "Log out"
 msgstr ""
 
-#: ../logout/src/applet-init.c:65
+#: ../logout/src/applet-init.c:67
 msgid "Lock the screen"
 msgstr ""
 
-#: ../logout/src/applet-init.c:69
+#: ../logout/src/applet-init.c:71
 msgid "Show the log-out menu"
 msgstr ""
 
-#: ../logout/src/applet-logout.c:198 ../logout/data/messages:101
-#: ../logout/data/messages:109
+#: ../logout/src/applet-logout.c:200 ../logout/data/messages:99
 msgid "Shut down"
 msgstr ""
 
-#: ../logout/src/applet-logout.c:204
+#: ../logout/src/applet-logout.c:206
 msgid "Restart"
 msgstr ""
 
-#: ../logout/src/applet-logout.c:210
-#: ../powermanager/src/powermanager-menu-functions.c:93
+#: ../logout/src/applet-logout.c:212
+#: ../powermanager/src/powermanager-menu-functions.c:97
+#: ../powermanager/src/powermanager-menu-functions.c:105
 msgid "Hibernate"
 msgstr ""
 
-#: ../logout/src/applet-logout.c:212
+#: ../logout/src/applet-logout.c:214
 msgid "Your computer will not consume any energy."
 msgstr ""
 
-#: ../logout/src/applet-logout.c:217
-#: ../powermanager/src/powermanager-menu-functions.c:95
+#: ../logout/src/applet-logout.c:219
+#: ../powermanager/src/powermanager-menu-functions.c:100
+#: ../powermanager/src/powermanager-menu-functions.c:107
 msgid "Suspend"
 msgstr ""
 
-#: ../logout/src/applet-logout.c:219
+#: ../logout/src/applet-logout.c:221
 msgid "Your computer will still consume a small amount of energy."
 msgstr ""
 
-#: ../logout/src/applet-logout.c:228
+#: ../logout/src/applet-logout.c:230
 msgid "Close your session and allow to open a new one."
 msgstr ""
 
-#: ../logout/src/applet-logout.c:239
+#: ../logout/src/applet-logout.c:241
 msgid "Switch user"
 msgstr ""
 
-#: ../logout/src/applet-logout.c:258
+#: ../logout/src/applet-logout.c:262
 msgid "Guest session"
 msgstr ""
 
-#: ../logout/src/applet-logout.c:265 ../logout/data/messages:103
-#: ../logout/data/messages:111
+#: ../logout/src/applet-logout.c:269 ../logout/data/messages:101
 msgid "Lock screen"
 msgstr ""
 
-#: ../logout/src/applet-logout.c:270
+#: ../logout/src/applet-logout.c:274
 msgid "Program an automatic shut-down"
 msgstr ""
 
-#: ../logout/src/applet-logout.c:321
+#: ../logout/src/applet-logout.c:325
 msgid "Your computer will shut-down in 1 minute."
 msgstr ""
 
-#: ../logout/src/applet-logout.c:345
+#: ../logout/src/applet-logout.c:349
 msgid "Choose in how many minutes your PC will stop:"
 msgstr ""
 
-#: ../logout/src/applet-logout.c:512
+#: ../logout/src/applet-logout.c:523
 #, c-format
 msgid "It will automatically shut-down in %ds"
 msgstr ""
 
-#: ../logout/src/applet-logout.c:513
+#: ../logout/src/applet-logout.c:524
 msgid "Shut down the computer?"
 msgstr ""
 
-#: ../logout/src/applet-logout.c:573
+#: ../logout/src/applet-logout.c:584
 msgid "Restart the computer?"
 msgstr ""
 
-#: ../logout/src/applet-logout.c:610
+#: ../logout/src/applet-logout.c:621
 msgid "Close the current session?"
 msgstr ""
 
@@ -2293,14 +2334,14 @@
 msgid "Use a secure connection (SSL)"
 msgstr ""
 
-#: ../mail/src/cd-mail-applet-accounts.c:39 ../RSSreader/data/messages:111
-#: ../netspeed/data/messages:143 ../powermanager/data/messages:157
-#: ../weather/data/messages:109
+#: ../mail/src/cd-mail-applet-accounts.c:39 ../RSSreader/data/messages:109
+#: ../netspeed/data/messages:151 ../powermanager/data/messages:161
+#: ../weather/data/messages:117
 msgid "Refresh time:"
 msgstr ""
 
-#: ../mail/src/cd-mail-applet-accounts.c:39 ../RSSreader/data/messages:109
-#: ../weather/data/messages:107
+#: ../mail/src/cd-mail-applet-accounts.c:39 ../RSSreader/data/messages:107
+#: ../weather/data/messages:115
 msgid "In minutes."
 msgstr ""
 
@@ -2509,67 +2550,67 @@
 "offer such service."
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:173
+#: ../musicPlayer/src/applet-notifications.c:175
 msgid "Choose a music player to control"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:260
+#: ../musicPlayer/src/applet-notifications.c:262
 msgid "Find opened player"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:264
+#: ../musicPlayer/src/applet-notifications.c:266
 msgid "Choose a player"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:270
+#: ../musicPlayer/src/applet-notifications.c:272
 msgid "Previous"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:270
+#: ../musicPlayer/src/applet-notifications.c:272
 msgid "scroll-up"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:276
+#: ../musicPlayer/src/applet-notifications.c:278
 msgid "Play/Pause"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:276
+#: ../musicPlayer/src/applet-notifications.c:278
 msgid "left-click"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:282
+#: ../musicPlayer/src/applet-notifications.c:284
 msgid "Next"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:282
+#: ../musicPlayer/src/applet-notifications.c:284
 msgid "scroll-down"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:287
+#: ../musicPlayer/src/applet-notifications.c:289
 msgid "Stop"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:291
+#: ../musicPlayer/src/applet-notifications.c:293
 msgid "Information"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:294
+#: ../musicPlayer/src/applet-notifications.c:296
 msgid "Show the Window"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:299
+#: ../musicPlayer/src/applet-notifications.c:301
 msgid "Show JumpBox"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:301
+#: ../musicPlayer/src/applet-notifications.c:303
 msgid "Toggle Shuffle"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:303
+#: ../musicPlayer/src/applet-notifications.c:305
 msgid "Toggle Repeat"
 msgstr ""
 
-#: ../musicPlayer/src/applet-notifications.c:305
+#: ../musicPlayer/src/applet-notifications.c:307
 msgid "Rate this song"
 msgstr ""
 
@@ -2690,11 +2731,11 @@
 "<b>Right-click</b> on the icon to hibernate or suspend the system."
 msgstr ""
 
-#: ../powermanager/src/powermanager-menu-functions.c:70
+#: ../powermanager/src/powermanager-menu-functions.c:71
 msgid "Set up power management"
 msgstr ""
 
-#: ../powermanager/src/powermanager-menu-functions.c:86
+#: ../powermanager/src/powermanager-menu-functions.c:88
 msgid "Power statistics"
 msgstr ""
 
@@ -2824,8 +2865,8 @@
 
 #: ../show-mouse/src/applet-init.c:31
 msgid ""
-"This plugin draws some animations around the cursor when it's inside a "
-"dock/desklet."
+"This plugin draws some animations around the cursor when it's inside a dock/"
+"desklet."
 msgstr ""
 
 #: ../showDesktop/src/applet-init.c:28
@@ -2859,22 +2900,26 @@
 "Middle-click to open the images folder."
 msgstr ""
 
-#: ../slider/src/applet-notifications.c:219
+#: ../slider/src/applet-notifications.c:215
 msgid "Play"
 msgstr ""
 
-#: ../slider/src/applet-notifications.c:219
+#: ../slider/src/applet-notifications.c:215
 msgid "Pause"
 msgstr ""
 
-#: ../slider/src/applet-notifications.c:227
-#: ../slider/src/applet-notifications.c:229
+#: ../slider/src/applet-notifications.c:223
+#: ../slider/src/applet-notifications.c:225
 msgid "Open current image"
 msgstr ""
 
-#: ../slider/src/applet-notifications.c:268
+#: ../slider/src/applet-notifications.c:265
+#: ../slider/src/applet-notifications.c:267
+msgid "Browse images folder"
+msgstr ""
+
 #: ../slider/src/applet-notifications.c:270
-msgid "Browse images folder"
+msgid "Refresh images list"
 msgstr ""
 
 #: ../stack/src/applet-init.c:31
@@ -2944,13 +2989,13 @@
 msgid "The URL has been added to the stack."
 msgstr ""
 
-#: ../switcher/src/applet-draw.c:590 ../switcher/src/applet-draw.c:597
+#: ../switcher/src/applet-draw.c:595 ../switcher/src/applet-draw.c:602
 #: ../switcher/src/applet-load-icons.c:53
 #: ../switcher/src/applet-notifications.c:415
 msgid "Current"
 msgstr ""
 
-#: ../switcher/src/applet-draw.c:597 ../switcher/src/applet-draw.c:599
+#: ../switcher/src/applet-draw.c:602 ../switcher/src/applet-draw.c:604
 #: ../switcher/src/applet-load-icons.c:59
 #: ../switcher/src/applet-notifications.c:216
 #: ../switcher/src/applet-notifications.c:228
@@ -3071,7 +3116,7 @@
 msgid "Close current Tab"
 msgstr ""
 
-#: ../terminal/src/terminal-widget.c:56 ../terminal/data/messages:109
+#: ../terminal/src/terminal-widget.c:56 ../terminal/data/messages:107
 msgid "Terminal"
 msgstr ""
 
@@ -3379,7 +3424,6 @@
 msgstr ""
 
 #: ../Animated-icons/data/messages:41 ../Animated-icons/data/messages:61
-#: ../Animated-icons/data/messages:81
 msgid "Number of times the animation will play:"
 msgstr ""
 
@@ -3391,230 +3435,229 @@
 msgid "Effects used on applications:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:63 ../icon-effect/data/messages:51
-msgid "when clicking on an applet"
-msgstr ""
-
-#: ../Animated-icons/data/messages:65 ../icon-effect/data/messages:53
-msgid "Effects used on applets:"
-msgstr ""
-
-#: ../Animated-icons/data/messages:83
+#: ../Animated-icons/data/messages:63
 msgid "Rotation"
 msgstr ""
 
-#: ../Animated-icons/data/messages:85 ../Animated-icons/data/messages:103
-#: ../Animated-icons/data/messages:155 ../Animated-icons/data/messages:167
-#: ../Animated-icons/data/messages:179 ../Animated-icons/data/messages:193
-#: ../Remote-Control/data/messages:7 ../Scooby-Do/data/messages:15
-#: ../Scooby-Do/data/messages:19 ../Toons/data/messages:101
-#: ../icon-effect/data/messages:101 ../icon-effect/data/messages:123
-#: ../icon-effect/data/messages:145 ../icon-effect/data/messages:167
-#: ../icon-effect/data/messages:187 ../show-mouse/data/messages:19
+#: ../Animated-icons/data/messages:65 ../Animated-icons/data/messages:83
+#: ../Animated-icons/data/messages:135 ../Animated-icons/data/messages:147
+#: ../Animated-icons/data/messages:159 ../Animated-icons/data/messages:173
+#: ../Remote-Control/data/messages:9 ../Scooby-Do/data/messages:15
+#: ../Scooby-Do/data/messages:19 ../Toons/data/messages:105
+#: ../icon-effect/data/messages:85 ../icon-effect/data/messages:107
+#: ../icon-effect/data/messages:129 ../icon-effect/data/messages:151
+#: ../icon-effect/data/messages:171 ../show-mouse/data/messages:19
 msgid "In ms."
 msgstr ""
 
-#: ../Animated-icons/data/messages:87 ../Animated-icons/data/messages:105
-#: ../Animated-icons/data/messages:157 ../icon-effect/data/messages:75
-#: ../icon-effect/data/messages:103 ../icon-effect/data/messages:125
-#: ../icon-effect/data/messages:147 ../icon-effect/data/messages:169
-#: ../icon-effect/data/messages:189 ../illusion/data/messages:33
+#: ../Animated-icons/data/messages:67 ../Animated-icons/data/messages:85
+#: ../Animated-icons/data/messages:137 ../icon-effect/data/messages:59
+#: ../icon-effect/data/messages:87 ../icon-effect/data/messages:109
+#: ../icon-effect/data/messages:131 ../icon-effect/data/messages:153
+#: ../icon-effect/data/messages:173 ../illusion/data/messages:33
 #: ../illusion/data/messages:55 ../illusion/data/messages:59
 #: ../illusion/data/messages:69 ../illusion/data/messages:75
-#: ../mail/data/messages:135
+#: ../mail/data/messages:143
 msgid "Duration of the animation:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:89 ../Animated-icons/data/messages:107
-#: ../Animated-icons/data/messages:159 ../Animated-icons/data/messages:171
-#: ../Animated-icons/data/messages:183 ../Animated-icons/data/messages:197
-#: ../icon-effect/data/messages:77 ../icon-effect/data/messages:105
-#: ../icon-effect/data/messages:127 ../icon-effect/data/messages:149
-#: ../icon-effect/data/messages:171 ../icon-effect/data/messages:191
+#: ../Animated-icons/data/messages:69 ../Animated-icons/data/messages:87
+#: ../Animated-icons/data/messages:139 ../Animated-icons/data/messages:151
+#: ../Animated-icons/data/messages:163 ../Animated-icons/data/messages:177
+#: ../icon-effect/data/messages:61 ../icon-effect/data/messages:89
+#: ../icon-effect/data/messages:111 ../icon-effect/data/messages:133
+#: ../icon-effect/data/messages:155 ../icon-effect/data/messages:175
 msgid "Repeat while icon is pointed to?"
 msgstr ""
 
-#: ../Animated-icons/data/messages:91
+#: ../Animated-icons/data/messages:71
 msgid "Type of mesh:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:93 ../Clipper/data/messages:47
-#: ../Composite-Manager/data/messages:43 ../Disks/data/messages:29
-#: ../Doncky/data/messages:45 ../Folders/data/messages:59
-#: ../GMenu/data/messages:47 ../Global-Menu/data/messages:47
-#: ../Impulse/data/messages:45 ../MeMenu/data/messages:41
-#: ../Messaging-Menu/data/messages:43 ../Network-Monitor/data/messages:49
-#: ../RSSreader/data/messages:49 ../Recent-Events/data/messages:47
-#: ../Status-Notifier/data/messages:47 ../System-Monitor/data/messages:47
-#: ../Toons/data/messages:47 ../Xgamma/data/messages:49
-#: ../alsaMixer/data/messages:45 ../clock/data/messages:49
-#: ../dnd2share/data/messages:43 ../dustbin/data/messages:43
-#: ../keyboard-indicator/data/messages:43 ../logout/data/messages:47
-#: ../mail/data/messages:43 ../musicPlayer/data/messages:45
-#: ../netspeed/data/messages:43 ../powermanager/data/messages:49
-#: ../quick-browser/data/messages:49 ../shortcuts/data/messages:47
-#: ../showDesktop/data/messages:51 ../slider/data/messages:47
-#: ../stack/data/messages:49 ../switcher/data/messages:39
-#: ../systray/data/messages:39 ../template/data/messages:47
-#: ../terminal/data/messages:47 ../tomboy/data/messages:57
-#: ../weather/data/messages:45 ../weblets/data/messages:47
-#: ../wifi/data/messages:47
+#: ../Animated-icons/data/messages:73 ../Application-Menu/data/messages:39
+#: ../Application-Menu/data/messages:151 ../Application-Menu/data/messages:241
+#: ../Clipper/data/messages:45 ../Composite-Manager/data/messages:41
+#: ../Disks/data/messages:27 ../Doncky/data/messages:43
+#: ../Folders/data/messages:57 ../GMenu/data/messages:45
+#: ../Global-Menu/data/messages:39 ../Impulse/data/messages:43
+#: ../MeMenu/data/messages:39 ../Messaging-Menu/data/messages:51
+#: ../Network-Monitor/data/messages:53 ../RSSreader/data/messages:47
+#: ../Recent-Events/data/messages:45 ../Sound-Menu/data/messages:41
+#: ../Sound-Menu/data/messages:131 ../Status-Notifier/data/messages:55
+#: ../System-Monitor/data/messages:51 ../Toons/data/messages:51
+#: ../Xgamma/data/messages:47 ../alsaMixer/data/messages:53
+#: ../clock/data/messages:53 ../dnd2share/data/messages:41
+#: ../dustbin/data/messages:41 ../keyboard-indicator/data/messages:51
+#: ../logout/data/messages:45 ../mail/data/messages:51
+#: ../musicPlayer/data/messages:53 ../netspeed/data/messages:51
+#: ../powermanager/data/messages:53 ../quick-browser/data/messages:47
+#: ../shortcuts/data/messages:45 ../showDesktop/data/messages:49
+#: ../slider/data/messages:51 ../stack/data/messages:47
+#: ../switcher/data/messages:39 ../systray/data/messages:37
+#: ../template/data/messages:45 ../terminal/data/messages:45
+#: ../tomboy/data/messages:55 ../weather/data/messages:53
+#: ../weblets/data/messages:45 ../wifi/data/messages:51
 msgid "Normal"
 msgstr ""
 
-#: ../Animated-icons/data/messages:95
+#: ../Animated-icons/data/messages:75
 msgid "Cube"
 msgstr ""
 
-#: ../Animated-icons/data/messages:97
+#: ../Animated-icons/data/messages:77
 msgid "Capsule"
 msgstr ""
 
-#: ../Animated-icons/data/messages:99
+#: ../Animated-icons/data/messages:79
 msgid "Colour of the sheen:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:111 ../Animated-icons/data/messages:115
-#: ../Clipper/data/messages:9 ../Composite-Manager/data/messages:93
-#: ../Composite-Manager/data/messages:97 ../Doncky/data/messages:9
-#: ../Doncky/data/messages:93 ../Folders/data/messages:21
-#: ../GMenu/data/messages:9 ../GMenu/data/messages:101
-#: ../Global-Menu/data/messages:9 ../Impulse/data/messages:7
-#: ../Impulse/data/messages:127 ../Impulse/data/messages:131
-#: ../Impulse/data/messages:135 ../RSSreader/data/messages:11
-#: ../RSSreader/data/messages:131 ../Recent-Events/data/messages:9
-#: ../System-Monitor/data/messages:183 ../System-Monitor/data/messages:191
-#: ../Xgamma/data/messages:11 ../alsaMixer/data/messages:139
-#: ../alsaMixer/data/messages:143 ../alsaMixer/data/messages:157
-#: ../dnd2share/data/messages:9 ../logout/data/messages:9
-#: ../quick-browser/data/messages:11 ../shortcuts/data/messages:9
-#: ../showDesktop/data/messages:9 ../stack/data/messages:11
-#: ../switcher/data/messages:9 ../switcher/data/messages:145
-#: ../systray/data/messages:9 ../template/data/messages:9
-#: ../terminal/data/messages:9 ../weblets/data/messages:9
+#: ../Animated-icons/data/messages:91 ../Animated-icons/data/messages:95
+#: ../Application-Menu/data/messages:307 ../Application-Menu/data/messages:311
+#: ../Clipper/data/messages:9 ../Composite-Manager/data/messages:91
+#: ../Composite-Manager/data/messages:95 ../Doncky/data/messages:9
+#: ../Doncky/data/messages:91 ../Folders/data/messages:21
+#: ../GMenu/data/messages:9 ../GMenu/data/messages:99
+#: ../Impulse/data/messages:7 ../Impulse/data/messages:125
+#: ../Impulse/data/messages:129 ../Impulse/data/messages:133
+#: ../RSSreader/data/messages:11 ../RSSreader/data/messages:129
+#: ../Recent-Events/data/messages:9 ../Sound-Menu/data/messages:197
+#: ../Sound-Menu/data/messages:201 ../System-Monitor/data/messages:187
+#: ../System-Monitor/data/messages:195 ../Xgamma/data/messages:11
+#: ../alsaMixer/data/messages:131 ../alsaMixer/data/messages:135
+#: ../alsaMixer/data/messages:149 ../dnd2share/data/messages:9
+#: ../logout/data/messages:9 ../quick-browser/data/messages:11
+#: ../shortcuts/data/messages:9 ../showDesktop/data/messages:9
+#: ../stack/data/messages:11 ../switcher/data/messages:9
+#: ../switcher/data/messages:151 ../systray/data/messages:9
+#: ../template/data/messages:9 ../terminal/data/messages:9
+#: ../weblets/data/messages:9
 msgid "Leave empty to use the default one."
 msgstr ""
 
-#: ../Animated-icons/data/messages:113
+#: ../Animated-icons/data/messages:93
 msgid "Image for the spotlight:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:117
+#: ../Animated-icons/data/messages:97
 msgid "Image for the front spotlight:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:119
+#: ../Animated-icons/data/messages:99
 msgid "Spot colour:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:121
+#: ../Animated-icons/data/messages:101
 msgid "Halo colour:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:123
+#: ../Animated-icons/data/messages:103
 msgid "Rays"
 msgstr ""
 
-#: ../Animated-icons/data/messages:125 ../icon-effect/data/messages:81
-#: ../icon-effect/data/messages:109 ../icon-effect/data/messages:131
-#: ../icon-effect/data/messages:153 ../icon-effect/data/messages:175
+#: ../Animated-icons/data/messages:105 ../icon-effect/data/messages:65
+#: ../icon-effect/data/messages:93 ../icon-effect/data/messages:115
+#: ../icon-effect/data/messages:137 ../icon-effect/data/messages:159
 #: ../illusion/data/messages:37 ../show-mouse/data/messages:27
 msgid "1st color of gradation :"
 msgstr ""
 
-#: ../Animated-icons/data/messages:127 ../icon-effect/data/messages:83
-#: ../icon-effect/data/messages:111 ../icon-effect/data/messages:133
-#: ../icon-effect/data/messages:155 ../icon-effect/data/messages:177
+#: ../Animated-icons/data/messages:107 ../icon-effect/data/messages:67
+#: ../icon-effect/data/messages:95 ../icon-effect/data/messages:117
+#: ../icon-effect/data/messages:139 ../icon-effect/data/messages:161
 #: ../illusion/data/messages:39 ../show-mouse/data/messages:29
 msgid "2nd color of gradation :"
 msgstr ""
 
-#: ../Animated-icons/data/messages:129 ../icon-effect/data/messages:85
-#: ../icon-effect/data/messages:113 ../icon-effect/data/messages:197
+#: ../Animated-icons/data/messages:109 ../icon-effect/data/messages:69
+#: ../icon-effect/data/messages:97 ../icon-effect/data/messages:181
 #: ../illusion/data/messages:41 ../show-mouse/data/messages:31
 msgid "Random colours?"
 msgstr ""
 
-#: ../Animated-icons/data/messages:131
+#: ../Animated-icons/data/messages:111
 msgid "Number of rays:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:133
+#: ../Animated-icons/data/messages:113
 msgid "Ray size:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:135
+#: ../Animated-icons/data/messages:115
 msgid "Ray speed:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:139
+#: ../Animated-icons/data/messages:119
 msgid "Initial stretch:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:141
+#: ../Animated-icons/data/messages:121
 msgid "Horizontal stretch"
 msgstr ""
 
-#: ../Animated-icons/data/messages:143
+#: ../Animated-icons/data/messages:123
 msgid "Vertical stretch"
 msgstr ""
 
-#: ../Animated-icons/data/messages:145
+#: ../Animated-icons/data/messages:125
 msgid "Corner stretch"
 msgstr ""
 
-#: ../Animated-icons/data/messages:147
+#: ../Animated-icons/data/messages:127
 msgid "Spring constant:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:149
+#: ../Animated-icons/data/messages:129
 msgid "Friction:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:151
+#: ../Animated-icons/data/messages:131
 msgid "Number of points on the grid in each direction:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:161
+#: ../Animated-icons/data/messages:141
 msgid "Wave width:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:163
+#: ../Animated-icons/data/messages:143
 msgid "Wave amplitude:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:169
+#: ../Animated-icons/data/messages:149
 msgid "Pulse duration:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:173
+#: ../Animated-icons/data/messages:153
 msgid "Pulse max zoom:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:175
+#: ../Animated-icons/data/messages:155
 msgid "Pulse follows icon shape?"
 msgstr ""
 
-#: ../Animated-icons/data/messages:181
+#: ../Animated-icons/data/messages:161
 msgid "Bounce duration:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:185
+#: ../Animated-icons/data/messages:165
 msgid "When bouncing, resize the icon by:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:187
+#: ../Animated-icons/data/messages:167
 msgid "the lower the value, the more it will flatten."
 msgstr ""
 
-#: ../Animated-icons/data/messages:189
+#: ../Animated-icons/data/messages:169
 msgid "How much the icon will flatten when hitting the ground:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:195
+#: ../Animated-icons/data/messages:175
 msgid "Blink duration:"
 msgstr ""
 
+#: ../Application-Menu/data/messages:1 ../Application-Menu/data/messages:3
+#: ../Application-Menu/data/messages:111 ../Application-Menu/data/messages:113
+#: ../Application-Menu/data/messages:201 ../Application-Menu/data/messages:203
 #: ../Cairo-Penguin/data/messages:1 ../Cairo-Penguin/data/messages:3
 #: ../Clipper/data/messages:1 ../Clipper/data/messages:3
 #: ../Composite-Manager/data/messages:1 ../Composite-Manager/data/messages:3
@@ -3628,7 +3671,9 @@
 #: ../Messaging-Menu/data/messages:3 ../Network-Monitor/data/messages:1
 #: ../Network-Monitor/data/messages:3 ../RSSreader/data/messages:1
 #: ../RSSreader/data/messages:3 ../Recent-Events/data/messages:1
-#: ../Recent-Events/data/messages:3 ../Status-Notifier/data/messages:1
+#: ../Recent-Events/data/messages:3 ../Sound-Menu/data/messages:1
+#: ../Sound-Menu/data/messages:3 ../Sound-Menu/data/messages:91
+#: ../Sound-Menu/data/messages:93 ../Status-Notifier/data/messages:1
 #: ../Status-Notifier/data/messages:3 ../System-Monitor/data/messages:1
 #: ../System-Monitor/data/messages:3 ../Toons/data/messages:1
 #: ../Toons/data/messages:3 ../Xgamma/data/messages:1
@@ -3658,1226 +3703,1454 @@
 msgid "Icon"
 msgstr ""
 
-#: ../Cairo-Penguin/data/messages:5 ../Clipper/data/messages:5
-#: ../Composite-Manager/data/messages:5 ../Doncky/data/messages:5
-#: ../Folders/data/messages:5 ../GMenu/data/messages:5
-#: ../Global-Menu/data/messages:5 ../Impulse/data/messages:5
-#: ../MeMenu/data/messages:5 ../Messaging-Menu/data/messages:5
-#: ../Network-Monitor/data/messages:5 ../RSSreader/data/messages:5
-#: ../Recent-Events/data/messages:5 ../Status-Notifier/data/messages:5
-#: ../System-Monitor/data/messages:5 ../Toons/data/messages:5
-#: ../Xgamma/data/messages:5 ../alsaMixer/data/messages:5
-#: ../clock/data/messages:5 ../dnd2share/data/messages:5
-#: ../dustbin/data/messages:5 ../keyboard-indicator/data/messages:5
-#: ../logout/data/messages:5 ../mail/data/messages:5
-#: ../musicPlayer/data/messages:5 ../netspeed/data/messages:5
-#: ../powermanager/data/messages:5 ../quick-browser/data/messages:5
-#: ../shortcuts/data/messages:5 ../showDesktop/data/messages:5
-#: ../slider/data/messages:5 ../stack/data/messages:5
-#: ../switcher/data/messages:5 ../systray/data/messages:5
-#: ../template/data/messages:5 ../terminal/data/messages:5
-#: ../tomboy/data/messages:5 ../weather/data/messages:5
-#: ../weblets/data/messages:5 ../wifi/data/messages:5
+#: ../Application-Menu/data/messages:5 ../Application-Menu/data/messages:115
+#: ../Application-Menu/data/messages:205 ../Cairo-Penguin/data/messages:5
+#: ../Clipper/data/messages:5 ../Composite-Manager/data/messages:5
+#: ../Doncky/data/messages:5 ../Folders/data/messages:5
+#: ../GMenu/data/messages:5 ../Global-Menu/data/messages:5
+#: ../Impulse/data/messages:5 ../MeMenu/data/messages:5
+#: ../Messaging-Menu/data/messages:5 ../Network-Monitor/data/messages:5
+#: ../RSSreader/data/messages:5 ../Recent-Events/data/messages:5
+#: ../Sound-Menu/data/messages:5 ../Sound-Menu/data/messages:95
+#: ../Status-Notifier/data/messages:5 ../System-Monitor/data/messages:5
+#: ../Toons/data/messages:5 ../Xgamma/data/messages:5
+#: ../alsaMixer/data/messages:5 ../clock/data/messages:5
+#: ../dnd2share/data/messages:5 ../dustbin/data/messages:5
+#: ../keyboard-indicator/data/messages:5 ../logout/data/messages:5
+#: ../mail/data/messages:5 ../musicPlayer/data/messages:5
+#: ../netspeed/data/messages:5 ../powermanager/data/messages:5
+#: ../quick-browser/data/messages:5 ../shortcuts/data/messages:5
+#: ../showDesktop/data/messages:5 ../slider/data/messages:5
+#: ../stack/data/messages:5 ../switcher/data/messages:5
+#: ../systray/data/messages:5 ../template/data/messages:5
+#: ../terminal/data/messages:5 ../tomboy/data/messages:5
+#: ../weather/data/messages:5 ../weblets/data/messages:5
+#: ../wifi/data/messages:5
 msgid "Name of the dock it belongs to:"
 msgstr ""
 
-#: ../Cairo-Penguin/data/messages:7 ../Clipper/data/messages:7
-#: ../Composite-Manager/data/messages:7 ../Disks/data/messages:7
-#: ../Doncky/data/messages:7 ../Folders/data/messages:9
-#: ../GMenu/data/messages:7 ../Global-Menu/data/messages:7
-#: ../Messaging-Menu/data/messages:7 ../Network-Monitor/data/messages:9
-#: ../RSSreader/data/messages:9 ../Recent-Events/data/messages:7
-#: ../System-Monitor/data/messages:7 ../Toons/data/messages:7
-#: ../Xgamma/data/messages:9 ../alsaMixer/data/messages:9
-#: ../clock/data/messages:9 ../dnd2share/data/messages:7
-#: ../dustbin/data/messages:7 ../keyboard-indicator/data/messages:7
-#: ../logout/data/messages:7 ../mail/data/messages:7
-#: ../musicPlayer/data/messages:9 ../netspeed/data/messages:7
-#: ../quick-browser/data/messages:9 ../shortcuts/data/messages:7
-#: ../showDesktop/data/messages:7 ../slider/data/messages:7
-#: ../stack/data/messages:9 ../switcher/data/messages:7
-#: ../template/data/messages:7 ../weather/data/messages:9
-#: ../weblets/data/messages:7 ../wifi/data/messages:7