Merge lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.4.0-0beta2 into lp:ubuntu/oneiric/cairo-dock-plug-ins

[Matthieu Baerts]

Hello,

The Cairo-Dock team proposes a new version of its Cairo-Dock package.

This is the Upstream (short) ChangeLog:
 * Upstream (short) ChangeLog:
   - A new Help applet has been added to help our beloved user.
   - Improved integration in the XFCE and LXDE desktop.
   - Improved the classifying of our files in the source code
      and in share/cairo-dock directory.
   - Launchers and applications now uses the linked .desktop file.
   - Fixed a few bugs as usual

Please note that this new version fixes also this bug #811579 (Cairo-Dock Plug-Ins needs to be recompiled to fix a dependency issues).
**We are currently not able to install cairo-dock-plug-ins packages due to this problem.**

This branch should be ready to be pushed on lp:ubuntu/cairo-dock-plug-ins (except the UNRELEASED version in debian/changelog)

Please upload this version before the FF.

Thank you for your help

PS: Don't forget to upload these plug-ins AND Cairo-Dock ( LP: #823513 )
PS²: is it possible to wait for 15-30 min in order to compile this cairo-dock-plug-ins package with the new cairo-dock (core) packages.

[Kees Cook (kees)]

Looks good, thanks!

review: Approve

=== modified file 'Animated-icons/data/Animated-icons.conf.in'
--- Animated-icons/data/Animated-icons.conf.in	2011-04-20 20:46:51 +0000
+++ Animated-icons/data/Animated-icons.conf.in	2011-08-09 20:07:46 +0000
@@ -1,4 +1,4 @@
-#!en;@VERSION_ANIMATED_ICONS@
+#@VERSION_ANIMATED_ICONS@
 
 #[gtk-preferences]
 [Global]

=== modified file 'Animated-icons/src/applet-wobbly.c'
--- Animated-icons/src/applet-wobbly.c	2011-04-20 20:46:51 +0000
+++ Animated-icons/src/applet-wobbly.c	2011-08-09 20:07:46 +0000
@@ -473,7 +473,7 @@
 		
 		///glActiveTextureARB(GL_TEXTURE0_ARB); // Go pour le multitexturing 1ere passe
 		glBindTexture(GL_TEXTURE_2D, pIcon->iIconTexture);
-		glColor4f(1.0f, 1.0f, 1.0f, myIconsParam.fAlbedo * pIcon->fAlpha);  // transparence du reflet.
+		glColor4f(1.0f, 1.0f, 1.0f, myIconsParam.fAlbedo * pIcon->fAlpha / 2);  // transparence du reflet.
 		glBlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
 			GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 		glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-07-05 13:45:43 +0000
+++ CMakeLists.txt	2011-08-09 20:07:46 +0000
@@ -10,7 +10,7 @@
 ########### project ###############
 
 project ("cairo-dock-plugins")
-set (VERSION "2.3.0~3")
+set (VERSION "2.4.0~0beta2")
 
 add_definitions (-std=c99 -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) #-Wunreachable-code -Wno-unused-parameter -Wall
 if (NOT ${CMAKE_BUILD_TYPE})
@@ -22,11 +22,11 @@
 
 set (CPACK_SOURCE_GENERATOR "TGZ")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
-set (CPACK_SOURCE_IGNORE_FILES 
+set (CPACK_SOURCE_IGNORE_FILES
 	"/build/;/.bzr/;bzrignore$;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}")
 include (CPack)
 
-add_custom_target( dist
+add_custom_target(dist
 	COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 add_custom_target(dist-bzr
 	COMMAND bzr export ${CMAKE_PROJECT_NAME}-${VERSION}.tar.gz
@@ -48,21 +48,25 @@
 
 # get plug-ins install dir
 execute_process(
-    COMMAND pkg-config cairo-dock --variable=pluginsdir		# /usr/lib/cairo-dock
+    COMMAND pkg-config gldi --variable=pluginsdir		# /usr/lib/cairo-dock
     OUTPUT_VARIABLE pluginsdir)
 STRING (REGEX REPLACE "\n" "" pluginsdir ${pluginsdir})  # la commande rajoute un retour chariot ...
 # get plug-ins data dir
 execute_process(
-    COMMAND pkg-config cairo-dock --variable=pluginsdatadir	# /usr/share/cairo-dock/plug-ins
+    COMMAND pkg-config gldi --variable=pluginsdatadir	# /usr/share/cairo-dock/plug-ins
     OUTPUT_VARIABLE pluginsdatadir)
 STRING (REGEX REPLACE "\n" "" pluginsdatadir ${pluginsdatadir})
 # check that version matches with the core
 execute_process(
-    COMMAND pkg-config --modversion cairo-dock			# 2.2.0-3
+    COMMAND pkg-config --modversion gldi			# 2.2.0-3
     OUTPUT_VARIABLE dock_version)
 STRING (REGEX REPLACE "\n" "" dock_version ${dock_version})
 if (NOT "${dock_version}" STREQUAL "${VERSION}")		# Version
-	MESSAGE (FATAL_ERROR "warning : version mismatch with the core : " ${VERSION} <> ${dock_version})
+	if ("${PACKAGEMENT}" STREQUAL "")
+		MESSAGE (FATAL_ERROR "Error : version mismatch with the core : " ${VERSION} <> ${dock_version})
+	else ()
+		MESSAGE (WARNING "Warning : version mismatch with the core : " ${VERSION} <> ${dock_version})
+	endif ()
 endif()
 
 #if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT "${FORCE_LIB64}" STREQUAL "")  # 64bits and force install in lib64
@@ -76,7 +80,9 @@
 GET_FILENAME_COMPONENT(libdir "${pluginsdir}/.." ABSOLUTE)  # /usr/lib
 GET_FILENAME_COMPONENT(prefix "${pluginsdir}/../.." ABSOLUTE)  # /usr
 if (NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "${prefix}")
-	message (STATUS "Warning : plug-ins should be installed in the same directory as the core, that is to say in ${pluginsdir}")
+	message (STATUS "It seems that the current CMAKE_INSTALL_PREFIX flag is not the same that you have used with the core.")
+	message (STATUS " It will be replaced by this value: ${prefix}")
+	message (WARNING "Plug-ins should be installed in the same directory as the core, that is to say in ${pluginsdir}")
 	set (CMAKE_INSTALL_PREFIX "${prefix}")
 	#set (libdir "${CMAKE_INSTALL_PREFIX}/${libname}/cairo-dock")
 endif()
@@ -88,6 +94,10 @@
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")  # additionnal FindPackage files
 
+set (MODULES_MISSING "")
+set (MODULES_INTEGRATION_MISSING "")
+set (PROGRAMS_MISSING "")
+
 ########### dependancies ###############
 
 message ("")
@@ -96,7 +106,10 @@
 message (STATUS "=====================")
 message ("")
 
-pkg_check_modules ("PACKAGE" REQUIRED "gtk+-2.0" "gthread-2.0" "cairo" "librsvg-2.0" "dbus-1" "dbus-glib-1" "libxml-2.0" "gtkglext-1.0" "cairo-dock")
+pkg_check_modules ("PACKAGE" REQUIRED "gtk+-2.0" "gthread-2.0" "cairo" "librsvg-2.0" "dbus-1" "dbus-glib-1" "libxml-2.0" "gtkglext-1.0")
+pkg_check_modules ("GLDI" REQUIRED "gldi")  # we don't want to link with gldi
+set (PACKAGE_INCLUDE_DIRS "${GLDI_INCLUDE_DIRS}")
+#message (STATUS "PACKAGE: ${PACKAGE_INCLUDE_DIRS}")
 
 #############    GLIB    #################
 pkg_check_modules (GLIB glib-2.0)
@@ -107,14 +120,17 @@
 	STRING (REGEX REPLACE "-.*" "" GLIB_NANO "${GLIB_NANO}")
 
 ############# ALSA_MIXER #################
+message (STATUS "> AlsaMixer:")
 set (with_alsa "no")
 if (NOT "${enable-alsa-mixer}" STREQUAL "no")
 	pkg_check_modules (ALSA_MIXER_PACKAGE alsa)
 	if ("${ALSA_MIXER_PACKAGE_FOUND}" STREQUAL "")
 		message (STATUS "Could not find alsa; Cairo-Dock won't be built with AlsaMixer applet.")
+		message (WARNING "This module is required to compile AlsaMixer applet: alsa")
+		set (MODULES_MISSING "${MODULES_MISSING} alsa")
 	else()
 		set (GETTEXT_ALSA_MIXER ${GETTEXT_PLUGINS})
-		set (VERSION_ALSA_MIXER "1.0.12")
+		set (VERSION_ALSA_MIXER "1.0.13")
 		set (PACKAGE_ALSA_MIXER "cd-AlsaMixer")
 		set (with_alsa "yes")
 		set (alsa_mixerdatadir "${pluginsdatadir}/AlsaMixer")
@@ -124,6 +140,7 @@
 endif()
 
 ############# ANIMATED ICONS #################
+message (STATUS "> Animated Icons:")
 set (GETTEXT_ANIMATED_ICONS ${GETTEXT_PLUGINS})
 set (VERSION_ANIMATED_ICONS "1.0.10")
 set (PACKAGE_ANIMATED_ICONS "cd-Animated-icons")
@@ -132,8 +149,9 @@
 add_subdirectory (Animated-icons)
 
 ############# CAIRO_PENGUIN #################
+message (STATUS "> Cairo Penguin:")
 set (GETTEXT_CAIRO_PENGUIN ${GETTEXT_PLUGINS})
-set (VERSION_CAIRO_PENGUIN "1.1.8")
+set (VERSION_CAIRO_PENGUIN "1.1.9")
 set (PACKAGE_CAIRO_PENGUIN "cd-Cairo-Penguin")
 set (cairo_penguinuserdirname "Cairo-Penguin")
 set (cairo_penguindatadir "${pluginsdatadir}/Cairo-Penguin")
@@ -141,54 +159,64 @@
 add_subdirectory (Cairo-Penguin)
 
 ############# CLIPPER #################
+message (STATUS "> Clipper:")
 set (GETTEXT_CLIPPER ${GETTEXT_PLUGINS})
-set (VERSION_CLIPPER "1.1.4")
+set (VERSION_CLIPPER "1.1.5")
 set (PACKAGE_CLIPPER "cd-Clipper")
 set (Clipperdatadir "${pluginsdatadir}/Clipper")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Clipper/data/Clipper.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Clipper/data/Clipper.conf)
 add_subdirectory (Clipper)
 
 ############# CLOCK #################
+message (STATUS "> Clock:")
 set (with_ical "yes")
 pkg_check_modules ("LIBICAL_PACKAGE" "libical")
 if ("${LIBICAL_PACKAGE_FOUND}" STREQUAL "")
 	set (with_ical "no")
 	message (STATUS "Could not find libical; Clock plugin won't be built with iCal support.")
+	message (WARNING "This module is required to compile Clock applet with iCal support: libical")
+	set (MODULES_MISSING "${MODULES_MISSING} libical")
 endif()
 set (GETTEXT_CLOCK ${GETTEXT_PLUGINS})
-set (VERSION_CLOCK "2.1.2")
+set (VERSION_CLOCK "2.1.3")
 set (PACKAGE_CLOCK "cd-clock")
 set (clockuserdirname "clock")
 set (clockdatadir "${pluginsdatadir}/clock")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/clock/data/clock.conf.in ${CMAKE_CURRENT_BINARY_DIR}/clock/data/clock.conf)
 add_subdirectory (clock)
 
-############# COMPIZ_ICON #################
-set (GETTEXT_COMPIZ_ICON ${GETTEXT_PLUGINS})
-set (VERSION_COMPIZ_ICON "1.1.6")
-set (PACKAGE_COMPIZ_ICON "cd-compiz-icon")
-set (compiz_icondatadir "${pluginsdatadir}/compiz-icon")
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/compiz-icon/data/compiz-icon.conf.in ${CMAKE_CURRENT_BINARY_DIR}/compiz-icon/data/compiz-icon.conf)
-add_subdirectory (compiz-icon)
+############# COMPOSITE_MANAGER #################
+message (STATUS "> Coposite Manager:")
+set (GETTEXT_COMPOSITE_MANAGER ${GETTEXT_PLUGINS})
+set (VERSION_COMPOSITE_MANAGER "1.0.0")
+set (PACKAGE_COMPOSITE_MANAGER "cd-Composite-Manager")
+set (composite_managerdatadir "${pluginsdatadir}/Composite-Manager")
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Composite-Manager/data/Composite-Manager.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Composite-Manager/data/Composite-Manager.conf)
+add_subdirectory (Composite-Manager)
 
 ############# DBUS #################
+message (STATUS "> DBus:")
+message (STATUS "* Python:")
 find_program (PYTHON_EXECUTABLE python)
 EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print sys.version" OUTPUT_VARIABLE PYTHON_VERSION)
-if ("${PYTHON_VERSION}" STREQUAL "") 
-	message (STATUS "Could not find Python, won't install Python interface.") 
-	set (with_python "no") 
-else() 
+if ("${PYTHON_VERSION}" STREQUAL "")
+	message (STATUS "Could not find Python, won't install Python interface.")
+	message (WARNING "This program is required to compile DBus applet with Python interface: python (version 2)")
+	set (PROGRAMS_MISSING "${PROGRAMS_MISSING} python")
+	set (with_python "no")
+else()
 	STRING (REGEX REPLACE "\n" "" PYTHON_VERSION ${PYTHON_VERSION})
-	message (STATUS "Python Version: ${PYTHON_VERSION}") 
-	GET_FILENAME_COMPONENT(DEBIAN_VERSION /etc/debian_version ABSOLUTE) 
-	if (EXISTS ${DEBIAN_VERSION}) 
-		message (STATUS "  will use '--install-layout deb' with 'python setup.py install'") 
+	message (STATUS "Python Version: ${PYTHON_VERSION}")
+	GET_FILENAME_COMPONENT(DEBIAN_VERSION /etc/debian_version ABSOLUTE)
+	if (EXISTS ${DEBIAN_VERSION})
+		message (STATUS "  will use '--install-layout deb' with 'python setup.py install'")
 		set (DEBIAN_INSTALL_LAYOUT "--install-layout deb")
 	endif()
 	set (PYTHON_FOUND "TRUE")
-	set (with_python "yes") 
+	set (with_python "yes")
 endif()
 
+message (STATUS "* Ruby:")
 # find_package(Ruby) found libs of ruby-dev but we only need a directory where we can install ruby libs.
 find_program (RUBY_EXECUTABLE ruby)
 EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubylibdir']"
@@ -196,6 +224,8 @@
 message (STATUS "RUBY_LIBRARY: ${RUBY_LIB_DIR}")
 if ("${RUBY_LIB_DIR}" STREQUAL "" OR "${RUBY_LIB_DIR}" STREQUAL "nil")
 	message (STATUS "Could not find ruby libs, won't install Ruby interface.")
+	message (WARNING "This program is required to compile DBus applet with Ruby interface: ruby")
+	set (PROGRAMS_MISSING "${PROGRAMS_MISSING} ruby")
 	set (with_ruby "no")
 else()
 	string (REGEX REPLACE "lib/ruby/[0-9].[0-9]" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}")
@@ -206,6 +236,7 @@
 	set (with_ruby "yes")
 endif()
 
+message (STATUS "* Mono:")
 #find_package (Mono)
 find_program (GMCS_EXECUTABLE gmcs)
 if ("${GMCS_EXECUTABLE}" STREQUAL "" OR NOT EXISTS ${GMCS_EXECUTABLE})
@@ -215,6 +246,8 @@
 	pkg_check_modules (MONO_PACKAGE glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0)
 	if ("${MONO_PACKAGE_FOUND}" STREQUAL "")
 		message (STATUS "Could not find glib-sharp-2.0, ndesk-dbus-1.0 or ndesk-dbus-glib-1.0; won't be built Mono interface.")
+		message (WARNING "These modules are required to compile DBus applet with Mono interface: glib-sharp-2.0, ndesk-dbus-1.0 and ndesk-dbus-glib-1.0")
+		set (MODULES_MISSING "${MODULES_MISSING} glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0")
 		set (with_mono "no")
 	else()
 		set (MONO_FOUND "TRUE")
@@ -222,6 +255,7 @@
 	endif()
 endif()
 
+message (STATUS "* Vala:")
 # Valac is only riquired to convert vala files to C files.
 #  So we can directly use produced files (c, h, vapi) without using valac.
 set (with_vala "yes")
@@ -243,7 +277,7 @@
 
 	STRING (REGEX REPLACE "\\..*" "" VALA_MAJOR "${VALA_VERSION}")
 	# message (STATUS "VALA_MAJOR : ${VALA_MAJOR}")
-	
+
 	STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" VALA_MINOR "${VALA_VERSION}")  # 0.1.7 => 1.7
 	STRING (REGEX REPLACE "\\.[0-9]*" "" VALA_MINOR "${VALA_MINOR}")
 	# message (STATUS "VALA_MINOR : ${VALA_MINOR}")
@@ -252,13 +286,18 @@
 	STRING (REGEX REPLACE "-.*" "" VALA_NANO "${VALA_NANO}")
 	# message (STATUS "VALA_NANO  : ${VALA_NANO}")
 
-	if (${VALA_MAJOR} GREATER 0 OR ${VALA_MINOR} GREATER 9)  # vala > 0.10
-		message (STATUS " Vala compiler OK (>= 0.10).")
+	if (${VALA_MAJOR} GREATER 0 OR ${VALA_MINOR} GREATER 9) # vala >= 0.10 
+		# AND (${VALA_MAJOR} LESS 1 AND ${VALA_MINOR} LESS 13)) # and <= 0.12
+		message (STATUS " Vala compiler OK (>= 0.10).")# and <= 0.12).")
 		set (VALAC_FOUND "TRUE")
 		set (with_valac "yes")
 	else()
-		message (STATUS "Vala compiler is too old (0.10 required), won't build Vala interface.")
+		message (STATUS "Vala compiler is too old (0.10 required) or too new (> 0.12), won't build Vala interface.")
 	endif()
+else()
+	message (STATUS "Could not find ValaC, won't build Vala interface with the version of your distribution.")
+	message (WARNING "This program is required to compile DBus applet with Python interface: valac (version > 0.10)")
+	set (PROGRAMS_MISSING "${PROGRAMS_MISSING} valac")
 endif()
 
 
@@ -270,6 +309,7 @@
 add_subdirectory (Dbus)
 
 ############# DESKLET_RENDERING #################
+message (STATUS "> Desklet Rendering:")
 set (GETTEXT_DESKLET_RENDERING ${GETTEXT_PLUGINS})
 set (VERSION_DESKLET_RENDERING "1.5.6")
 set (PACKAGE_DESKLET_RENDERING "cd-desklet-rendering")
@@ -278,6 +318,7 @@
 add_subdirectory (desklet-rendering)
 
 ############# DIALOG_RENDERING #################
+message (STATUS "> Dialog Rendering:")
 set (GETTEXT_DIALOG_RENDERING ${GETTEXT_PLUGINS})
 set (VERSION_DIALOG_RENDERING "0.5.1")
 set (PACKAGE_DIALOG_RENDERING "cd-dialog-rendering")
@@ -288,8 +329,9 @@
 ############# DISKS #################
 set (with_disks "no")
 if ("${enable-disks}" STREQUAL "yes")
+	message (STATUS "> Disks:")
 	set (GETTEXT_DISKS ${GETTEXT_PLUGINS})
-	set (VERSION_DISKS "0.0.2")
+	set (VERSION_DISKS "0.0.3")
 	set (PACKAGE_DISKS "cd-disks")
 	set (with_disks "yes")
 	set (disksdatadir "${pluginsdatadir}/Disks")
@@ -298,6 +340,7 @@
 endif()
 
 ############# DND2SHARE #################
+message (STATUS "> DND2Share:")
 set (GETTEXT_DND2SHARE ${GETTEXT_PLUGINS})
 set (VERSION_DND2SHARE "1.0.6")
 set (PACKAGE_DND2SHARE "cd-dnd2share")
@@ -306,6 +349,7 @@
 add_subdirectory (dnd2share)
 
 ############# DOCK RENDERING #################
+message (STATUS "> Dock Rendering:")
 set (GETTEXT_RENDERING ${GETTEXT_PLUGINS})
 set (VERSION_RENDERING "1.5.9")
 set (PACKAGE_RENDERING "cd-rendering")
@@ -316,8 +360,9 @@
 ############# DONCKY #################
 set (with_doncky "no")
 if ("${enable-doncky}" STREQUAL "yes")
+	message (STATUS "> Doncky:")
 	set (GETTEXT_DONCKY ${GETTEXT_PLUGINS})
-	set (VERSION_DONCKY "0.0.4")
+	set (VERSION_DONCKY "0.0.5")
 	set (PACKAGE_DONCKY "cd-doncky")
 	set (with_doncky "yes")
 	set (donckydatadir "${pluginsdatadir}/Doncky")
@@ -326,6 +371,7 @@
 endif()
 
 ############# DROP INDICATOR #################
+message (STATUS "> Drop Indicator:")
 set (GETTEXT_DROP_INDICATOR ${GETTEXT_PLUGINS})
 set (VERSION_DROP_INDICATOR "1.1.4")
 set (PACKAGE_DROP_INDICATOR "cd-drop_indicator")
@@ -334,8 +380,9 @@
 add_subdirectory (drop-indicator)
 
 ############# DUSTBIN #################
+message (STATUS "> Dustbin:")
 set (GETTEXT_DUSTBIN ${GETTEXT_PLUGINS})
-set (VERSION_DUSTBIN "2.3.1")
+set (VERSION_DUSTBIN "2.3.2")
 set (PACKAGE_DUSTBIN "cd-dustbin")
 set (dustbinuserdirname "dustbin")
 set (dustbindatadir "${pluginsdatadir}/dustbin")
@@ -343,22 +390,26 @@
 add_subdirectory (dustbin)
 
 ############# FOLDERS #################
+message (STATUS "> Folders:")
 set (GETTEXT_FOLDERS ${GETTEXT_PLUGINS})
-set (VERSION_FOLDERS "0.2.1")
+set (VERSION_FOLDERS "0.2.2")
 set (PACKAGE_FOLDERS "cd-Folders")
 set (foldersdatadir "${pluginsdatadir}/Folders")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Folders/data/Folders.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Folders/data/Folders.conf)
 add_subdirectory (Folders)
 
 ############# GMENU #################
+message (STATUS "> GMenu:")
 set (with_gmenu "no")
 if (NOT "${enable-gmenu}" STREQUAL "no")
 	pkg_check_modules (GMENU_PACKAGE libgnome-menu)
 	if ("${GMENU_PACKAGE_FOUND}" STREQUAL "")
 		message (STATUS "Could not find libgnome-menu; Cairo-Dock won't be built with GMenu applet.")
+		message (WARNING "This module is required to compile GMenu applet: libgnome-menu")
+		set (MODULES_MISSING "${MODULES_MISSING} libgnome-menu")
 	else()
 		set (GETTEXT_GMENU ${GETTEXT_PLUGINS})
-		set (VERSION_GMENU "1.1.6")
+		set (VERSION_GMENU "1.1.8")
 		set (PACKAGE_GMENU "cd-GMenu")
 		set (with_gmenu "yes")
 		set (gmenudatadir "${pluginsdatadir}/GMenu")
@@ -368,15 +419,19 @@
 endif()
 
 ############# GVFS-INTEGRATION #################
+message (STATUS "> GVFS-Integration:")
 pkg_check_modules ("LIBGIO" "gio-2.0")
 add_subdirectory (gvfs-integration)
 
 ############# GNOME-INTEGRATION #################
+message (STATUS "> Gnome-Integration:")
 set (with_gnome_integration "no")
 if (NOT "${enable-gnome-integration}" STREQUAL "no")
 	pkg_check_modules (GNOME_INTEGRATION gio-2.0)
 	if ("${GNOME_INTEGRATION_FOUND}" STREQUAL "")
 		message (STATUS "Could not find gio; Cairo-Dock won't be built with Gnome>=2.22 support.")
+		message (STATUS "This module is required to compile Gnome-Integration applet: gio-2.0")
+		set (MODULES_INTEGRATION_MISSING "${MODULES_INTEGRATION_MISSING} gio-2.0")
 	else()
 		set (VERSION_GNOME_INTEGRATION "1.0.3")
 		set (PACKAGE_GNOME_INTEGRATION "cd_gnome-integration")
@@ -389,9 +444,13 @@
 ############# GNOME-INTEGRATION-OLD #################
 set (with_gnome_integration_old "no")
 if ("${enable-old-gnome-integration}" STREQUAL "yes")
+	message (STATUS "> Gnome-Integration:")
+	message (WARNING "This applet is deprecated")
 	pkg_check_modules (OLD_GNOME_INTEGRATION gnome-vfs-2.0 libgnomeui-2.0)
 	if ("${OLD_GNOME_INTEGRATION_FOUND}" STREQUAL "")
 		message (STATUS "Could not find gnome-vfs and/or gnomeui; Cairo-Dock won't be built with Gnome<2.22 support.")
+		message (STATUS "These modules are required to compile Gnome-Integration-Old applet: gnome-vfs-2.0 libgnomeui-2.0")
+		set (MODULES_INTEGRATION_MISSING "${MODULES_INTEGRATION_MISSING} gnome-vfs-2.0 libgnomeui-2.0")
 	else()
 		set (VERSION_GNOME_INTEGRATION_OLD "1.0.4")
 		set (PACKAGE_GNOME_INTEGRATION_OLD "cd_gnome-integration-old")
@@ -401,7 +460,8 @@
 	endif()
 endif()
 
-############# ICON EFFECT #################
+############# ICON EFFECTS #################
+message (STATUS "> Icon Effects:")
 set (GETTEXT_ICON_EFFECTS ${GETTEXT_PLUGINS})
 set (VERSION_ICON_EFFECTS "1.2.4")
 set (PACKAGE_ICON_EFFECTS "cd-icon-effect")
@@ -409,11 +469,32 @@
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/icon-effect/data/icon-effect.conf.in ${CMAKE_CURRENT_BINARY_DIR}/icon-effect/data/icon-effect.conf)
 add_subdirectory (icon-effect)
 
+############# IMPULSE #################
+set (with_impulse "no")
+if ("${enable-impulse}" STREQUAL "yes")
+	message (STATUS "> Impulse:")
+	pkg_check_modules (IMPULSE_PACKAGES libpulse fftw3)
+	if ("${IMPULSE_PACKAGES_FOUND}" STREQUAL "")
+		message (STATUS "Could not find libpulse; Cairo-Dock won't be built with Impulse applet.")
+		message (WARNING "These modules are required to compile Impulse applet: libpulse fftw3")
+		set (MODULES_MISSING "${MODULES_MISSING} libpulse fftw3")
+	else()
+		set (GETTEXT_IMPULSE ${GETTEXT_PLUGINS})
+		set (VERSION_IMPULSE "0.0.3")
+		set (PACKAGE_IMPULSE "cd-Impulse")
+		set (with_impulse "yes")
+		set (impulsedatadir "${pluginsdatadir}/Impulse")
+		configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Impulse/data/Impulse.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Impulse/data/Impulse.conf)
+		add_subdirectory (Impulse)
+	endif()
+endif()
+
 ############# INDICATOR-APPLET #################
-# Note: the names of dbusmenu-glib and dbusmenu-gtk have changed...
+message (STATUS "> Indicator-Applet:")
+# Note: the names of dbusmenu-glib, dbusmenu-gtk and indicator have changed...
 pkg_check_modules (DBUSMENU_04 QUIET dbusmenu-glib-0.4)
 pkg_check_modules (DBUSMENU_GTK_04 QUIET dbusmenu-gtk-0.4)
-pkg_check_modules (INDICATOR_APPLET indicator libido-0.1)
+pkg_check_modules (INDICATOR_04 QUIET indicator-0.4)
 if ("${DBUSMENU_04_FOUND}" STREQUAL "1")
 	pkg_check_modules (DBUSMENU dbusmenu-glib-0.4)
 else()
@@ -424,29 +505,45 @@
 else()
 	pkg_check_modules (DBUSMENU_GTK dbusmenu-gtk)
 endif()
+if ("${INDICATOR_04_FOUND}" STREQUAL "1")
+	pkg_check_modules (INDICATOR_APPLET indicator-0.4 libido-0.1)
+else()
+	pkg_check_modules (INDICATOR_APPLET indicator libido-0.1)
+endif()
+
 if ("${INDICATOR_APPLET_FOUND}" STREQUAL "1" AND "${DBUSMENU_FOUND}" STREQUAL "1" AND "${DBUSMENU_GTK_FOUND}" STREQUAL "1")
-	message (STATUS "DBUSMENU_VERSION : ${DBUSMENU_VERSION}")
-	
+	#message (STATUS "DBUSMENU_VERSION : ${DBUSMENU_VERSION}")
+
 	STRING (REGEX REPLACE "\\..*" "" DBUSMENU_MAJOR "${DBUSMENU_VERSION}")
 	# message (STATUS "DBUSMENU_MAJOR : ${DBUSMENU_MAJOR}")
-	
+
 	STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" DBUSMENU_MINOR "${DBUSMENU_VERSION}")  # 0.1.7 => 1.7
 	STRING (REGEX REPLACE "\\.[0-9]*" "" DBUSMENU_MINOR "${DBUSMENU_MINOR}")
 	# message (STATUS "DBUSMENU_MINOR : ${DBUSMENU_MINOR}")
-	
+
 	STRING (REGEX REPLACE ".*\\." "" DBUSMENU_NANO "${DBUSMENU_VERSION}")
 	STRING (REGEX REPLACE "-.*" "" DBUSMENU_NANO "${DBUSMENU_NANO}")
 	# message (STATUS "DBUSMENU_NANO  : ${DBUSMENU_NANO}")
-	
-	execute_process(
-		COMMAND pkg-config --variable=iconsdir indicator
-		OUTPUT_VARIABLE INDICATORICONSDIR)
+
+	if ("${INDICATOR_04_FOUND}" STREQUAL "1")
+		execute_process(
+			COMMAND pkg-config --variable=iconsdir indicator-0.4
+			OUTPUT_VARIABLE INDICATORICONSDIR)
+	else()
+		execute_process(
+			COMMAND pkg-config --variable=iconsdir indicator
+			OUTPUT_VARIABLE INDICATORICONSDIR)
+	endif()
 	STRING (REGEX REPLACE "\n" "" INDICATORICONSDIR ${INDICATORICONSDIR})  # la commande rajoute un retour chariot ...
 	add_subdirectory (Indicator-applet)
 	set (with_indicator "yes")
+else()
+	message (WARNING "These modules are required to compile Indicators applet (MeMenu and Messaging-Menu): indicator(-0.4), libido-0.1, dbusmenu-glib(-0.4), dbusmenu-gtk(-0.4)")
+	set (MODULES_MISSING "${MODULES_MISSING} indicator(-0.4) libido-0.1 dbusmenu-glib(-0.4) dbusmenu-gtk(-0.4)")
 endif()
 
 ############# ILLUSION #################
+message (STATUS "> Illusion:")
 set (GETTEXT_ILLUSION ${GETTEXT_PLUGINS})
 set (VERSION_ILLUSION "1.0.7")
 set (PACKAGE_ILLUSION "cd-illusion")
@@ -455,13 +552,75 @@
 add_subdirectory (illusion)
 
 ############# KDE-INTEGRATION #################
+message (STATUS "> KDE-Integration:")
 set (with_kde_integration "no")
-if (NOT "${enable-kde-integration}" STREQUAL "no")
+set (with_kde_integration2 "no")
+if ("${enable-kde-integration2}" STREQUAL "yes")
+	#find_package(KDE4)
+	find_package(Qt4)
+	if (QT4_FOUND)
+		message (STATUS " * Qt Includes: ${QT_INCLUDES}")
+		message (STATUS " * Qt Definitions: ${QT_DEFINITIONS}")
+		message (STATUS " * QtCore Library: ${QT_QTCORE_LIBRARY} / ${PACKAGE_LIBRARIES}")
+	else()
+		message (STATUS " * Qt unavailable")
+	endif()
+
+	find_path(KDECORE_INCLUDE_DIR "kdecore_export.h")
+	find_library(KDECORE_LIBRARY NAMES "kdecore")
+	GET_FILENAME_COMPONENT(KDECORE_LIBRARY ${KDECORE_LIBRARY} PATH)
+
+	find_path(KIO_INCLUDE_DIR "kio_export.h" PATH_SUFFIXES "kio")
+	find_library(KIO_LIBRARY NAMES "kio")
+	GET_FILENAME_COMPONENT(KIO_LIBRARY ${KIO_LIBRARY} PATH)
+
+	find_path(KDE_INCLUDE_DIR "KDirWatch" PATH_SUFFIXES "KDE")
+
+	if (NOT "${KDECORE_LIBRARY}" STREQUAL "")
+		message (STATUS " * KDECORE Dir: ${KDECORE_INCLUDE_DIR}")
+		message (STATUS " * KDECORE Library: ${KDECORE_LIBRARY}")
+	else()
+		message (STATUS " * KDECORE unavailable")
+	endif()
+	if (NOT "${KIO_LIBRARY}" STREQUAL "")
+		message (STATUS " * KIO Dir: ${KIO_INCLUDE_DIR}")
+		message (STATUS " * KIO Library: ${KIO_LIBRARY}")
+	else()
+		message (STATUS " * KIO unavailable")
+	endif()
+	if (NOT "${KDE_LIBRARY}" STREQUAL "") ## always empty?
+		message (STATUS " * KDE4 Dir: ${KDE_INCLUDE_DIR}")
+		message (STATUS " * KDE4 Library: ${KDE_LIBRARY}")
+	else()
+		message (STATUS " * KDE4 unavailable")
+	endif()
+
+	if (QT4_FOUND
+		 AND KDECORE_INCLUDE_DIR
+		 AND KDECORE_LIBRARY
+		 AND KIO_INCLUDE_DIR
+		 AND KIO_LIBRARY
+		 AND KDE_INCLUDE_DIR)
+		message (STATUS "KDE: OK")
+		set (VERSION_KDE_INTEGRATION "0.0.3")
+		set (PACKAGE_KDE_INTEGRATION "cd_kde-integration")
+		set (with_kde_integration2 "yes")
+		set (kde_integrationdatadir "${pluginsdatadir}/kde-integration2")
+		add_subdirectory ("kde-integration2")
+	else()
+		message (STATUS "Could not find kde libs; Cairo-Dock won't be built with KDE support.")
+		message (STATUS "These libraries are required to compile KDE experimental applet: kdecore, kio, kde4")
+		set (MODULES_INTEGRATION_MISSING "${MODULES_INTEGRATION_MISSING} kdecore, kio, kde4")
+	endif()
+elseif (NOT "${enable-kde-integration}" STREQUAL "no")
 	pkg_check_modules (KDE_INTEGRATION gio-2.0)
-	if ("${KDE_INTEGRATION_FOUND}" STREQUAL "")
-		message (STATUS "Could not find kde libs; Cairo-Dock won't be built with KDE support.")
+	message (STATUS "KDE_INTEGRATION_FOUND: ${KDE_INTEGRATION_FOUND}")
+	if (NOT KDE_INTEGRATION_FOUND)
+		message (STATUS "Could not find gio; Cairo-Dock won't be built with KDE support.")
+		message (STATUS "This module is required to compile KDE-Integration applet: gio-2.0")
+		set (MODULES_INTEGRATION_MISSING "${MODULES_INTEGRATION_MISSING} gio-2.0")
 	else()
-		set (VERSION_KDE_INTEGRATION "0.0.2")
+		set (VERSION_KDE_INTEGRATION "1.0.3")
 		set (PACKAGE_KDE_INTEGRATION "cd_kde-integration")
 		set (with_kde_integration "yes")
 		set (kde_integrationdatadir "${pluginsdatadir}/kde-integration")
@@ -470,13 +629,16 @@
 endif()
 
 ############# KEYBOARD_INDICATOR #################
+message (STATUS "> Keyboard-Indicator:")
 set (with_keyboard_indicator "no")
 pkg_check_modules (KEYBOARD_INDICATOR_PACKAGE libxklavier)
 if ("${KEYBOARD_INDICATOR_PACKAGE_FOUND}" STREQUAL "")
 	message (STATUS "Could not find libxklavier; Cairo-Dock won't be built with keyboard-indicator applet.")
+	message (WARNING "This module is required to compile Keyboard-Indicator applet: libxklavier")
+	set (MODULES_MISSING "${MODULES_MISSING} libxklavier")
 else()
 	set (GETTEXT_KEYBOARD_INDICATOR ${GETTEXT_PLUGINS})
-	set (VERSION_KEYBOARD_INDICATOR "1.1.3")
+	set (VERSION_KEYBOARD_INDICATOR "1.1.4")
 	set (PACKAGE_KEYBOARD_INDICATOR "cd-keyboard-indicator")
 	set (with_keyboard_indicator "yes")
 	set (keyboard_indicatordatadir "${pluginsdatadir}/keyboard-indicator")
@@ -485,20 +647,32 @@
 endif()
 
 ############# LOGOUT #################
+message (STATUS "> LogOut:")
+pkg_check_modules (UPOWER upower-glib)  # useful for Powermanager too.
+if (${UPOWER_FOUND})
+	set (with_upower_support "yes")
+else()
+	set (with_upower_support "no")
+	message (STATUS "Could not find upower-glib; LogOut and PowerManager plugin won't be built with UPower support.")
+	message (WARNING "This module is required to compile LogOut and PowerManager applet with UPower support: upower-glib")
+	set (MODULES_MISSING "${MODULES_MISSING} upower-glib")
+endif()
 set (GETTEXT_LOGOUT ${GETTEXT_PLUGINS})
-set (VERSION_LOGOUT "1.2.10")
+set (VERSION_LOGOUT "1.2.11")
 set (PACKAGE_LOGOUT "cd-logout")
 set (logoutdatadir "${pluginsdatadir}/logout")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/logout/data/logout.conf.in ${CMAKE_CURRENT_BINARY_DIR}/logout/data/logout.conf)
 add_subdirectory (logout)
 
 ############# MAIL #################
+message (STATUS "> Mail:")
 set (with_mail "no")
 # find the compilation flags
+find_program (LIBETPAN_CONFIG_EXECUTABLE libetpan-config)
 execute_process(
-	COMMAND libetpan-config --cflags
+	COMMAND ${LIBETPAN_CONFIG_EXECUTABLE} --cflags
 	OUTPUT_VARIABLE MAIL_PACKAGE_CFLAGS)
-if (NOT "${MAIL_PACKAGE_CFLAGS}" STREQUAL "") # if we don't want to use it, we don't want to have an error
+if (NOT "${MAIL_PACKAGE_CFLAGS}" STREQUAL "") # if there is a problem with the previous, we don't want to have a lot of errors
 	STRING (REGEX MATCHALL "-I[^ ]+ " TMP_VARIABLE "${MAIL_PACKAGE_CFLAGS}") # first extract the "-I" options
 	STRING (REGEX REPLACE ";" "" TMP_VARIABLE "${TMP_VARIABLE}")
 	STRING (REGEX REPLACE " $" "" TMP_VARIABLE "${TMP_VARIABLE}")
@@ -506,7 +680,7 @@
 endif()
 # find the link flags
 execute_process(
-	COMMAND libetpan-config --libs
+	COMMAND ${LIBETPAN_CONFIG_EXECUTABLE} --libs
 	OUTPUT_VARIABLE MAIL_PACKAGE_LIBS)
 if (NOT "${MAIL_PACKAGE_LIBS}" STREQUAL "")
 	#   find the link libraries
@@ -521,13 +695,15 @@
 endif()
 if ("${MAIL_PACKAGE_LIBS}" STREQUAL "")
 	message (STATUS "warning : Could not find libetpan; Cairo-Dock won't be built with Mail applet.")
+	message (WARNING "This module is required to compile Mail applet: libetpan")
+	set (PROGRAMS_MISSING "${PROGRAMS_MISSING} libetpan-config")
 else()
 	message (STATUS "libetpan found. Using the following options:")
 	message (STATUS "  Include directories: ${MAIL_PACKAGE_INCLUDE_DIRS}")
 	message (STATUS "  Link directories: ${MAIL_PACKAGE_LIBRARY_DIRS}")
 	message (STATUS "  Link libraries: ${MAIL_PACKAGE_LIBRARIES}")
 	set (GETTEXT_MAIL ${GETTEXT_PLUGINS})
-	set (VERSION_MAIL "1.0.8")
+	set (VERSION_MAIL "1.0.9")
 	set (PACKAGE_MAIL "cd-mail")
 	set (maildatadir "${pluginsdatadir}/mail")
 	set (with_mail "yes")
@@ -535,7 +711,8 @@
 	add_subdirectory ("mail")
 endif()
 
-############# MEMENU #################
+############# 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
@@ -573,11 +750,17 @@
 	endif()
 endif()
 
-set (INDICATOR_OLD_NAMES 0)
 if (NOT "${DISTRO_ID}" STREQUAL "")
 	message (STATUS "DISTRO_ID: ${DISTRO_ID}, DISTRO_RELEASE: ${DISTRO_RELEASE}")
 endif()
-if ("${DISTRO_ID}" STREQUAL "Ubuntu")
+
+############# INDICATOR_NAME #################
+message (STATUS "> Indicator Names:")
+set (INDICATOR_OLD_NAMES 0)
+if ("${force_old_indicator_names}" STREQUAL "yes")
+	set (INDICATOR_OLD_NAMES 1)
+	message (STATUS "Indicators: use old Ayatana Dbus names (forced)")
+elseif ("${DISTRO_ID}" STREQUAL "Ubuntu")
 	STRING (REGEX REPLACE "\\..*" "" DISTRO_RELEASE_MAJOR ${DISTRO_RELEASE})
 	# message (STATUS "DISTRO_RELEASE_MAJOR: ${DISTRO_RELEASE_MAJOR}")
 	if (${DISTRO_RELEASE_MAJOR} LESS 11)  # from 11.04, new names are used.
@@ -586,10 +769,12 @@
 	endif()
 endif()
 
+############# MEMENU #################
 set (with_me_menu "no")
 if ("${with_indicator}" STREQUAL "yes")
+	message (STATUS "> MeMenu:")
 	set (GETTEXT_MEMENU ${GETTEXT_PLUGINS})
-	set (VERSION_MEMENU "1.0.1")
+	set (VERSION_MEMENU "1.0.2")
 	set (PACKAGE_MEMENU "cd-MeMenu")
 	set (memenudatadir "${pluginsdatadir}/MeMenu")
 	set (with_me_menu "yes")
@@ -600,8 +785,9 @@
 ############# MESSAGING_MENU #################
 set (with_messaging_menu "no")
 if ("${with_indicator}" STREQUAL "yes")
+	message (STATUS "> Messaging-Menu:")
 	set (GETTEXT_MESSAGING_MENU ${GETTEXT_PLUGINS})
-	set (VERSION_MESSAGING_MENU "1.0.1")
+	set (VERSION_MESSAGING_MENU "1.0.2")
 	set (PACKAGE_MESSAGING_MENU "cd-Messaging-Menu")
 	set (with_messaging_menu "yes")
 	set (messaging_menudatadir "${pluginsdatadir}/Messaging-Menu")
@@ -610,6 +796,7 @@
 endif()
 
 ############# MOTION BLUR #################
+message (STATUS "> Motion Blur:")
 set (GETTEXT_MOTION_BLUR ${GETTEXT_PLUGINS})
 set (VERSION_MOTION_BLUR "1.0.4")
 set (PACKAGE_MOTION_BLUR "cd-motion_blur")
@@ -618,16 +805,18 @@
 add_subdirectory (motion-blur)
 
 ############# MUSICPLAYER #################
+message (STATUS "> MusicPlayer:")
 set (GETTEXT_MUSICPLAYER ${GETTEXT_PLUGINS})
-set (VERSION_MUSICPLAYER "1.0.7")
+set (VERSION_MUSICPLAYER "1.0.8")
 set (PACKAGE_MUSICPLAYER "cd-musicPlayer")
 set (musicplayerdatadir "${pluginsdatadir}/musicPlayer")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/musicPlayer/data/musicPlayer.conf.in ${CMAKE_CURRENT_BINARY_DIR}/musicPlayer/data/musicPlayer.conf)
 add_subdirectory (musicPlayer)
 
 ############# NETSPEED #################
+message (STATUS "> NetSpeed:")
 set (GETTEXT_NETSPEED ${GETTEXT_PLUGINS})
-set (VERSION_NETSPEED "1.2.5")
+set (VERSION_NETSPEED "1.2.6")
 set (PACKAGE_NETSPEED "cd-netspeed")
 set (netspeeddatadir "${pluginsdatadir}/netspeed")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/netspeed/data/netspeed.conf.in ${CMAKE_CURRENT_BINARY_DIR}/netspeed/data/netspeed.conf)
@@ -636,8 +825,9 @@
 ############# NETWORK_MONITOR #################
 set (with_network_monitor "no")
 if ("${enable-network-monitor}" STREQUAL "yes")
+	message (STATUS "> Network Monitor:")
 	set (GETTEXT_NETWORK_MONITOR ${GETTEXT_PLUGINS})
-	set (VERSION_NETWORK_MONITOR "0.2.3")
+	set (VERSION_NETWORK_MONITOR "0.2.4")
 	set (PACKAGE_NETWORK_MONITOR "cd-network-monitor")
 	set (with_network_monitor "yes")
 	set (network_monitordatadir "${pluginsdatadir}/Network-Monitor")
@@ -646,29 +836,34 @@
 endif()
 
 ############# POWERMANAGER #################
+message (STATUS "> PowerManager:")
 set (GETTEXT_POWERMANAGER ${GETTEXT_PLUGINS})
-set (VERSION_POWERMANAGER "1.3.4")
+set (VERSION_POWERMANAGER "1.3.5")
 set (PACKAGE_POWERMANAGER "cd-powermanager")
 set (powermanagerdatadir "${pluginsdatadir}/powermanager")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/powermanager/data/powermanager.conf.in ${CMAKE_CURRENT_BINARY_DIR}/powermanager/data/powermanager.conf)
 add_subdirectory (powermanager)
 
 ############# QUICK BROWSER #################
+message (STATUS "> Quick Browser:")
 set (GETTEXT_QUICK_BROWSER ${GETTEXT_PLUGINS})
-set (VERSION_QUICK_BROWSER "1.0.8")
+set (VERSION_QUICK_BROWSER "1.0.9")
 set (PACKAGE_QUICK_BROWSER "cd-quick-browser")
 set (quick_browserdatadir "${pluginsdatadir}/quick_browser")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/quick-browser/data/quick-browser.conf.in ${CMAKE_CURRENT_BINARY_DIR}/quick-browser/data/quick-browser.conf)
 add_subdirectory (quick-browser)
 
 ############# RECENT-EVENTS #################
+message (STATUS "> Recent-Events:")
 set (with_recent_events "no")
 pkg_check_modules (RECENT_EVENTS zeitgeist-1.0)
 if ("${RECENT_EVENTS_FOUND}" STREQUAL "")
 	message (STATUS "Could not find libzeitgeist; Cairo-Dock won't be built with Zeitgeist support.")
+	message (WARNING "This module is required to compile Recent-Events applet: zeitgeist-1.0")
+	set (MODULES_MISSING "${MODULES_MISSING} zeitgeist-1.0")
 else()
 	set (GETTEXT_RECENT_EVENTS ${GETTEXT_PLUGINS})
-	set (VERSION_RECENT_EVENTS "0.0.2")
+	set (VERSION_RECENT_EVENTS "1.0.0")
 	set (PACKAGE_RECENT_EVENTS "cd-Recent-Events")
 	set (with_recent_events "yes")
 	set (recent_eventsdatadir "${pluginsdatadir}/Recent-Events")
@@ -677,6 +872,7 @@
 endif()
 
 ############# REMOTE_CONTROL #################
+message (STATUS "> Remote Control:")
 set (GETTEXT_REMOTE_CONTROL ${GETTEXT_PLUGINS})
 set (VERSION_REMOTE_CONTROL "0.0.2")
 set (PACKAGE_REMOTE_CONTROL "cd-Remote-Control")
@@ -685,8 +881,9 @@
 add_subdirectory (Remote-Control)
 
 ############# RSSREADER #################
+message (STATUS "> RSSreader:")
 set (GETTEXT_RSS_READER ${GETTEXT_PLUGINS})
-set (VERSION_RSS_READER "1.0.3")
+set (VERSION_RSS_READER "1.0.4")
 set (PACKAGE_RSS_READER "cd-rssreader")
 set (rss_readerdatadir "${pluginsdatadir}/RSSreader")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/RSSreader/data/RSSreader.conf.in ${CMAKE_CURRENT_BINARY_DIR}/RSSreader/data/RSSreader.conf)
@@ -695,6 +892,7 @@
 ############# SCOOBY_DO #################
 set (with_scooby_do "no")
 if ("${enable-scooby-do}" STREQUAL "yes")
+	message (STATUS "> Scooby-Do:")
 	set (GETTEXT_SCOOBY_DO ${GETTEXT_PLUGINS})
 	set (VERSION_SCOOBY_DO "0.1.1")
 	set (PACKAGE_SCOOBY_DO "cd-scooby-do")
@@ -704,29 +902,38 @@
 	add_subdirectory (Scooby-Do)
 endif()
 
+############# SHARED-IMAGES #################
+set (shared_imagesdatadir "${pluginsdatadir}/shared-images")
+add_subdirectory (shared-images)
+
 ############# SHORTCUTS #################
+message (STATUS "> Shortcuts:")
 set (GETTEXT_SHORTCUTS ${GETTEXT_PLUGINS})
-set (VERSION_SHORTCUTS "1.3.1")
+set (VERSION_SHORTCUTS "1.3.2")
 set (PACKAGE_SHORTCUTS "cd-shortcuts")
 set (shortcutsdatadir "${pluginsdatadir}/shortcuts")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/shortcuts/data/shortcuts.conf.in ${CMAKE_CURRENT_BINARY_DIR}/shortcuts/data/shortcuts.conf)
 add_subdirectory (shortcuts)
 
 ############# SHOW DESKTOP #################
+message (STATUS "> ShowDesktop:")
 set (with_xrandr "yes")
 pkg_check_modules (SHOW_DESKTOP_XRANDR xrandr)
 if ("${SHOW_DESKTOP_XRANDR_FOUND}" STREQUAL "")
 	message (STATUS "Could not find xrandr; ShowDesktop won't be built with screen resolution abilities.")
+	message (WARNING "This module is required to compile ShowDesktop applet with xRandr support: xrandr")
+	set (MODULES_MISSING "${MODULES_MISSING} xrandr")
 	set (with_xrandr "no")
 endif()
 set (GETTEXT_SHOW_DESKTOP ${GETTEXT_PLUGINS})
-set (VERSION_SHOW_DESKTOP "1.2.4")
+set (VERSION_SHOW_DESKTOP "1.2.5")
 set (PACKAGE_SHOW_DESKTOP "cd-showDesktop")
 set (show_desktopdatadir "${pluginsdatadir}/showDesktop")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/showDesktop/data/showDesktop.conf.in ${CMAKE_CURRENT_BINARY_DIR}/showDesktop/data/showDesktop.conf)
 add_subdirectory (showDesktop)
 
 ############# SHOW MOUSE #################
+message (STATUS "> Show Mouse:")
 set (GETTEXT_SHOW_MOUSE ${GETTEXT_PLUGINS})
 set (VERSION_SHOW_MOUSE "1.0.4")
 set (PACKAGE_SHOW_MOUSE "cd-show_mouse")
@@ -735,33 +942,41 @@
 add_subdirectory (show-mouse)
 
 ############# SLIDER #################
+message (STATUS "> Slider:")
 set (with_exif "yes")
 pkg_check_modules (EXIF libexif)
 if ("${EXIF_FOUND}" STREQUAL "")
 	message (STATUS "Could not find libexif; Slider won't be able to rotate the images accordingly to their exif data.")
+	message (WARNING "This module is required to compile Slider applet with Exif support: libexif")
+	set (MODULES_MISSING "${MODULES_MISSING} libexif")
 	set (with_exif "no")
 endif()
 set (GETTEXT_SLIDER ${GETTEXT_PLUGINS})
-set (VERSION_SLIDER "2.0.8")
+set (VERSION_SLIDER "2.0.9")
 set (PACKAGE_SLIDER "cd-slider")
 set (sliderdatadir "${pluginsdatadir}/slider")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/slider/data/slider.conf.in ${CMAKE_CURRENT_BINARY_DIR}/slider/data/slider.conf)
 add_subdirectory (slider)
 
 ############# STACK #################
+message (STATUS "> Stack:")
 set (GETTEXT_STACK ${GETTEXT_PLUGINS})
-set (VERSION_STACK "0.3.1")
+set (VERSION_STACK "0.3.2")
 set (PACKAGE_STACK "cd-stack")
 set (stackdatadir "${pluginsdatadir}/stack")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/stack/data/stack.conf.in ${CMAKE_CURRENT_BINARY_DIR}/stack/data/stack.conf)
 add_subdirectory (stack)
 
 ############# STATUS NOTIFIER #################
+message (STATUS "> Status Notifier:")
 if ("${DBUSMENU_GTK_FOUND}" STREQUAL "")
 	message (STATUS "Could not find Status-Notifier libs; Cairo-Dock won't be built with Status-Notifier support.")
+	message (WARNING "This module is required to compile Status Notifier applet: dbusmenu-gtk(-0.4)")
+	# set (MODULES_MISSING "${MODULES_MISSING} dbusmenu-gtk(-0.4)") # it should already be in the list.
+	set (with_status_notifier "no")
 else()
 	set (GETTEXT_STATUS_NOTIFIER ${GETTEXT_PLUGINS})
-	set (VERSION_STATUS_NOTIFIER "0.1.3")
+	set (VERSION_STATUS_NOTIFIER "0.1.4")
 	set (PACKAGE_STATUS_NOTIFIER "cd-status-notifier")
 	set (with_status_notifier "yes")
 	set (status_notifierdatadir "${pluginsdatadir}/Status-Notifier")
@@ -770,43 +985,51 @@
 endif()
 
 ############# SWITCHER #################
+message (STATUS "> Switcher:")
 set (GETTEXT_SWITCHER ${GETTEXT_PLUGINS})
-set (VERSION_SWITCHER "2.1.6")
+set (VERSION_SWITCHER "2.1.7")
 set (PACKAGE_SWITCHER "cd-switcher")
 set (switcherdatadir "${pluginsdatadir}/switcher")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/switcher/data/switcher.conf.in ${CMAKE_CURRENT_BINARY_DIR}/switcher/data/switcher.conf)
 add_subdirectory (switcher)
 
 ############# SYSTEM MONITOR #################
+message (STATUS "> System Monitor:")
 set (with_sensors "yes")
 find_package (Sensors)
 if (NOT "${SENSORS_FOUND}" STREQUAL "TRUE")
 	message (STATUS "Could not find libsensors; System-Monitor won't be able to monitor fan speed and CPU temperature.")
+	message (WARNING "This package is required to compile System Monitor applet with Sensors support: sensors")
+	set (PROGRAMS_MISSING "${PROGRAMS_MISSING} sensors")
 	set (with_sensors "no")
 endif()
 set (GETTEXT_SYSTEM_MONITOR ${GETTEXT_PLUGINS})
-set (VERSION_SYSTEM_MONITOR "1.0.6")
+set (VERSION_SYSTEM_MONITOR "1.0.7")
 set (PACKAGE_SYSTEM_MONITOR "cd-system-monitor")
 set (system_monitordatadir "${pluginsdatadir}/System-monitor")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/System-Monitor/data/System-Monitor.conf.in ${CMAKE_CURRENT_BINARY_DIR}/System-Monitor/data/System-Monitor.conf)
 add_subdirectory (System-Monitor)
 
 ############# SYSTRAY #################
+message (STATUS "> Systray:")
 set (GETTEXT_SYSTRAY ${GETTEXT_PLUGINS})
-set (VERSION_SYSTRAY "0.2.2")
+set (VERSION_SYSTRAY "0.2.3")
 set (PACKAGE_SYSTRAY "cd-systray")
 set (systraydatadir "${pluginsdatadir}/systray")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/systray/data/systray.conf.in ${CMAKE_CURRENT_BINARY_DIR}/systray/data/systray.conf)
 add_subdirectory (systray)
 
 ############# TERMINAL #################
+message (STATUS "> Terminal:")
 pkg_check_modules (TERMINAL_PACKAGE vte)
 if ("${TERMINAL_PACKAGE_FOUND}" STREQUAL "")
 	message (STATUS "Could not find libvte; Cairo-Dock won't be built with terminal applet.")
+	message (WARNING "This module is required to compile Terminal applet: vte")
+	set (MODULES_MISSING "${MODULES_MISSING} vte")
 	set (with_terminal "no")
 else()
 	set (GETTEXT_TERMINAL ${GETTEXT_PLUGINS})
-	set (VERSION_TERMINAL "1.0.10")
+	set (VERSION_TERMINAL "1.0.11")
 	set (PACKAGE_TERMINAL "cd-terminal")
 	set (with_terminal "yes")
 	set (terminaldatadir "${pluginsdatadir}/terminal")
@@ -815,16 +1038,18 @@
 endif()
 
 ############# TOMBOY #################
+message (STATUS "> Tomboy:")
 set (GETTEXT_TOMBOY ${GETTEXT_PLUGINS})
-set (VERSION_TOMBOY "1.3.1")
+set (VERSION_TOMBOY "1.3.2")
 set (PACKAGE_TOMBOY "cd-tomboy")
 set (tomboydatadir "${pluginsdatadir}/tomboy")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/tomboy/data/tomboy.conf.in ${CMAKE_CURRENT_BINARY_DIR}/tomboy/data/tomboy.conf)
 add_subdirectory (tomboy)
 
 ############# TOONS #################
+message (STATUS "> Toons:")
 set (GETTEXT_TOONS ${GETTEXT_PLUGINS})
-set (VERSION_TOONS "1.0.8")
+set (VERSION_TOONS "1.0.9")
 set (PACKAGE_TOONS "cd-Toons")
 set (toonsdatadir "${pluginsdatadir}/Toons")
 set (toonsuserdirname "Toons")
@@ -832,8 +1057,9 @@
 add_subdirectory (Toons)
 
 ############# WEATHER #################
+message (STATUS "> Weather:")
 set (GETTEXT_WEATHER ${GETTEXT_PLUGINS})
-set (VERSION_WEATHER "1.2.10")
+set (VERSION_WEATHER "1.2.11")
 set (PACKAGE_WEATHER "cd-weather")
 set (weatherdatadir "${pluginsdatadir}/weather")
 set (weatheruserdirname "weather")
@@ -841,14 +1067,17 @@
 add_subdirectory (weather)
 
 ############# WEBLETS #################
+message (STATUS "> Weblets:")
 set (with_weblets "no")
 if (NOT "${enable-weblets}" STREQUAL "no")
 	pkg_check_modules (WEBKIT webkit-1.0)
 	if ("${WEBKIT_FOUND}" STREQUAL "")
 		message (STATUS "Could not find webkit-1.0; Cairo-Dock won't be built with Weblets applet.")
+		message (WARNING "This module is required to compile Weblets applet: webkit-1.0")
+		set (MODULES_MISSING "${MODULES_MISSING} webkit-1.0")
 	else()
 		set (GETTEXT_WEBLETS ${GETTEXT_PLUGINS})
-		set (VERSION_WEBLETS "0.0.10")
+		set (VERSION_WEBLETS "0.0.11")
 		set (PACKAGE_WEBLETS "cd-weblets")
 		set (webletsdatadir "${pluginsdatadir}/weblets")
 		set (with_weblets "yes")
@@ -858,20 +1087,24 @@
 endif()
 
 ############# WIFI #################
+message (STATUS "> WiFi:")
 set (GETTEXT_WIFI ${GETTEXT_PLUGINS})
-set (VERSION_WIFI "1.2.6")
+set (VERSION_WIFI "1.2.7")
 set (PACKAGE_WIFI "cd-wifi")
 set (wifidatadir "${pluginsdatadir}/wifi")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/wifi/data/wifi.conf.in ${CMAKE_CURRENT_BINARY_DIR}/wifi/data/wifi.conf)
 add_subdirectory (wifi)
 
 ############# XFCE-INTEGRATION #################
+message (STATUS "> XFCE-Integration:")
 set (with_xfce_integration "no")
 if (NOT "${enable-xfce-integration}" STREQUAL "no")
 	pkg_check_modules (XFCE_INTEGRATION_THUNAR thunar-vfs-1)
 	pkg_check_modules (XFCE_INTEGRATION_GVFS gio-2.0)
 	if ("${XFCE_INTEGRATION_THUNAR_FOUND}" STREQUAL "" AND "${XFCE_INTEGRATION_GVFS_FOUND}" STREQUAL "")
 		message (STATUS "Could find neither thunar-vfs or libgio-2.0; Cairo-Dock won't be built with XFCE support.")
+		message (STATUS "This module is required to compile XFCE-Integration applet: gio-2.0 (or thunar-vfs-1)")
+		set (MODULES_INTEGRATION_MISSING "${MODULES_INTEGRATION_MISSING} gio-2.0")
 	else()
 		set (VERSION_XFCE_INTEGRATION "1.0.3")
 		set (PACKAGE_XFCE_INTEGRATION "cd_xfce-integration")
@@ -882,13 +1115,16 @@
 endif()
 
 ############# XGAMMA #################
+message (STATUS "> XGamma:")
 pkg_check_modules (XGAMMA_PACKAGE x11 xxf86vm)
 if ("${XGAMMA_PACKAGE_FOUND}" STREQUAL "")
 	message (STATUS "Could not find xxf86vm; Cairo-Dock won't be built with Xgamma applet.")
+	message (WARNING "These modules are required to compile XGamma applet: x11 and xxf86vm")
+	set (MODULES_MISSING "${MODULES_MISSING} x11 xxf86vm")
 	set (with_xgamma "no")
 else()
 	set (GETTEXT_XGAMMA ${GETTEXT_PLUGINS})
-	set (VERSION_XGAMMA "1.2.0")
+	set (VERSION_XGAMMA "1.2.1")
 	set (PACKAGE_XGAMMA "cd-Xgamma")
 	set (with_xgamma "yes")
 	set (xgammadatadir "${pluginsdatadir}/Xgamma")
@@ -926,16 +1162,37 @@
 message (STATUS " - with Weblets applet:            ${with_weblets}")
 message (STATUS " - with Xgamma applet:             ${with_xgamma}")
 message (STATUS " - with Recent-Events applet:      ${with_recent_events}")
+message (STATUS " - with UPower support:            ${with_upower_support}")
 message (STATUS " - with Python interface:          ${with_python}")
 message (STATUS " - with Ruby interface:            ${with_ruby}")
 message (STATUS " - with Mono interface:            ${with_mono}")
 message (STATUS " - with Vala interface:            ${with_vala}")
-message (STATUS " - with Vala Translator (valac) :  ${with_valac}")
+message (STATUS " - with Vala Translator (valac):   ${with_valac}")
 message (STATUS "Unstable:")
 message (STATUS " - with Disks applet:              ${with_disks}")
 message (STATUS " - with Doncky applet:             ${with_doncky}")
+message (STATUS " - with Impulse applet:            ${with_impulse}")
+message (STATUS " - with KDE experimental support:  ${with_kde_integration2}")
 message (STATUS " - with Network-Monitor applet:    ${with_network_monitor}")
 message (STATUS " - with Scooby-Do applet:          ${with_scooby_do}")
-message (STATUS "Unsupported:")
+message (STATUS "Deprecated:")
 message (STATUS " - with old Gnome support:         ${with_gnome_integration_old}")
+
+if (NOT "${MODULES_MISSING}" STREQUAL "")
+	message ("")
+	message (STATUS "WARNING: It seems that one (or more) module(s) is (are) missing:${MODULES_MISSING}")
+	message (STATUS "It can be interesting to install them (even more if you're a maintainer of Cairo-Dock's packages).")
+endif ()
+
+if (NOT "${PROGRAMS_MISSING}" STREQUAL "")
+	message ("")
+	message (STATUS "WARNING: It seems that one (or more) program(s) or package(s) is (are) missing:${PROGRAMS_MISSING}")
+	message (STATUS "It can be interesting to install them (even more if you're a maintainer of Cairo-Dock's packages).")
+endif ()
+
+if (NOT "${MODULES_INTEGRATION_MISSING}" STREQUAL "")
+	message ("")
+	message (STATUS "WARNING: It seems that one (or more) module(s) for the integration with the system is (are) missing:${MODULES_INTEGRATION_MISSING}")
+	message (STATUS "It's maybe not required for the user but it's recommended to install them if you're a maintainer of Cairo-Dock's packages.")
+endif ()
 message ("")

=== modified file 'Cairo-Penguin/data/Cairo-Penguin.conf.in'
--- Cairo-Penguin/data/Cairo-Penguin.conf.in	2011-04-20 20:46:51 +0000
+++ Cairo-Penguin/data/Cairo-Penguin.conf.in	2011-08-09 20:07:46 +0000
@@ -1,9 +1,9 @@
-#!en;@VERSION_CAIRO_PENGUIN@
+#@VERSION_CAIRO_PENGUIN@
 
 #[gtk-about]
 [Icon]
 
-#F[Applet]
+#F[Icon]
 frame_maininfo=
 
 #d Name of the dock it belongs to:
@@ -11,13 +11,12 @@
 
 #s Name of the icon as it will appear in its caption in the dock:
 name = 
-
-#F[Display]
-frame_display=
+ #v
+sep_display=
 
 icon =
 
-#j+[0;128] Icon size for busy penguin:
+#j+[0;128] Desired icon size for this applet
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 

=== modified file 'Clipper/data/Clipper.conf.in'
--- Clipper/data/Clipper.conf.in	2011-04-20 20:46:51 +0000
+++ Clipper/data/Clipper.conf.in	2011-08-09 20:07:46 +0000
@@ -1,23 +1,22 @@
-#!en;@VERSION_CLIPPER@
+#@VERSION_CLIPPER@
 
 #[gtk-about]
 [Icon]
 
-#F[Applet]
+#F[Icon]
 frame_maininfo=
 
 #d Name of the dock it belongs to:
 dock name = 
 
 #s Name of the icon as it will appear in its caption in the dock:
-name = Clipboard
-
-#F[Display]
-frame_display=
+name =
+ #v
+sep_display=
 
 #S+ Image filename:
 #{Leave empty to use the default one.}
-icon = 
+icon=accessories-text-editor.svg
 
 #j+[0;128] Desired icon size for this applet
 #{Set to 0 to use the default applet size}

=== modified file 'Clipper/src/applet-clipboard.c'
--- Clipper/src/applet-clipboard.c	2011-04-20 20:46:51 +0000
+++ Clipper/src/applet-clipboard.c	2011-08-09 20:07:46 +0000
@@ -451,6 +451,9 @@
 			pImage = gtk_image_new_from_pixbuf (pixbuf);
 			g_free (cIconFilePath);
 			g_object_unref (pixbuf);
+#if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
+			gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (pMenuItem), TRUE);
+#endif
 			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (pMenuItem), pImage);
 		}
 		gtk_menu_shell_append  (GTK_MENU_SHELL (pMenu), pMenuItem);

=== added directory 'Composite-Manager'
=== added file 'Composite-Manager/CMakeLists.txt'
--- Composite-Manager/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ Composite-Manager/CMakeLists.txt	2011-08-09 20:07:46 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(src)
+add_subdirectory(data)

=== added directory 'Composite-Manager/data'
=== added file 'Composite-Manager/data/CMakeLists.txt'
--- Composite-Manager/data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ Composite-Manager/data/CMakeLists.txt	2011-08-09 20:07:46 +0000
@@ -0,0 +1,10 @@
+
+########### install files ###############
+
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Composite-Manager.conf
+	preview.jpg
+	icon.png
+	composite-on.png
+	composite-off.png
+	DESTINATION ${composite_managerdatadir})
+

=== added file 'Composite-Manager/data/Composite-Manager.conf.in'
--- Composite-Manager/data/Composite-Manager.conf.in	1970-01-01 00:00:00 +0000
+++ Composite-Manager/data/Composite-Manager.conf.in	2011-08-09 20:07:46 +0000
@@ -0,0 +1,137 @@
+#@VERSION_COMPOSITE_MANAGER@
+
+#[gtk-about]
+[Icon]
+
+#F[Icon]
+frame_maininfo=
+
+#d Name of the dock it belongs to:
+dock name = 
+
+#s Name of the icon as it will appear in its caption in the dock:
+name = 
+ #v
+sep_display=
+
+icon = 
+
+#j[0;128] Desired icon size for this applet
+#{Set to 0 to use the default applet size}
+icon size = 0;0
+
+order=
+
+#F[Applet's Handbook]
+frame_hand=
+#A
+handbook=Composite-Manager
+
+
+#[gtk-convert]
+[Desklet]
+
+#X[Position]
+frame_pos =
+
+#b Lock position?
+#{If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.}
+locked = false
+
+#j+[24;512] Desklet dimensions (width x height):
+#{Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.}
+size = 96;96
+
+#i[-2048;2048] Desklet position (x, y):
+#{Depending on your WindowManager, you may be able to move this with ALT + left-click.. Negative values are counted from the right/bottom of the screen}
+x position=0
+#i[-2048;2048] ...
+y position=0
+
+#I[-180;180] Rotation:
+#{You can quickly rotate the desklet with the mouse, by dragging the little buttons on its left and top sides.}
+rotation = 0
+
+#X[Visibility]
+frame_visi =
+
+#b Is detached from the dock
+initially detached=false
+#l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
+accessibility=0
+#b Should be visible on all desktops?
+sticky=true
+
+
+#F[Decorations;gtk-orientation-portrait]
+frame_deco=
+
+#o+ Choose a decoration theme for this desklet:
+#{Choose 'Custom decorations' to define your own decorations below.}
+decorations = default
+
+#v
+sep_deco =
+
+#S+ Background image:
+#{Image to be displayed below drawings, e.g. a frame. Leave empty for no image.}
+bg desklet =
+#e+[0;1] Background transparency:
+bg alpha = 1
+#i+[0;256] Left offset:
+#{in pixels. Use this to adjust the left position of drawings.}
+left offset = 0
+#i+[0;256] Top offset:
+#{in pixels. Use this to adjust the top position of drawings.}
+top offset = 0
+#i+[0;256] Right offset:
+#{in pixels. Use this to adjust the right position of drawings.}
+right offset = 0
+#i+[0;256] Bottom offset:
+#{in pixels. Use this to adjust the bottom position of drawings.}
+bottom offset = 0
+#S+ Foreground image:
+#{Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.}
+fg desklet =
+#e+[0;1] Foreground tansparency:
+fg alpha = 1
+
+
+#[gtk-preferences]
+[Configuration]
+
+#F[Style;gtk-color-picker]
+frame_style =
+
+#S+ Image when composite is active:
+#{Leave empty to use the default one.}
+icon on = 
+
+#S+ Image when composite is inactive:
+#{Leave empty to use the default one.}
+icon off = 
+
+
+#F[Behaviour;gtk-execute]
+frame_behav =
+
+#E[;Compiz;KWin;Xfwm;Metacity] Composite window-manager:
+#{Let empty to use the default one. Alternatively, you can set any command you want.}
+compositor =
+
+#E[;Compiz;KWin;Xfwm;Metacity] Fallback window-manager:
+#{Let empty to use the default one. Alternatively, you can set any command you want.}
+fallback =
+
+#b Ask before switching:
+ask = true
+
+#v
+sep_act=
+
+#l[Edit Window-Manager settings;Reload Window-Manager;Show desktop;Expose all the desktops;Expose all the windows;Show the Widget Layer] Action on middle-click:
+action on click = 0
+
+#k Shortkey to toggle the composite ON/OFF:
+shortkey = <Control>F12

=== added file 'Composite-Manager/data/composite-off.png'
Binary files Composite-Manager/data/composite-off.png	1970-01-01 00:00:00 +0000 and Composite-Manager/data/composite-off.png	2011-08-09 20:07:46 +0000 differ
=== added file 'Composite-Manager/data/composite-on.png'
Binary files Composite-Manager/data/composite-on.png	1970-01-01 00:00:00 +0000 and Composite-Manager/data/composite-on.png	2011-08-09 20:07:46 +0000 differ
=== added file 'Composite-Manager/data/icon.png'
Binary files Composite-Manager/data/icon.png	1970-01-01 00:00:00 +0000 and Composite-Manager/data/icon.png	2011-08-09 20:07:46 +0000 differ
=== added file 'Composite-Manager/data/preview.jpg'
Binary files Composite-Manager/data/preview.jpg	1970-01-01 00:00:00 +0000 and Composite-Manager/data/preview.jpg	2011-08-09 20:07:46 +0000 differ
=== added directory 'Composite-Manager/src'
=== added file 'Composite-Manager/src/CMakeLists.txt'
--- Composite-Manager/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ Composite-Manager/src/CMakeLists.txt	2011-08-09 20:07:46 +0000
@@ -0,0 +1,39 @@
+
+########### sources ###############
+
+SET(MODULE_SRCS
+	applet-struct.h
+	applet-init.c 				applet-init.h
+	applet-config.c 			applet-config.h
+	applet-composite-manager.c	applet-composite-manager.h
+	applet-notifications.c 		applet-notifications.h
+)
+
+add_library(${PACKAGE_COMPOSITE_MANAGER} SHARED ${MODULE_SRCS})
+
+########### compil ###############
+add_definitions (-DMY_APPLET_SHARE_DATA_DIR="${composite_managerdatadir}")
+add_definitions (-DMY_APPLET_PREVIEW_FILE="preview.jpg")
+add_definitions (-DMY_APPLET_CONF_FILE="Composite-Manager.conf")
+add_definitions (-DMY_APPLET_USER_DATA_DIR="Composite-Manager")
+add_definitions (-DMY_APPLET_VERSION="${VERSION_COMPOSITE_MANAGER}")
+add_definitions (-DMY_APPLET_GETTEXT_DOMAIN="${GETTEXT_COMPOSITE_MANAGER}")
+add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}")
+add_definitions (-DMY_APPLET_ICON_FILE="icon.png")
+### uncomment the following line to allow multi-instance applet.
+#add_definitions (-DCD_APPLET_MULTI_INSTANCE="1")
+### uncomment the following line to allow extended OpenGL drawing.
+#add_definitions (-DGL_GLEXT_PROTOTYPES="1")
+
+include_directories (
+	${PACKAGE_INCLUDE_DIRS})
+
+link_directories (
+	${PACKAGE_LIBRARY_DIRS})
+
+target_link_libraries (${PACKAGE_COMPOSITE_MANAGER}
+	${PACKAGE_LIBRARIES})
+
+########### install files ###############
+
+install(TARGETS ${PACKAGE_COMPOSITE_MANAGER} DESTINATION ${pluginsdir})

=== added file 'Composite-Manager/src/applet-composite-manager.c'
--- Composite-Manager/src/applet-composite-manager.c	1970-01-01 00:00:00 +0000
+++ Composite-Manager/src/applet-composite-manager.c	2011-08-09 20:07:46 +0000
@@ -0,0 +1,535 @@
+/**
+* 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/>.
+*/
+
+#define _BSD_SOURCE
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <glib/gstdio.h>
+#include <cairo-dock.h>
+
+#include "applet-struct.h"
+#include "applet-composite-manager.h"
+
+
+  ///////////////////
+ /// WM BACKENDS ///
+///////////////////
+
+static CDWM *_get_wm_by_name (const gchar *cName)
+{
+	int i;
+	for (i = 0; i < NB_WM; i ++)
+	{
+		if (strcmp (cName, myData.pWmList[i].cName) == 0)
+			return &myData.pWmList[i];
+	}
+	return NULL;
+}
+static CDWM *_get_wm_by_index (CDWMIndex n)
+{
+	if (n < NB_WM)
+		return &myData.pWmList[n];
+	else
+		return NULL;
+}
+
+static void _set_metacity_composite (gboolean bActive)
+{
+	int r;
+	if (bActive)
+		r = system ("gconftool-2 -s '/apps/metacity/general/compositing_manager' --type bool true");
+	else
+		r = system ("gconftool-2 -s '/apps/metacity/general/compositing_manager' --type bool false");
+}
+static void _set_xfwm_composite (gboolean bActive)
+{
+	int r;
+	if (bActive)
+		r = system ("xfconf-query -c xfwm4 -p '/general/use_compositing' -t 'bool' -s 'true'");
+	else
+		r = system ("xfconf-query -c xfwm4 -p '/general/use_compositing' -t 'bool' -s 'false'");
+}
+static void _set_kwin_composite (gboolean bActive)
+{
+	int r;
+	if (bActive)
+		r = system ("if test \"`qdbus org.kde.kwin /KWin compositingActive`\" = \"false\";then qdbus org.kde.kwin /KWin toggleCompositing; fi");  // not active, so activating
+	else
+		r = system ("if test \"`qdbus org.kde.kwin /KWin compositingActive`\" = \"true\"; then qdbus org.kde.kwin /KWin toggleCompositing; fi");  // active, so deactivating
+}
+static void _define_known_wms (void)
+{
+	myData.pWmList[CD_COMPIZ].cName = "Compiz";
+	myData.pWmList[CD_COMPIZ].cCommand = "compiz --replace";
+	myData.pWmList[CD_COMPIZ].activate_composite = NULL;
+	myData.pWmList[CD_COMPIZ].cConfigTool = "ccsm";
+	
+	myData.pWmList[CD_KWIN].cName = "KWin";
+	myData.pWmList[CD_KWIN].cCommand = "kwin --replace";
+	myData.pWmList[CD_KWIN].activate_composite = _set_kwin_composite;
+	myData.pWmList[CD_KWIN].cConfigTool = NULL;  /// TODO: find the config tool...
+	
+	myData.pWmList[CD_XFWM].cName = "Xfwm";
+	myData.pWmList[CD_XFWM].cCommand = "xfwm4 --replace";
+	myData.pWmList[CD_XFWM].activate_composite = _set_xfwm_composite;
+	myData.pWmList[CD_XFWM].cConfigTool = "xfwm4-settings";  // there is also xfwm4-tweaks-settings, wish they merge both ...
+	
+	myData.pWmList[CD_METACITY].cName = "Metacity";
+	myData.pWmList[CD_METACITY].cCommand = "metacity --replace";
+	myData.pWmList[CD_METACITY].activate_composite = _set_metacity_composite;
+	myData.pWmList[CD_METACITY].cConfigTool = "gconf-editor /apps/metacity";
+	
+	myData.pWmList[CD_CUSTOM_WMFB].cName = "Fallback";
+	myData.pWmList[CD_CUSTOM_WMFB].cCommand = NULL;
+	myData.pWmList[CD_CUSTOM_WMFB].activate_composite = NULL;
+	myData.pWmList[CD_CUSTOM_WMFB].bIsAvailable = TRUE;
+	
+	myData.pWmList[CD_CUSTOM_WMC].cName = "Composite";
+	myData.pWmList[CD_CUSTOM_WMC].cCommand = NULL;
+	myData.pWmList[CD_CUSTOM_WMC].activate_composite = NULL;
+	myData.pWmList[CD_CUSTOM_WMC].bIsAvailable = TRUE;
+}
+
+static void _check_available_wms (gchar *cWhich)
+{
+	if (cWhich == NULL)  // no known WM is present, skip the check.
+		return;
+	
+	CDWM *wm;
+	wm = _get_wm_by_index (CD_COMPIZ);
+	wm->bIsAvailable = (strstr (cWhich, "compiz") != NULL);
+	wm = _get_wm_by_index (CD_KWIN);
+	wm->bIsAvailable = (strstr (cWhich, "kwin") != NULL);
+	wm = _get_wm_by_index (CD_XFWM);
+	wm->bIsAvailable = (strstr (cWhich, "xfwm4") != NULL);
+	wm = _get_wm_by_index (CD_METACITY);
+	wm->bIsAvailable = (strstr (cWhich, "metacity") != NULL);
+}
+
+static CDWMIndex _check_current_wm (gchar *cPs)
+{
+	if (cPs == NULL)  // no known WM is present, skip the check.
+		return -1;
+	
+	if (strstr (cPs, "compiz") != NULL)
+		return CD_COMPIZ;
+	if (strstr (cPs, "kwin") != NULL)
+		return CD_KWIN;
+	if (strstr (cPs, "xfwm4") != NULL)
+		return CD_XFWM;
+	if (strstr (cPs, "metacity") != NULL)
+		return CD_METACITY;
+	
+	return -1;
+}
+
+
+  ////////////////////////
+ /// COMPOSITE SIGNAL ///
+////////////////////////
+
+static void _on_composited_changed (GdkScreen *pScreen, gpointer data)
+{
+	myData.bIsComposited = gdk_screen_is_composited (pScreen);
+	cd_draw_current_state ();
+}
+static void _start_watching_composite_state (void)
+{
+	// get the current state.
+	GdkScreen *pScreen = gdk_screen_get_default ();
+	myData.bIsComposited = gdk_screen_is_composited (pScreen);
+	
+	// draw it.
+	cd_draw_current_state ();
+	
+	// listen for future changes.
+	g_signal_connect (G_OBJECT (pScreen), "composited-changed", G_CALLBACK(_on_composited_changed), NULL);
+}
+
+
+  ///////////////////
+ /// PREFERED WM ///
+///////////////////
+
+static CDWM *_get_prefered_wmc (CDWMIndex iCurrentWm)
+{
+	g_print ("%s (%s, %d)\n", __func__, myConfig.cWmCompositor, iCurrentWm);
+	CDWM *wm;
+	if (myConfig.cWmCompositor != NULL)  // a composite WM is defined.
+	{
+		wm = _get_wm_by_name (myConfig.cWmCompositor);
+		if (wm == NULL)  // not one of the known WM -> define and take the custom one.
+		{
+			wm = _get_wm_by_index (CD_CUSTOM_WMC);
+			g_free ((gchar*)wm->cCommand);
+			wm->cCommand = g_strdup (myConfig.cWmCompositor);
+			return wm;
+		}
+		else if (wm->bIsAvailable)
+			return wm;
+	}
+	
+	// no WM defined, or the one defined is not available -> check if a suitable one is running.
+	if (iCurrentWm < NB_WM)  // one of the know WM is running
+	{
+		if (myData.bIsComposited)  // and it provides composite => let's take it!
+		{
+			wm = _get_wm_by_index (iCurrentWm);
+			if (wm->bIsAvailable)  // just to be sure.
+				return wm;
+		}
+	}
+	
+	// no succes so far, take the most suitable one.
+	int index[NB_COMPOSITE_WM] = {CD_COMPIZ, CD_KWIN, CD_XFWM, CD_METACITY};  // in this order by default.
+	switch (g_iDesktopEnv)
+	{
+		case CAIRO_DOCK_GNOME:
+			index[1] = CD_METACITY;
+			index[3] = CD_KWIN;
+		break;
+		case CAIRO_DOCK_XFCE:
+			index[1] = CD_XFWM;
+			index[2] = CD_KWIN;
+		break;
+		case CAIRO_DOCK_KDE:
+		default:
+		break;
+	}
+	int i;
+	for (i = 0; i < NB_COMPOSITE_WM; i ++)
+	{
+		wm = _get_wm_by_index (index[i]);
+		g_print (" %d) %s, %d\n", index[i], wm->cName, wm->bIsAvailable);
+		if (wm->bIsAvailable)
+			return wm;
+	}
+	return NULL;
+}
+
+static CDWM *_get_prefered_wmfb (CDWMIndex iCurrentWm)
+{
+	g_print ("%s (%s, %d)\n", __func__, myConfig.cWmFallback, iCurrentWm);
+	CDWM *wm;
+	if (myConfig.cWmFallback != NULL)  // a fallback WM is defined.
+	{
+		wm = _get_wm_by_name (myConfig.cWmFallback);
+		if (wm == NULL)  // not one of the known WM -> define and take the custom one.
+		{
+			wm = _get_wm_by_index (CD_CUSTOM_WMFB);
+			g_free ((gchar*)wm->cCommand);
+			wm->cCommand = g_strdup (myConfig.cWmFallback);
+			return wm;
+		}
+		else if (wm->bIsAvailable)
+			return wm;
+	}
+	
+	// no WM defined, or the one defined is not available -> check if a suitable one is running.
+	if (iCurrentWm < NB_WM)  // one of the know WM is running
+	{
+		if (!myData.bIsComposited)  // and it is a fallback => let's take it!
+		{
+			wm = _get_wm_by_index (iCurrentWm);
+			g_print ("current wm: %d, %d\n", iCurrentWm, wm->bIsAvailable);
+			if (wm->bIsAvailable)  // just to be sure.
+				return wm;
+		}
+	}
+	
+	// no succes so far, take the most suitable one.
+	int index[NB_FALLBACK_WM] = {CD_METACITY, CD_XFWM, CD_KWIN};  // in this order by default.
+	switch (g_iDesktopEnv)
+	{
+		case CAIRO_DOCK_GNOME:
+			index[0] = CD_METACITY;
+			index[1] = CD_XFWM;
+		break;
+		case CAIRO_DOCK_XFCE:
+			index[0] = CD_XFWM;
+			index[1] = CD_METACITY;
+		break;
+		case CAIRO_DOCK_KDE:
+			index[0] = CD_KWIN;
+			index[1] = CD_METACITY;
+			index[2] = CD_XFWM;
+		break;
+	}
+	int i;
+	for (i = 0; i < NB_FALLBACK_WM; i ++)
+	{
+		wm = _get_wm_by_index (index[i]);
+		g_print ("  %s (%d)\n", wm->cName, wm->bIsAvailable);
+		if (wm->bIsAvailable)
+			return wm;
+	}
+	return NULL;
+}
+
+static inline gchar *_get_running_wm (void)
+{
+	return cairo_dock_launch_command_sync ("pgrep -l \"kwin$|compiz$|xfwm4$|metacity$\"");  // -l = write the name of the program (not the command next to the PID in 'ps -ef'. we add a '$' after the names to avoid listing things like compiz-decorator or xfwm4-settings
+}
+static void _define_prefered_wms (gchar *cPs)
+{
+	// get the compositor and fallback WMs
+	CDWMIndex iCurrentWm = _check_current_wm (cPs);
+	myData.wmc = _get_prefered_wmc (iCurrentWm);
+	myData.wmfb = _get_prefered_wmfb (iCurrentWm);
+	g_print ("***** WM: %s / %s\n", myData.wmc?myData.wmc->cName:NULL, myData.wmfb?myData.wmfb->cName:NULL);
+}
+void cd_define_prefered_wms (void)
+{
+	gchar *ps = _get_running_wm ();
+	_define_prefered_wms (ps);
+	g_free (ps);
+}
+
+  /////////////////
+ /// INIT/STOP ///
+/////////////////
+
+static void _check_wms (CDSharedMemory *pSharedMemory)
+{
+	pSharedMemory->which = cairo_dock_launch_command_sync ("which compiz kwin xfwm4 metacity");
+	
+	pSharedMemory->ps = _get_running_wm ();
+}
+static void _update_from_data (CDSharedMemory *pSharedMemory)
+{
+	_check_available_wms (pSharedMemory->which);
+	
+	_define_prefered_wms (pSharedMemory->ps);  // we do it once we know the current state.
+	
+	cairo_dock_discard_task (myData.pTask);
+	myData.pTask = NULL;
+}
+
+static void _free_shared_memory (CDSharedMemory *pSharedMemory)
+{
+	g_free (pSharedMemory->which);
+	g_free (pSharedMemory->ps);
+	g_free (pSharedMemory);
+}
+void cd_init_wms (void)
+{
+	_define_known_wms ();
+	
+	_start_watching_composite_state ();
+	
+	CDSharedMemory *pSharedMemory = g_new0 (CDSharedMemory, 1);
+	myData.pTask = cairo_dock_new_task_full (0,  // one-shot
+		(CairoDockGetDataAsyncFunc) _check_wms,
+		(CairoDockUpdateSyncFunc) _update_from_data,
+		(GFreeFunc) _free_shared_memory,
+		pSharedMemory);
+	cairo_dock_launch_task_delayed (myData.pTask, 3000);  // 3s delay, since we don't need these info right away.
+}
+
+
+void cd_stop_wms (void)
+{
+	// discard task.
+	cairo_dock_discard_task (myData.pTask);
+	
+	// stop listening
+	GdkScreen *pScreen = gdk_screen_get_default ();
+	g_signal_handlers_disconnect_by_func (G_OBJECT(pScreen), _on_composited_changed, NULL);
+	
+	// reset custom WMs.
+	CDWM *wm;
+	wm = _get_wm_by_index (CD_CUSTOM_WMC);
+	g_free ((gchar*)wm->cCommand);
+	wm = _get_wm_by_index (CD_CUSTOM_WMFB);
+	g_free ((gchar*)wm->cCommand);
+}
+
+
+  ////////////
+ /// DRAW ///
+////////////
+
+void cd_draw_current_state (void)
+{
+	g_print ("%s (%d)\n", __func__, myData.bIsComposited);
+	if (myData.bIsComposited)
+		CD_APPLET_SET_USER_IMAGE_ON_MY_ICON (myConfig.cIconCompositeON, "composite-on.png");
+	else
+		CD_APPLET_SET_USER_IMAGE_ON_MY_ICON (myConfig.cIconCompositeOFF, "composite-off.png");
+}
+
+
+  /////////////////////
+ /// TOGGLE ON/OFF ///
+/////////////////////
+
+static gboolean _activate_composite_delayed (gpointer data)
+{
+	if (data)
+	{
+		if (myData.wmc->activate_composite != NULL)
+			myData.wmc->activate_composite (TRUE);
+	}
+	else
+	{
+		if (myData.wmfb->activate_composite != NULL)
+			myData.wmfb->activate_composite (FALSE);
+	}
+	return FALSE;
+}
+
+static gboolean _wm_is_running (CDWM *wm)
+{
+	const gchar *cCommand = wm->cCommand;
+	gchar *cWhich = g_strdup_printf ("pgrep %s$", cCommand);  // see above for the '$' character.
+	gchar *str = strchr (cWhich+6, ' ');  // remove any parameter to the command, we just want the program name.
+	if (str)  // a space is found.
+	{
+		*str = '$';
+		*(str+1) = '\0';
+	}
+	gchar *cResult = cairo_dock_launch_command_sync (cWhich);
+	gboolean bIsRunning = (cResult != NULL && *cResult != '\0');
+	
+	g_free (cWhich);
+	g_free (cResult);
+	return bIsRunning;
+}
+
+static void cd_turn_composite_on (void)
+{
+	if (myData.wmc == NULL)  // no compositor.
+	{
+		cairo_dock_show_temporary_dialog_with_icon (D_("No compositor is available."), myIcon, myContainer, 6000, "same icon");
+		return;
+	}
+	
+	// if not already launched, launch it.
+	if (! _wm_is_running (myData.wmc))  // not running
+	{
+		cairo_dock_launch_command (myData.wmc->cCommand);
+		g_timeout_add_seconds (2, _activate_composite_delayed, GINT_TO_POINTER (1));  // let the WM start for 2s.
+	}
+	else  // already running, just toggle composite ON.
+	{
+		if (myData.wmc->activate_composite != NULL)
+			myData.wmc->activate_composite (TRUE);
+		else
+			cairo_dock_show_temporary_dialog_with_icon (D_("No compositor is available."), myIcon, myContainer, 6000, "same icon");
+	}
+}
+
+static void cd_turn_composite_off (void)
+{
+	if (myData.wmfb == NULL)  // no fallback.
+	{
+		cairo_dock_show_temporary_dialog_with_icon (D_("No fallback is available."), myIcon, myContainer, 6000, "same icon");
+		return;
+	}
+	
+	// if not already launched, launch it.
+	if (! _wm_is_running (myData.wmfb))  // not running
+	{
+		cairo_dock_launch_command (myData.wmfb->cCommand);
+		g_timeout_add_seconds (2, _activate_composite_delayed, 0);  // let the WM start for 2s.
+	}
+	else  // already running, just toggle composite OFF.
+	{
+		if (myData.wmfb->activate_composite != NULL)
+			myData.wmfb->activate_composite (FALSE);
+		else
+			cairo_dock_show_temporary_dialog_with_icon (D_("No fallback is available."), myIcon, myContainer, 6000, "same icon");
+	}
+}
+
+void cd_toggle_composite (void)
+{
+	if (myData.bIsComposited)
+		cd_turn_composite_off ();
+	else
+		cd_turn_composite_on ();
+}
+
+
+  ///////////////////
+ /// CONFIG TOOL ///
+///////////////////
+
+static const gchar *_get_config_tool (void)
+{
+	if (myData.bIsComposited && myData.wmc)
+	{
+		return myData.wmc->cConfigTool;
+	}
+	else if (!myData.bIsComposited && myData.wmfb)
+	{
+		return myData.wmfb->cConfigTool;
+	}
+	return NULL;
+}
+void cd_open_wm_config (void)
+{
+	const gchar *cConfigTool = _get_config_tool ();
+	
+	if (cConfigTool != NULL)
+	{
+		gchar *cmd = g_strdup_printf ("which %s", cConfigTool);
+		gchar *cResult = cairo_dock_launch_command_sync (cmd);
+		g_free (cmd);
+		if (cResult == NULL || *cResult != '/')
+      	{
+			gchar *msg = g_strdup_printf (D_("You need to install '%s'"), cConfigTool);
+			cairo_dock_show_temporary_dialog_with_icon (msg, myIcon, myContainer, 6000, "same icon");
+			g_free (msg);
+      	}
+		else
+		{
+			cairo_dock_launch_command (cConfigTool);
+		}
+	}
+	else
+	{
+		cairo_dock_show_temporary_dialog_with_icon (D_("No configuration tool is available."), myIcon, myContainer, 6000, "same icon");
+	}
+}
+
+
+static const gchar *_get_command (void)
+{
+	if (myData.bIsComposited && myData.wmc)
+	{
+		return myData.wmc->cCommand;
+	}
+	else if (!myData.bIsComposited && myData.wmfb)
+	{
+		return myData.wmfb->cCommand;
+	}
+	return NULL;
+}
+
+void cd_reload_wm (void)
+{
+	const gchar *cCommand = _get_command ();
+	if (cCommand != NULL)
+	{
+		cairo_dock_launch_command (cCommand);
+	}
+}

=== added file 'Composite-Manager/src/applet-composite-manager.h'
--- Composite-Manager/src/applet-composite-manager.h	1970-01-01 00:00:00 +0000
+++ Composite-Manager/src/applet-composite-manager.h	2011-08-09 20:07:46 +0000
@@ -0,0 +1,46 @@
+/**
+* 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 __APPLET_COMPOSITE_MANAGER__
+#define  __APPLET_COMPOSITE_MANAGER__
+
+#include <cairo-dock.h>
+
+
+void cd_init_wms (void);
+
+void cd_stop_wms (void);
+
+
+void cd_define_prefered_wms (void);
+
+
+void cd_draw_current_state (void);
+
+
+void cd_toggle_composite (void);
+
+
+void cd_open_wm_config (void);
+
+
+void cd_reload_wm (void);
+
+
+#endif

=== added file 'Composite-Manager/src/applet-config.c'
--- Composite-Manager/src/applet-config.c	1970-01-01 00:00:00 +0000
+++ Composite-Manager/src/applet-config.c	2011-08-09 20:07:46 +0000
@@ -0,0 +1,63 @@
+/**
+* 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 <cairo-dock.h>
+
+#include "applet-struct.h"
+#include "applet-composite-manager.h"
+#include "applet-config.h"
+
+
+static void _cd_on_keybinding_pull (const char *keystring, gpointer user_data)
+{
+	cd_toggle_composite ();
+}
+
+CD_APPLET_GET_CONFIG_BEGIN
+	myConfig.cWmCompositor = CD_CONFIG_GET_STRING ("Configuration", "compositor");
+	myConfig.cWmFallback = CD_CONFIG_GET_STRING ("Configuration", "fallback");
+	
+	myConfig.cIconCompositeON = CD_CONFIG_GET_STRING ("Configuration", "icon on");
+	myConfig.cIconCompositeOFF = CD_CONFIG_GET_STRING ("Configuration", "icon off");
+	
+	myConfig.bAskBeforeSwitching = CD_CONFIG_GET_BOOLEAN ("Configuration", "ask");
+	
+	myConfig.iActionOnMiddleClick = CD_CONFIG_GET_INTEGER ("Configuration", "action on click");
+	
+	myConfig.cShortCut = CD_CONFIG_GET_STRING ("Configuration", "shortkey");
+	cd_keybinder_bind (myConfig.cShortCut, (CDBindkeyHandler)_cd_on_keybinding_pull, (gpointer)NULL);
+CD_APPLET_GET_CONFIG_END
+
+
+CD_APPLET_RESET_CONFIG_BEGIN
+	g_free (myConfig.cWmCompositor);
+	g_free (myConfig.cWmFallback);
+	g_free (myConfig.cIconCompositeON);
+	g_free (myConfig.cIconCompositeOFF);
+	if (myConfig.cShortCut)
+	{
+		cd_keybinder_unbind(myConfig.cShortCut, (CDBindkeyHandler)_cd_on_keybinding_pull);
+		g_free (myConfig.cShortCut);
+	}
+CD_APPLET_RESET_CONFIG_END
+
+
+CD_APPLET_RESET_DATA_BEGIN
+	
+CD_APPLET_RESET_DATA_END

=== added file 'Composite-Manager/src/applet-config.h'
--- Composite-Manager/src/applet-config.h	1970-01-01 00:00:00 +0000
+++ Composite-Manager/src/applet-config.h	2011-08-09 20:07:46 +0000
@@ -0,0 +1,30 @@
+/**
+* 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 __APPLET_CONFIG__
+#define  __APPLET_CONFIG__
+
+#include <cairo-dock.h>
+
+
+CD_APPLET_CONFIG_H
+
+
+#endif

=== added file 'Composite-Manager/src/applet-init.c'
--- Composite-Manager/src/applet-init.c	1970-01-01 00:00:00 +0000
+++ Composite-Manager/src/applet-init.c	2011-08-09 20:07:46 +0000
@@ -0,0 +1,73 @@
+/**
+* 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 "applet-config.h"
+#include "applet-notifications.h"
+#include "applet-struct.h"
+#include "applet-composite-manager.h"
+#include "applet-init.h"
+
+
+CD_APPLET_DEFINITION (N_("Composite-Manager"),
+	2, 3, 0,
+	CAIRO_DOCK_CATEGORY_APPLET_DESKTOP,
+	N_("This applet allows you to <b>toggle the composite ON/OFF</b>.\n"
+	"The composite is what allows transparency on the desktop, but it can slow down your PC, especially during games.\n"
+	"<b>Click</b> on the icon to switch the composite ON/OFF. You can define a <b>shortcut</b> for this action.\n"
+	"The applet also lets you acces to some actions of the Window-Manager, from <b>middle-click and the menu</b>.\n"
+	"You can define in the configuration a Window-Manager that will provide the composite, and another as a fallback."),
+	"Fabounet")
+
+
+CD_APPLET_INIT_BEGIN
+	if (myDesklet)
+	{
+		CD_APPLET_SET_DESKLET_RENDERER ("Simple");
+	}
+	
+	cd_init_wms ();
+	
+	CD_APPLET_REGISTER_FOR_CLICK_EVENT;
+	CD_APPLET_REGISTER_FOR_MIDDLE_CLICK_EVENT;
+	CD_APPLET_REGISTER_FOR_BUILD_MENU_EVENT;
+CD_APPLET_INIT_END
+
+
+CD_APPLET_STOP_BEGIN
+	cd_stop_wms ();
+	
+	CD_APPLET_UNREGISTER_FOR_CLICK_EVENT;
+	CD_APPLET_UNREGISTER_FOR_MIDDLE_CLICK_EVENT;
+	CD_APPLET_UNREGISTER_FOR_BUILD_MENU_EVENT;
+CD_APPLET_STOP_END
+
+
+CD_APPLET_RELOAD_BEGIN
+	if (CD_APPLET_MY_CONFIG_CHANGED)
+	{
+		if (myDesklet && CD_APPLET_MY_CONTAINER_TYPE_CHANGED)  // we are now in a desklet, set a renderer.
+		{
+			CD_APPLET_SET_DESKLET_RENDERER ("Simple");
+		}
+		
+		cd_define_prefered_wms ();
+		
+		cd_draw_current_state ();
+	}
+CD_APPLET_RELOAD_END

=== added file 'Composite-Manager/src/applet-init.h'
--- Composite-Manager/src/applet-init.h	1970-01-01 00:00:00 +0000
+++ Composite-Manager/src/applet-init.h	2011-08-09 20:07:46 +0000
@@ -0,0 +1,31 @@
+/**
+* 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 __APPLET_INIT__
+#define  __APPLET_INIT__
+
+
+#include <cairo-dock.h>
+
+
+CD_APPLET_H
+
+
+#endif

=== added file 'Composite-Manager/src/applet-notifications.c'
--- Composite-Manager/src/applet-notifications.c	1970-01-01 00:00:00 +0000
+++ Composite-Manager/src/applet-notifications.c	2011-08-09 20:07:46 +0000
@@ -0,0 +1,170 @@
+/**
+* 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/>.
+*/
+
+#define _BSD_SOURCE
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+
+#include "applet-struct.h"
+#include "applet-notifications.h"
+#include "applet-composite-manager.h"
+
+static void _on_answer (int iClickedButton, GtkWidget *pInteractiveWidget, gpointer data, CairoDialog *pDialog)
+{
+	if (iClickedButton == 0 || iClickedButton == -1)  // ok or Enter
+	{
+		cd_toggle_composite ();
+	}
+}
+
+CD_APPLET_ON_CLICK_BEGIN
+	if (myConfig.bAskBeforeSwitching)
+	{
+		cairo_dock_show_dialog_full (D_("Toggle composite?"), myIcon, myContainer, 0, "same icon", NULL, (CairoDockActionOnAnswerFunc)_on_answer, NULL, NULL);
+	}
+	else
+	{
+		cd_toggle_composite ();
+	}
+CD_APPLET_ON_CLICK_END
+
+		
+static void _cd_show_desktop (void)
+{
+	gboolean bDesktopIsVisible = cairo_dock_desktop_is_visible ();
+	cairo_dock_show_hide_desktop (! bDesktopIsVisible);
+}
+static void _cd_expose_windows (void)
+{
+	cairo_dock_wm_present_windows ();
+}
+static gboolean _cd_expose_windows_idle (gpointer data)
+{
+	_cd_expose_windows ();
+	return FALSE;
+}
+static void _cd_expose_desktops (void)
+{
+	cairo_dock_wm_present_desktops ();
+}
+static void _cd_show_widget_layer (void)
+{
+	cairo_dock_wm_show_widget_layer ();
+}
+
+CD_APPLET_ON_MIDDLE_CLICK_BEGIN
+	switch (myConfig.iActionOnMiddleClick)
+	{
+		
+		case CD_EDIT_CONFIG:
+		{
+			 cd_open_wm_config();
+		}
+		break;
+		case CD_RELOAD_WM:
+		{
+			 cd_reload_wm();
+		}
+		break;
+		case CD_SHOW_DESKTOP:
+		{
+			_cd_show_desktop ();
+		}
+		break;
+		case CD_EXPOSE_DESKTOPS:
+		{
+			_cd_expose_desktops ();
+		}
+		break;
+		case CD_EXPOSE_WINDOWS:
+		{
+			// ok this is just crazy: if you call the Scale dbus method of Compiz before the middle button is released, it doesn't work.
+			g_timeout_add (300, _cd_expose_windows_idle, NULL);
+		}
+		break;
+		case CD_SHOW_WIDGET_LAYER:
+		{
+			_cd_show_widget_layer ();
+		}
+		break;
+		default: // shouldn't happen.
+			cd_warning ("problem in the config!");
+		break;
+	}
+CD_APPLET_ON_MIDDLE_CLICK_END
+
+
+CD_APPLET_ON_BUILD_MENU_BEGIN
+	gchar *cLabel;
+	
+	cLabel = (myConfig.iActionOnMiddleClick == CD_EDIT_CONFIG ? g_strdup_printf ("%s (%s)", D_("Edit Window-Manager settings"), D_("middle-click")) : g_strdup (D_("Edit Window-Manager settings")));
+	CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel,
+		GTK_STOCK_EDIT,
+		cd_open_wm_config,
+		CD_APPLET_MY_MENU);
+	g_free (cLabel);
+	
+	cLabel = (myConfig.iActionOnMiddleClick == CD_RELOAD_WM ? g_strdup_printf ("%s (%s)", D_("Reload Window-Manager"), D_("middle-click")) : g_strdup (D_("Reload Window-Manager")));
+	CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel,
+		GTK_STOCK_REFRESH,
+		cd_reload_wm,
+		CD_APPLET_MY_MENU);
+	g_free (cLabel);
+	
+	CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU);
+	
+	cLabel = (myConfig.iActionOnMiddleClick == CD_SHOW_DESKTOP ? g_strdup_printf ("%s (%s)", D_("Show desktop"), D_("middle-click")) : g_strdup (D_("Show desktop")));
+	CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel,
+		MY_APPLET_SHARE_DATA_DIR"/../shared-images/show-desktop.svg",
+		_cd_show_desktop,
+		CD_APPLET_MY_MENU);
+	g_free (cLabel);
+	
+	if (cairo_dock_wm_can_present_desktops ())
+	{
+		cLabel = (myConfig.iActionOnMiddleClick == CD_EXPOSE_DESKTOPS ? g_strdup_printf ("%s (%s)", D_("Expose all the desktops"), D_("middle-click")) : g_strdup (D_("Expose all the desktops")));
+		CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel,
+			MY_APPLET_SHARE_DATA_DIR"/../shared-images/expose-desktops.svg",
+			_cd_expose_desktops,
+			CD_APPLET_MY_MENU);
+		g_free (cLabel);
+	}
+	if (cairo_dock_wm_can_present_windows ())
+	{
+		cLabel = (myConfig.iActionOnMiddleClick == CD_EXPOSE_WINDOWS ? g_strdup_printf ("%s (%s)", D_("Expose all the windows"), D_("middle-click")) : g_strdup (D_("Expose all the windows")));
+		CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel,
+			MY_APPLET_SHARE_DATA_DIR"/../shared-images/expose-windows.svg",
+			_cd_expose_windows,
+			CD_APPLET_MY_MENU);
+		g_free (cLabel);
+	}
+	if (cairo_dock_wm_can_show_widget_layer ())
+	{
+		cLabel = (myConfig.iActionOnMiddleClick == CD_SHOW_WIDGET_LAYER ? g_strdup_printf ("%s (%s)", D_("Show the Widget Layer"), D_("middle-click")) : g_strdup (D_("Show the Widget Layer")));
+		CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel,
+			GTK_STOCK_LEAVE_FULLSCREEN,
+			_cd_show_widget_layer,
+			CD_APPLET_MY_MENU);
+		g_free (cLabel);
+	}
+CD_APPLET_ON_BUILD_MENU_END

=== added file 'Composite-Manager/src/applet-notifications.h'
--- Composite-Manager/src/applet-notifications.h	1970-01-01 00:00:00 +0000
+++ Composite-Manager/src/applet-notifications.h	2011-08-09 20:07:46 +0000
@@ -0,0 +1,35 @@
+/**
+* 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 __APPLET_NOTIFICATIONS__
+#define  __APPLET_NOTIFICATIONS__
+
+
+#include <cairo-dock.h>
+
+
+
+CD_APPLET_ON_CLICK_H
+
+CD_APPLET_ON_BUILD_MENU_H
+
+CD_APPLET_ON_MIDDLE_CLICK_H
+
+#endif

=== added file 'Composite-Manager/src/applet-struct.h'
--- Composite-Manager/src/applet-struct.h	1970-01-01 00:00:00 +0000
+++ Composite-Manager/src/applet-struct.h	2011-08-09 20:07:46 +0000
@@ -0,0 +1,83 @@
+/**
+* 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_APPLET_STRUCT__
+#define  __CD_APPLET_STRUCT__
+
+#include <cairo-dock.h>
+
+typedef struct _CDWM {
+	const gchar *cName;
+	const gchar *cCommand;
+	const gchar *cConfigTool;
+	gboolean bIsAvailable;
+	void (*activate_composite) (gboolean bActive);
+} CDWM;
+
+typedef enum {
+	CD_COMPIZ,
+	CD_KWIN,
+	CD_XFWM,
+	CD_METACITY,
+	CD_CUSTOM_WMFB,
+	CD_CUSTOM_WMC,
+	NB_WM
+} CDWMIndex;
+
+#define NB_COMPOSITE_WM 4  // 4 of them can do composite
+#define NB_FALLBACK_WM 3  // 3 of them can do without
+
+typedef enum {
+	CD_EDIT_CONFIG,
+	CD_RELOAD_WM,
+	CD_SHOW_DESKTOP,
+	CD_EXPOSE_DESKTOPS,
+	CD_EXPOSE_WINDOWS,
+	CD_SHOW_WIDGET_LAYER,
+	CD_NB_ACTIONS
+	} CDWMAction;
+
+//\___________ structure containing the applet's configuration parameters.
+struct _AppletConfig {
+	gchar *cWmCompositor;
+	gchar *cWmFallback;
+	gchar *cIconCompositeON;
+	gchar *cIconCompositeOFF;
+	gboolean bAskBeforeSwitching;
+	CDWMAction iActionOnMiddleClick;
+	gchar *cShortCut;
+} ;
+
+typedef struct {
+	gchar *which;
+	gchar *ps;
+	} CDSharedMemory;
+
+//\___________ structure containing the applet's data, like surfaces, dialogs, results of calculus, etc.
+struct _AppletData {
+	CairoDockTask *pTask;
+	CDWM pWmList[NB_WM];
+	gboolean bIsComposited;
+	CDWM *wmc;
+	CDWM *wmfb;
+} ;
+
+
+#endif

=== modified file 'Dbus/data/Dbus.conf.in'
--- Dbus/data/Dbus.conf.in	2011-04-20 20:46:51 +0000
+++ Dbus/data/Dbus.conf.in	2011-08-09 20:07:46 +0000
@@ -1,4 +1,4 @@
-#!en;@VERSION_DBUS@
+#@VERSION_DBUS@
 
 #[gtk-preferences]
 [Configuration]

=== added file 'Dbus/demos/demo_vala/demo_vala.conf'
--- Dbus/demos/demo_vala/demo_vala.conf	1970-01-01 00:00:00 +0000
+++ Dbus/demos/demo_vala/demo_vala.conf	2011-08-09 20:07:46 +0000
@@ -0,0 +1,101 @@
+#!en;0.0.2
+
+#[gtk-about]
+[Icon]
+#j+[0;128] Desired icon size for this applet
+#{Set to 0 to use the default applet size}
+icon size = 0;0
+
+#s Name of the icon as it will appear in its label in the dock :
+name = Dbus Applet
+
+#S+ Image's filename :
+#{Let empty to use the default one.}
+icon = 
+
+#d Name of the dock it belongs to:
+dock name = 
+
+order=
+
+#F[Applet's Handbook]
+frame_hand=
+#A
+handbook=demo_vala
+
+#[gtk-convert]
+[Desklet]
+
+#j+[48;512] Desklet's dimension (width x height) :
+#{Depending on your WindowManager, you can resize it with ALT + middle_click or ALT + left_click for exemple.}
+size = 164;96
+
+#i[-2048;2048] Desklet's position (x ; y) :
+#{Depending on your WindowManager, you can move it with ALT + left_click}
+x position=0
+#i[-2048;2048] ...
+y position=0
+
+#b Is detached from the dock ?
+initially detached=false
+#l[Normal;Keep above;Keep below;On Widget Layer;Reserve space] Accessibility :
+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
+accessibility=0
+#b Should be visible on all desktops ?
+sticky=true
+
+#b Lock position ?
+#{If locked, the desklet can't be moved by simply dragging it with the left mouse button. Of course you can still move it with ALT + left_click.}
+locked = false
+
+#I[-180;180] Rotation :
+#{in degrees.}
+rotation = 0
+
+use size=
+
+#F[Decorations;gtk-orientation-portrait]
+frame_deco=
+
+#o+ Choose a decoration theme for this desklet :
+#{Choose the 'personnal' one to define your own decorations below.}
+decorations = default
+
+#v
+sep_deco =
+
+#S+ Background image :
+#{It's an image that will be displayed below the drawings, like a frame for exemple. Let empty to not use any.}
+bg desklet =
+#e+[0;1] Background tansparency :
+bg alpha = 1
+#i+[0;256] Left offset :
+#{in pixels. Use this to adjust the left position of the drawings.}
+left offset = 0
+#i+[0;256] Top offset :
+#{in pixels. Use this to adjust the top position of the drawings.}
+top offset = 0
+#i+[0;256] Right offset :
+#{in pixels. Use this to adjust the right position of the drawings.}
+right offset = 0
+#i+[0;256] Bottom offset :
+#{in pixels. Use this to adjust the bottom position of the drawings.}
+bottom offset = 0
+#S+ Foreground image :
+#{It's an image that will be displayed above the drawings, like a reflect for exemple. Let empty to not use any.}
+fg desklet =
+#e+[0;1] Foreground tansparency :
+fg alpha = 1
+
+#[gtk-preferences]
+[Configuration]
+
+#h+[/usr/share/cairo-dock/gauges;gauges;gauges] Choose one of the available themes :/
+theme = Turbo-night
+
+#i[10;100] Max value :
+max value = 100
+
+#b Yes / No  ?
+yesno = false
+

=== modified file 'Dbus/interfaces/python/CDApplet.py'
--- Dbus/interfaces/python/CDApplet.py	2011-04-20 20:46:51 +0000
+++ Dbus/interfaces/python/CDApplet.py	2011-08-09 20:07:46 +0000
@@ -1,4 +1,4 @@
-# This is a part of the external demo applet for Cairo-Dock
+# This is a part of the external applets for Cairo-Dock
 # Copyright : (C) 2010-2011 by Fabounet
 # E-mail : [e-mail]
 #
@@ -24,41 +24,59 @@
 import ConfigParser
 import gobject
 import glib
+import gettext
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop
 
 DBusGMainLoop(set_as_default=True)
 
+INSTALL_PREFIX = os.path.abspath("..")  # applets are launched from their install directory, so ".." is the folder containing all applets.
+
+GETTEXT_NAME = 'cairo-dock-plugins-extra'
+LOCALE_DIR = INSTALL_PREFIX + '/locale'  # user version of /usr/share/locale
+gettext.textdomain(GETTEXT_NAME)
+gettext.bind_textdomain_codeset (GETTEXT_NAME, 'UTF-8');
+gettext.bindtextdomain(GETTEXT_NAME, LOCALE_DIR)
+_ = lambda x: gettext.dgettext(GETTEXT_NAME,x)
+
 ####################
 ### Applet class ###
 ####################
 class CDApplet:
 	
+	#############
+	### Enums ###
+	#############
+	# orientation
 	BOTTOM = 0
 	TOP    = 1
 	RIGHT  = 2
 	LEFT   = 3
-	
+	# container type
 	DOCK    = 0
 	DESKLET = 1
-	
+	# emblem position
 	UPPER_LEFT  = 0
 	LOWER_RIGHT = 1
 	LOWER_LEFT  = 2
 	UPPER_RIGHT = 3
 	MIDDLE      = 4
-	
+	# menu item types
 	MENU_ENTRY        = 0
 	MENU_SUB_MENU     = 1
 	MENU_SEPARATOR    = 2
 	MENU_CHECKBOX     = 3
 	MENU_RADIO_BUTTON = 4
-
+	# main menu ID
 	MAIN_MENU_ID = 0
-	
+	# dialog key pressed
 	DIALOG_KEY_ENTER = -1
 	DIALOG_KEY_ESCAPE = -2
 	
+	#####################
+	### INIT AND DBUS ###
+	#####################
+	
 	def __init__(self):
 		""" initialize the applet. Must be called by any class that inheritates from it.
 		It defines the following:
@@ -74,14 +92,44 @@
 		self.loop = None
 		self._bEnded = False
 		self._cMenuIconId = None
-		self.cAppletName = sys.argv[0][2:]
+		self.cAppletName = sys.argv[0][2:]  # the command is ./applet_name
 		self.cBusPath = sys.argv[2]
 		self.cConfFile = sys.argv[3]
 		self.cParentAppName = sys.argv[4]
+		self.cShareDataDir = INSTALL_PREFIX + '/' + self.cAppletName
 		
 		self._get_config()
 		self._connect_to_dock()
 	
+	def _connect_to_dock(self):
+		# get our applet on the bus.
+		bus = dbus.SessionBus()
+		try:
+			applet_object = bus.get_object("org.cairodock.CairoDock", self.cBusPath)
+		except:
+			print ">>> object '"+self.cBusPath+"' can't be found on the bus, exit.\nMake sure that Cairo-Dock is running"
+			sys.exit(2)
+		self.icon = dbus.Interface(applet_object, "org.cairodock.CairoDock.applet")  # this object represents our icon inside the dock or a desklet.
+		sub_icons_object = bus.get_object("org.cairodock.CairoDock", self.cBusPath+"/sub_icons")
+		self.sub_icons = dbus.Interface(sub_icons_object, "org.cairodock.CairoDock.subapplet")  # this object represents the list of icons contained in our sub-dock, or in our desklet. We'll add them one by one later, giving them a unique ID, which will be used to identify each of them.
+		# connect to signals.
+		self.icon.connect_to_signal("on_click", self.on_click)  # when the user left-clicks on our icon.
+		self.icon.connect_to_signal("on_middle_click", self.on_middle_click)  # when the user middle-clicks on our icon.
+		self.icon.connect_to_signal("on_build_menu", self._on_build_menu)  # when the user right-clicks on our applet (which builds the menu)
+		self.icon.connect_to_signal("on_menu_select", self._on_menu_select)  # when the user selects an entry of this menu.
+		self.icon.connect_to_signal("on_scroll", self.on_scroll)  # when the user scroll up or down on our icon.
+		self.icon.connect_to_signal("on_drop_data", self.on_drop_data)  # when the user drops something on our icon.
+		self.icon.connect_to_signal("on_answer_dialog", self.on_answer_dialog)  # when the user answer a question.
+		self.icon.connect_to_signal("on_shortkey", self.on_shortkey)  # when the user press the shortkey.
+		self.icon.connect_to_signal("on_change_focus", self.on_change_focus)  # when the window's focus changes.
+		self.icon.connect_to_signal("on_stop_module", self._on_stop)  # when the user deactivate our applet (or the DBus plug-in, or when the Cairo-Dock is stopped).
+		self.icon.connect_to_signal("on_reload_module", self._on_reload)  # when the user changes something in our config, or when the desklet is resized (with no change in the config).
+		self.sub_icons.connect_to_signal("on_click_sub_icon", self.on_click_sub_icon)  # when the user left-clicks on a sub-icon.
+		self.sub_icons.connect_to_signal("on_middle_click_sub_icon", self.on_middle_click_sub_icon)
+		self.sub_icons.connect_to_signal("on_scroll_sub_icon", self.on_scroll_sub_icon)
+		self.sub_icons.connect_to_signal("on_build_menu_sub_icon", self._on_build_menu_sub_icon)
+		self.sub_icons.connect_to_signal("on_drop_data_sub_icon", self.on_drop_data_sub_icon)
+	
 	def run(self):
 		""" start the applet and enter the main loop; we never get out of this function """
 		self.begin()
@@ -94,6 +142,7 @@
 	##################################
 	### callbacks on the main icon ###
 	##################################
+	
 	def on_click(self,iState):
 		""" action on click """
 		pass
@@ -148,6 +197,7 @@
 	##################################
 	### callbacks on the sub-icons ###
 	##################################
+	
 	def on_click_sub_icon(self, iState, cIconID):
 		""" action on click on one of our sub-icons"""
 		pass
@@ -183,6 +233,7 @@
 	###############################
 	### callbacks on the applet ###
 	###############################
+	
 	def begin(self):
 		""" action when the applet is started """
 		pass
@@ -215,32 +266,3 @@
 		keyfile.read(self.cConfFile)
 		self.get_config(keyfile)
 	
-	def _connect_to_dock(self):
-		# get our applet on the bus.
-		#~ applet_path = "/org/cairodock/CairoDock/"+self.cAppletName  # path where our object is stored on the bus.
-		bus = dbus.SessionBus()
-		try:
-			applet_object = bus.get_object("org.cairodock.CairoDock", self.cBusPath)
-		except:
-			print ">>> object '"+self.cBusPath+"' can't be found on the bus, exit.\nMake sure that the 'Dbus' plug-in is activated in Cairo-Dock"
-			sys.exit(2)
-		self.icon = dbus.Interface(applet_object, "org.cairodock.CairoDock.applet")  # this object represents our icon inside the dock or a desklet.
-		sub_icons_object = bus.get_object("org.cairodock.CairoDock", self.cBusPath+"/sub_icons")
-		self.sub_icons = dbus.Interface(sub_icons_object, "org.cairodock.CairoDock.subapplet")  # this object represents the list of icons contained in our sub-dock, or in our desklet. We'll add them one by one later, giving them a unique ID, which will be used to identify each of them.
-		# connect to signals.
-		self.icon.connect_to_signal("on_click", self.on_click)  # when the user left-clicks on our icon.
-		self.icon.connect_to_signal("on_middle_click", self.on_middle_click)  # when the user middle-clicks on our icon.
-		self.icon.connect_to_signal("on_build_menu", self._on_build_menu)  # when the user right-clicks on our applet (which builds the menu)
-		self.icon.connect_to_signal("on_menu_select", self._on_menu_select)  # when the user selects an entry of this menu.
-		self.icon.connect_to_signal("on_scroll", self.on_scroll)  # when the user scroll up or down on our icon.
-		self.icon.connect_to_signal("on_drop_data", self.on_drop_data)  # when the user drops something on our icon.
-		self.icon.connect_to_signal("on_answer_dialog", self.on_answer_dialog)  # when the user answer a question.
-		self.icon.connect_to_signal("on_shortkey", self.on_shortkey)  # when the user press the shortkey.
-		self.icon.connect_to_signal("on_change_focus", self.on_change_focus)  # when the window's focus changes.
-		self.icon.connect_to_signal("on_stop_module", self._on_stop)  # when the user deactivate our applet (or the DBus plug-in, or when the Cairo-Dock is stopped).
-		self.icon.connect_to_signal("on_reload_module", self._on_reload)  # when the user changes something in our config, or when the desklet is resized (with no change in the config).
-		self.sub_icons.connect_to_signal("on_click_sub_icon", self.on_click_sub_icon)  # when the user left-clicks on a sub-icon.
-		self.sub_icons.connect_to_signal("on_middle_click_sub_icon", self.on_middle_click_sub_icon)
-		self.sub_icons.connect_to_signal("on_scroll_sub_icon", self.on_scroll_sub_icon)
-		self.sub_icons.connect_to_signal("on_build_menu_sub_icon", self._on_build_menu_sub_icon)
-		self.sub_icons.connect_to_signal("on_drop_data_sub_icon", self.on_drop_data_sub_icon)

=== modified file 'Dbus/interfaces/python/CMakeLists.txt'
--- Dbus/interfaces/python/CMakeLists.txt	2011-04-20 20:46:51 +0000
+++ Dbus/interfaces/python/CMakeLists.txt	2011-08-09 20:07:46 +0000
@@ -3,7 +3,7 @@
 
 if (NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 	# copy *.py to current binary dir (cleaner)
-	execute_process(COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" "${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.py" ${CMAKE_CURRENT_BINARY_DIR})
+	execute_process(COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" "${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.py" "${CMAKE_CURRENT_SOURCE_DIR}/CairoDock.py" ${CMAKE_CURRENT_BINARY_DIR})
 	exec_program("${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build")
 endif()
 # Run a custom script with 'make install' 

=== added file 'Dbus/interfaces/python/CairoDock.py'
--- Dbus/interfaces/python/CairoDock.py	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/python/CairoDock.py	2011-08-09 20:07:46 +0000
@@ -0,0 +1,111 @@
+# This is a part of the Cairo-Dock plug-ins.
+# Copyright : (C) 2010-2011 by Fabounet
+# E-mail : [e-mail]
+#
+# 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 2
+# 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.
+# http://www.gnu.org/licenses/licenses.html#GPL
+
+# Base class for Cairo-Dock's main interface.
+
+####################
+### dependancies ###
+####################
+import os.path
+import dbus
+import re
+
+USER_CONFIG_DIR = os.path.abspath("~/.config")
+
+
+##################
+### Main class ###
+##################
+class CairoDock:
+	
+	#############
+	### Enums ###
+	#############
+	# orientation
+	BOTTOM = 0
+	TOP    = 1
+	RIGHT  = 2
+	LEFT   = 3
+	# container type
+	DOCK    = "Dock"
+	DESKLET = "Desklet"
+	# emblem position
+	UPPER_LEFT  = 0
+	LOWER_RIGHT = 1
+	LOWER_LEFT  = 2
+	UPPER_RIGHT = 3
+	MIDDLE      = 4
+	# module category
+	CATEGORY_BEHAVIOR         = 0
+	CATEGORY_THEME            = 1
+	CATEGORY_APPLET_FILES     = 2
+	CATEGORY_APPLET_INTERNET  = 3
+	CATEGORY_APPLET_DESKTOP   = 4
+	CATEGORY_APPLET_ACCESSORY = 5
+	CATEGORY_APPLET_SYSTEM    = 6
+	CATEGORY_APPLET_FUN       = 7
+	# module type
+	CAN_DOCK    = 1
+	CAN_DESKLET = 2
+	# icon type
+	TYPE_LAUNCHER        = "Launcher"
+	TYPE_APPLICATION     = "Application"
+	TYPE_APPLET          = "Applet"
+	TYPE_SEPARATOR       = "Separator"
+	TYPE_CONTAINER       = "Container"
+	TYPE_CLASS_CONTAINER = "Class-Container"
+	TYPE_OTHER           = "Other"
+	# toggle dock visibility
+	HIDE_DOCK   = 0
+	SHOW_DOCK   = 1
+	TOGGLE_DOCK = 2
+	
+	#####################
+	### INIT AND DBUS ###
+	#####################
+	
+	def __init__(self, app_name="cairo-dock"):
+		""" Initialize the interface.
+		It defines the following:
+		 - cDataDir: main dir
+		 - cCurrentThemeDir: current theme dir
+		 - cConfFile : path to the global config file
+		 """
+		self.dock = None
+		self.cAppName = app_name
+		self.cDataDir = USER_CONFIG_DIR + '/' + app_name
+		self.cCurrentThemeDir = self.cDataDir + '/current_theme'
+		self.cLaunchersDir = self.cCurrentThemeDir + '/launchers'
+		self.cPluginsDir = self.cCurrentThemeDir + '/plug-ins'
+		self.cConfFile = self.cCurrentThemeDir + '/' + app_name + '.conf'
+		
+		self._connect()
+	
+	def _connect(self):
+		# get gldi on the bus.
+		bus = dbus.SessionBus()
+		
+		name1 = self.cAppName.replace('-','')  # -> cairodock
+		name2 = re.sub('-[a-z]', lambda x: x.group(0).upper(), self.cAppName)
+		name2 = re.sub('^[a-z]', lambda x: x.group(0).upper(), name2)  # -> CairoDock
+		name2 = name2.replace('-','')  # -> CairoDock
+		cBusPath = '/org/'+name1+'/'+name2
+		try:
+			dbus_object = bus.get_object("org.cairodock.CairoDock", cBusPath)
+		except:
+			print ">>> object '"+cBusPath+"' can't be found on the bus, exit.\nMake sure that Cairo-Dock is running"
+			return
+		self.iface = dbus.Interface(dbus_object, "org.cairodock.CairoDock")  # this object represents gldi.
+		

=== modified file 'Dbus/interfaces/python/setup.py'
--- Dbus/interfaces/python/setup.py	2011-04-20 20:46:51 +0000
+++ Dbus/interfaces/python/setup.py	2011-08-09 20:07:46 +0000
@@ -21,5 +21,5 @@
 		author_email='[e-mail]',
 		description='Python interface for Cairo-Dock',
 		url='https://launchpad.net/cairo-dock',
-		py_modules=['CDApplet']
+		py_modules=['CDApplet', 'CairoDock']
 	)

=== modified file 'Dbus/interfaces/vala/CMakeLists.txt'
--- Dbus/interfaces/vala/CMakeLists.txt	2011-04-20 20:46:51 +0000
+++ Dbus/interfaces/vala/CMakeLists.txt	2011-08-09 20:07:46 +0000
@@ -13,9 +13,13 @@
 	else()
 		set (VALA_DIR ${CMAKE_CURRENT_BINARY_DIR})
 	endif()
+	if (${VALA_MAJOR} LESS 1 AND ${VALA_MINOR} LESS 13)
+		set (DISABLE_DBUS_TRANSFORMATION "--disable-dbus-transformation")
+	endif()
 	# first, precompile the Vala code into C code.
 	execute_process(COMMAND
-		${VALAC_EXE} -q -C --disable-warnings --disable-dbus-transformation
+		${VALAC_EXE} -q -C
+		--disable-warnings ${DISABLE_DBUS_TRANSFORMATION}
 		--pkg gio-2.0
 		--vapi=${VALA_DIR}/src/${CDAPPLET}.vapi
 		--header=${VALA_DIR}/src/${CDAPPLET}.h

=== modified file 'Dbus/src/applet-dbus.c'
--- Dbus/src/applet-dbus.c	2011-04-20 20:46:51 +0000
+++ Dbus/src/applet-dbus.c	2011-08-09 20:07:46 +0000
@@ -38,6 +38,7 @@
 #define __USE_POSIX
 #include <signal.h>  // kill
 #include <glib.h>
+#include <glib/gstdio.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
 
@@ -47,6 +48,9 @@
 #include "interface-applet-signals.h"
 #include "applet-dbus.h"
 
+#define DISTANT_DIR "2.4.0"
+#define GETTEXT_NAME_EXTRAS "cairo-dock-plugins-extra"
+#define LOCALE_DIR_NAME "locale"
 
   ///////////////////
  /// MAIN OBJECT ///
@@ -82,7 +86,6 @@
 	
 	//\_____________ On initialise l'icone.
 	cd_dbus_action_on_init_module (pModuleInstance);
-	
 	//\_____________ On cree l'objet sur le bus.
 	dbusApplet *pDbusApplet = cd_dbus_create_remote_applet_object (pModuleInstance);
 	g_return_if_fail (pDbusApplet != NULL);
@@ -91,7 +94,12 @@
 	if (pKeyFile != NULL)
 	{
 		if (cairo_dock_conf_file_needs_update (pKeyFile, pModuleInstance->pModule->pVisitCard->cModuleVersion))
-			cairo_dock_flush_conf_file (pKeyFile, pModuleInstance->cConfFilePath, pModuleInstance->pModule->pVisitCard->cShareDataDir, pModuleInstance->pModule->pVisitCard->cConfFileName);
+		{
+			///cairo_dock_flush_conf_file (pKeyFile, pModuleInstance->cConfFilePath, pModuleInstance->pModule->pVisitCard->cShareDataDir, pModuleInstance->pModule->pVisitCard->cConfFileName);
+			gchar *cTemplate = g_strdup_printf ("%s/%s", pModuleInstance->pModule->pVisitCard->cShareDataDir, pModuleInstance->pModule->pVisitCard->cConfFileName);
+			cairo_dock_upgrade_conf_file (pModuleInstance->cConfFilePath, pKeyFile, cTemplate);
+			g_free (cTemplate);
+		}
 	}
 	
 	//\_____________ On (re)lance l'executable de l'applet.
@@ -122,7 +130,7 @@
 		pVisitCard->iMinorVersionNeeded = 1;
 		pVisitCard->iMicroVersionNeeded = 1;
 		pVisitCard->cPreviewFilePath = cShareDataDir ? g_strdup_printf ("%s/preview", cShareDataDir) : NULL;
-		pVisitCard->cGettextDomain = g_strdup_printf ("cd-%s", cModuleName);
+		pVisitCard->cGettextDomain = g_strdup (GETTEXT_NAME_EXTRAS);
 		pVisitCard->cUserDataDir = g_strdup (cModuleName);
 		pVisitCard->cShareDataDir = g_strdup (cShareDataDir);
 		pVisitCard->cConfFileName = g_strdup_printf ("%s.conf", cModuleName);
@@ -219,16 +227,17 @@
 	return bActivationOk;
 }
 
-static void _cd_dbus_register_all_applets_in_dir (const gchar *cDirPath)
+static gboolean _cd_dbus_register_all_applets_in_dir (const gchar *cDirPath)
 {
+	gboolean bAppletRegistered = FALSE;
 	const gchar *cFileName;
 	gchar *cThirdPartyPath = g_strdup_printf ("%s/%s", cDirPath, CD_DBUS_APPLETS_FOLDER);
 	
-	GDir *dir = g_dir_open (cThirdPartyPath, 0, NULL);  // si le repertoire n'existe pas, on ne veut de warning.
+	GDir *dir = g_dir_open (cThirdPartyPath, 0, NULL);  // si le repertoire n'existe pas, on ne veut pas de warning.
 	if (dir == NULL)
 	{
 		g_free (cThirdPartyPath);
-		return ;
+		return bAppletRegistered;
 	}
 
 	do
@@ -236,12 +245,14 @@
 		cFileName = g_dir_read_name (dir);
 		if (cFileName == NULL)
 			break ;
-	
-		cd_dbus_register_module_in_dir (cFileName, cThirdPartyPath);
+		
+		if (strcmp (cFileName, LOCALE_DIR_NAME) != 0)
+			bAppletRegistered |= cd_dbus_register_module_in_dir (cFileName, cThirdPartyPath);
 	}
 	while (1);
 	g_dir_close (dir);
 	g_free (cThirdPartyPath);
+	return bAppletRegistered;
 }
 
 
@@ -253,19 +264,23 @@
 {
 	const gchar *cSharePackagesDir = MY_APPLET_SHARE_DATA_DIR"/"CD_DBUS_APPLETS_FOLDER;
 	gchar *cUserPackagesDir = g_strdup_printf ("%s/%s", g_cCairoDockDataDir, CD_DBUS_APPLETS_FOLDER);
-	gchar *cDistantPackagesDir = g_strdup_printf ("%s/%d.%d.%d", CD_DBUS_APPLETS_FOLDER, g_iMajorVersion, g_iMinorVersion, g_iMicroVersion);
-	gchar *cPath = cairo_dock_get_package_path (cModuleName, cSharePackagesDir, cUserPackagesDir, cDistantPackagesDir,  CAIRO_DOCK_UPDATED_PACKAGE);
+	///gchar *cDistantPackagesDir = g_strdup_printf ("%s/%d.%d.%d", CD_DBUS_APPLETS_FOLDER, g_iMajorVersion, g_iMinorVersion, g_iMicroVersion);
+	const gchar *cDistantPackagesDir = CD_DBUS_APPLETS_FOLDER"/"DISTANT_DIR;
+	gchar *cPath = cairo_dock_get_package_path (cModuleName,
+		cSharePackagesDir,
+		cUserPackagesDir,
+		cDistantPackagesDir,
+		CAIRO_DOCK_UPDATED_PACKAGE);
 	cd_debug ("*** update of the applet '%s' -> got '%s'\n", cModuleName, cPath);
 	g_free (cPath);
 	g_free (cUserPackagesDir);
-	g_free (cDistantPackagesDir);
+	//g_free (cDistantPackagesDir);
 }
 static gboolean _apply_package_update (gchar *cModuleName)
 {
 	CairoDockModule *pModule = cairo_dock_find_module_from_name (cModuleName);
-	g_return_val_if_fail (pModule != NULL, TRUE);
 	
-	if (pModule->pInstancesList != NULL)  // applet active => on la recharge.
+	if (pModule && pModule->pInstancesList != NULL)  // applet active => reload it (pModule can be NULL in case of "locale").
 	{
 		cd_debug ("*** applet '%s' is active, reload it", cModuleName);
 		CairoDockModuleInstance *pModuleInstance = pModule->pInstancesList->data;
@@ -424,8 +439,8 @@
 	const gchar *cProgName = g_get_prgname ();
 	g_return_if_fail (cProgName != NULL);
 	int n = strlen (cProgName);
-	gchar *cName1 = g_new0 (gchar, n+1);
-	gchar *cName2 = g_new0 (gchar, n+1);
+	gchar *cName1 = g_new0 (gchar, n+1);  // prog name without '-' and '_'
+	gchar *cName2 = g_new0 (gchar, n+1);  // same but with upper char after the '-' and '_'
 	int i, k=0;
 	for (i = 0; i < n; i ++)
 	{
@@ -450,25 +465,47 @@
 	cairo_dock_register_service_name ("org.cairodock.CairoDock");  /// what happens if the gldi instance that had registered the name quits while a 2nd instance remains ? do we need to queue ?...
 	
 	//\____________ create the main object on the bus.
-	myData.pMainObject = g_object_new (cd_dbus_main_get_type(), NULL);  // appelle cd_dbus_main_class_init() et cd_dbus_main_init().
+	myData.pMainObject = g_object_new (cd_dbus_main_get_type(), NULL);  // call cd_dbus_main_class_init() and cd_dbus_main_init().
 	
 	//\____________ register the applets installed in the default folders.
-	_cd_dbus_register_all_applets_in_dir (MY_APPLET_SHARE_DATA_DIR);
-	
-	_cd_dbus_register_all_applets_in_dir (g_cCairoDockDataDir);
+	gboolean bAppletRegistered = FALSE;
+	bAppletRegistered |= _cd_dbus_register_all_applets_in_dir (MY_APPLET_SHARE_DATA_DIR);
+	
+	bAppletRegistered |= _cd_dbus_register_all_applets_in_dir (g_cCairoDockDataDir);
+	
+	//\____________ internationalize the applets.
+	gchar *cLocaleDir = g_strdup_printf ("%s/"CD_DBUS_APPLETS_FOLDER"/"LOCALE_DIR_NAME, g_cCairoDockDataDir);  // user version of /usr/share/locale
+	if (! g_file_test (cLocaleDir, G_FILE_TEST_EXISTS))  // translations not downloaded yet.
+	{
+		gchar *cUserAppletsFolder = g_strdup_printf ("%s/"CD_DBUS_APPLETS_FOLDER, g_cCairoDockDataDir);
+		if (! g_file_test (cUserAppletsFolder, G_FILE_TEST_EXISTS))
+		{
+			if (g_mkdir (cUserAppletsFolder, 7*8*8+7*8+5) != 0)  // create an empty folder; since there is no date file, the "locale" package will be seen as "to be updated" by the package manager, and will therefore download it.
+				cd_warning ("couldn't create '%s'; third-party applets can't be added", cUserAppletsFolder);
+		}
+		g_free (cUserAppletsFolder);
+		
+		if (g_mkdir (cLocaleDir, 7*8*8+7*8+5) != 0)  // create an empty folder; since there is no date file, the "locale" package will be seen as "to be updated" by the package manager, and will therefore download it.
+			cd_warning ("couldn't create '%s'; applets won't be translated", cLocaleDir);
+	}
+	bindtextdomain (GETTEXT_NAME_EXTRAS, cLocaleDir);  // bind the applets' domain to the user locale folder.
+	bind_textdomain_codeset (GETTEXT_NAME_EXTRAS, "UTF-8");
+	g_free (cLocaleDir);
 	
 	//\____________ download in background the list of existing applets.
-	const gchar *cSharePackagesDir = NULL;  // MY_APPLET_SHARE_DATA_DIR"/"CD_DBUS_APPLETS_FOLDER;
-	gchar *cUserPackagesDir = g_strdup_printf ("%s/%s", g_cCairoDockDataDir, CD_DBUS_APPLETS_FOLDER);
-	gchar *cDistantPackagesDir = g_strdup_printf ("%s/%d.%d.%d", CD_DBUS_APPLETS_FOLDER, g_iMajorVersion, g_iMinorVersion, g_iMicroVersion);
-	myData.pGetListTask = cairo_dock_list_packages_async (cSharePackagesDir,
-		cUserPackagesDir,
-		cDistantPackagesDir,
-		(CairoDockGetPackagesFunc) _on_got_list,
-		NULL,  // data
-		NULL);  // table
-	g_free (cUserPackagesDir);
-	g_free (cDistantPackagesDir);
+	if (bAppletRegistered)  // only if some third-party applets are present on the disk.
+	{
+		const gchar *cSharePackagesDir = NULL;  // no share data dir, since we can't write in /usr
+		gchar *cUserPackagesDir = g_strdup_printf ("%s/%s", g_cCairoDockDataDir, CD_DBUS_APPLETS_FOLDER);
+		const gchar *cDistantPackagesDir = CD_DBUS_APPLETS_FOLDER"/"DISTANT_DIR;
+		myData.pGetListTask = cairo_dock_list_packages_async (cSharePackagesDir,
+			cUserPackagesDir,
+			cDistantPackagesDir,
+			(CairoDockGetPackagesFunc) _on_got_list,
+			NULL,  // data
+			NULL);  // table
+		g_free (cUserPackagesDir);
+	}
 }
 
 

=== modified file 'Dbus/src/dbus-main-spec.h'
--- Dbus/src/dbus-main-spec.h	2011-04-20 20:46:51 +0000
+++ Dbus/src/dbus-main-spec.h	2011-08-09 20:07:46 +0000
@@ -55,105 +55,193 @@
 #endif /* !G_ENABLE_DEBUG */
 
 
-/* BOOLEAN:STRING,INT,STRING,STRING,STRING,POINTER */
-extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_STRING_STRING_POINTER (GClosure     *closure,
-                                                                                             GValue       *return_value,
-                                                                                             guint         n_param_values,
-                                                                                             const GValue *param_values,
-                                                                                             gpointer      invocation_hint,
-                                                                                             gpointer      marshal_data);
-void
-dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_STRING_STRING_POINTER (GClosure     *closure,
-                                                                                 GValue       *return_value G_GNUC_UNUSED,
-                                                                                 guint         n_param_values,
-                                                                                 const GValue *param_values,
-                                                                                 gpointer      invocation_hint G_GNUC_UNUSED,
-                                                                                 gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_INT_STRING_STRING_STRING_POINTER) (gpointer     data1,
-                                                                                     gpointer     arg_1,
-                                                                                     gint         arg_2,
-                                                                                     gpointer     arg_3,
-                                                                                     gpointer     arg_4,
-                                                                                     gpointer     arg_5,
-                                                                                     gpointer     arg_6,
-                                                                                     gpointer     data2);
-  register GMarshalFunc_BOOLEAN__STRING_INT_STRING_STRING_STRING_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 7);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__STRING_INT_STRING_STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_string (param_values + 1),
-                       g_marshal_value_peek_int (param_values + 2),
+/* BOOLEAN:INT,POINTER */
+extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__INT_POINTER (GClosure     *closure,
+                                                                 GValue       *return_value,
+                                                                 guint         n_param_values,
+                                                                 const GValue *param_values,
+                                                                 gpointer      invocation_hint,
+                                                                 gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_main_BOOLEAN__INT_POINTER (GClosure     *closure,
+                                                     GValue       *return_value G_GNUC_UNUSED,
+                                                     guint         n_param_values,
+                                                     const GValue *param_values,
+                                                     gpointer      invocation_hint G_GNUC_UNUSED,
+                                                     gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__INT_POINTER) (gpointer     data1,
+                                                         gint         arg_1,
+                                                         gpointer     arg_2,
+                                                         gpointer     data2);
+  register GMarshalFunc_BOOLEAN__INT_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__INT_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_int (param_values + 1),
+                       g_marshal_value_peek_pointer (param_values + 2),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:BOXED,POINTER */
+extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOXED_POINTER (GClosure     *closure,
+                                                                   GValue       *return_value,
+                                                                   guint         n_param_values,
+                                                                   const GValue *param_values,
+                                                                   gpointer      invocation_hint,
+                                                                   gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOXED_POINTER (GClosure     *closure,
+                                                       GValue       *return_value G_GNUC_UNUSED,
+                                                       guint         n_param_values,
+                                                       const GValue *param_values,
+                                                       gpointer      invocation_hint G_GNUC_UNUSED,
+                                                       gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_POINTER) (gpointer     data1,
+                                                           gpointer     arg_1,
+                                                           gpointer     arg_2,
+                                                           gpointer     data2);
+  register GMarshalFunc_BOOLEAN__BOXED_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__BOXED_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_boxed (param_values + 1),
+                       g_marshal_value_peek_pointer (param_values + 2),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:BOOLEAN,POINTER */
+extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_POINTER (GClosure     *closure,
+                                                                     GValue       *return_value,
+                                                                     guint         n_param_values,
+                                                                     const GValue *param_values,
+                                                                     gpointer      invocation_hint,
+                                                                     gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_POINTER (GClosure     *closure,
+                                                         GValue       *return_value G_GNUC_UNUSED,
+                                                         guint         n_param_values,
+                                                         const GValue *param_values,
+                                                         gpointer      invocation_hint G_GNUC_UNUSED,
+                                                         gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN_POINTER) (gpointer     data1,
+                                                             gboolean     arg_1,
+                                                             gpointer     arg_2,
+                                                             gpointer     data2);
+  register GMarshalFunc_BOOLEAN__BOOLEAN_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__BOOLEAN_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_boolean (param_values + 1),
+                       g_marshal_value_peek_pointer (param_values + 2),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:BOOLEAN,STRING,STRING,POINTER */
+extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_STRING_STRING_POINTER (GClosure     *closure,
+                                                                                   GValue       *return_value,
+                                                                                   guint         n_param_values,
+                                                                                   const GValue *param_values,
+                                                                                   gpointer      invocation_hint,
+                                                                                   gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_STRING_STRING_POINTER (GClosure     *closure,
+                                                                       GValue       *return_value G_GNUC_UNUSED,
+                                                                       guint         n_param_values,
+                                                                       const GValue *param_values,
+                                                                       gpointer      invocation_hint G_GNUC_UNUSED,
+                                                                       gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN_STRING_STRING_POINTER) (gpointer     data1,
+                                                                           gboolean     arg_1,
+                                                                           gpointer     arg_2,
+                                                                           gpointer     arg_3,
+                                                                           gpointer     arg_4,
+                                                                           gpointer     data2);
+  register GMarshalFunc_BOOLEAN__BOOLEAN_STRING_STRING_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 5);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__BOOLEAN_STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_boolean (param_values + 1),
+                       g_marshal_value_peek_string (param_values + 2),
                        g_marshal_value_peek_string (param_values + 3),
-                       g_marshal_value_peek_string (param_values + 4),
-                       g_marshal_value_peek_string (param_values + 5),
-                       g_marshal_value_peek_pointer (param_values + 6),
-                       data2);
-
-  g_value_set_boolean (return_value, v_return);
-}
-
-/* BOOLEAN:STRING,BOOLEAN,POINTER */
-extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_BOOLEAN_POINTER (GClosure     *closure,
-                                                                            GValue       *return_value,
-                                                                            guint         n_param_values,
-                                                                            const GValue *param_values,
-                                                                            gpointer      invocation_hint,
-                                                                            gpointer      marshal_data);
-void
-dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_BOOLEAN_POINTER (GClosure     *closure,
-                                                                GValue       *return_value G_GNUC_UNUSED,
-                                                                guint         n_param_values,
-                                                                const GValue *param_values,
-                                                                gpointer      invocation_hint G_GNUC_UNUSED,
-                                                                gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_BOOLEAN_POINTER) (gpointer     data1,
-                                                                    gpointer     arg_1,
-                                                                    gboolean     arg_2,
-                                                                    gpointer     arg_3,
-                                                                    gpointer     data2);
-  register GMarshalFunc_BOOLEAN__STRING_BOOLEAN_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 4);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__STRING_BOOLEAN_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_string (param_values + 1),
-                       g_marshal_value_peek_boolean (param_values + 2),
-                       g_marshal_value_peek_pointer (param_values + 3),
+                       g_marshal_value_peek_pointer (param_values + 4),
                        data2);
 
   g_value_set_boolean (return_value, v_return);
@@ -204,48 +292,203 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:BOOLEAN,POINTER */
-extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_POINTER (GClosure     *closure,
-                                                                     GValue       *return_value,
-                                                                     guint         n_param_values,
-                                                                     const GValue *param_values,
-                                                                     gpointer      invocation_hint,
-                                                                     gpointer      marshal_data);
-void
-dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_POINTER (GClosure     *closure,
-                                                         GValue       *return_value G_GNUC_UNUSED,
-                                                         guint         n_param_values,
-                                                         const GValue *param_values,
-                                                         gpointer      invocation_hint G_GNUC_UNUSED,
-                                                         gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN_POINTER) (gpointer     data1,
-                                                             gboolean     arg_1,
-                                                             gpointer     arg_2,
-                                                             gpointer     data2);
-  register GMarshalFunc_BOOLEAN__BOOLEAN_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__BOOLEAN_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_boolean (param_values + 1),
+/* BOOLEAN:STRING,STRING,POINTER */
+extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_STRING_POINTER (GClosure     *closure,
+                                                                           GValue       *return_value,
+                                                                           guint         n_param_values,
+                                                                           const GValue *param_values,
+                                                                           gpointer      invocation_hint,
+                                                                           gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_STRING_POINTER (GClosure     *closure,
+                                                               GValue       *return_value G_GNUC_UNUSED,
+                                                               guint         n_param_values,
+                                                               const GValue *param_values,
+                                                               gpointer      invocation_hint G_GNUC_UNUSED,
+                                                               gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_STRING_POINTER) (gpointer     data1,
+                                                                   gpointer     arg_1,
+                                                                   gpointer     arg_2,
+                                                                   gpointer     arg_3,
+                                                                   gpointer     data2);
+  register GMarshalFunc_BOOLEAN__STRING_STRING_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_string (param_values + 1),
+                       g_marshal_value_peek_string (param_values + 2),
+                       g_marshal_value_peek_pointer (param_values + 3),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:STRING,POINTER,POINTER */
+extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_POINTER_POINTER (GClosure     *closure,
+                                                                            GValue       *return_value,
+                                                                            guint         n_param_values,
+                                                                            const GValue *param_values,
+                                                                            gpointer      invocation_hint,
+                                                                            gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_POINTER_POINTER (GClosure     *closure,
+                                                                GValue       *return_value G_GNUC_UNUSED,
+                                                                guint         n_param_values,
+                                                                const GValue *param_values,
+                                                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                                                gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_POINTER_POINTER) (gpointer     data1,
+                                                                    gpointer     arg_1,
+                                                                    gpointer     arg_2,
+                                                                    gpointer     arg_3,
+                                                                    gpointer     data2);
+  register GMarshalFunc_BOOLEAN__STRING_POINTER_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__STRING_POINTER_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_string (param_values + 1),
                        g_marshal_value_peek_pointer (param_values + 2),
+                       g_marshal_value_peek_pointer (param_values + 3),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:STRING,INT,STRING,POINTER */
+extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_POINTER (GClosure     *closure,
+                                                                               GValue       *return_value,
+                                                                               guint         n_param_values,
+                                                                               const GValue *param_values,
+                                                                               gpointer      invocation_hint,
+                                                                               gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_POINTER (GClosure     *closure,
+                                                                   GValue       *return_value G_GNUC_UNUSED,
+                                                                   guint         n_param_values,
+                                                                   const GValue *param_values,
+                                                                   gpointer      invocation_hint G_GNUC_UNUSED,
+                                                                   gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_INT_STRING_POINTER) (gpointer     data1,
+                                                                       gpointer     arg_1,
+                                                                       gint         arg_2,
+                                                                       gpointer     arg_3,
+                                                                       gpointer     arg_4,
+                                                                       gpointer     data2);
+  register GMarshalFunc_BOOLEAN__STRING_INT_STRING_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 5);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__STRING_INT_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_string (param_values + 1),
+                       g_marshal_value_peek_int (param_values + 2),
+                       g_marshal_value_peek_string (param_values + 3),
+                       g_marshal_value_peek_pointer (param_values + 4),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:STRING,DOUBLE,STRING,POINTER,POINTER */
+extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_DOUBLE_STRING_POINTER_POINTER (GClosure     *closure,
+                                                                                          GValue       *return_value,
+                                                                                          guint         n_param_values,
+                                                                                          const GValue *param_values,
+                                                                                          gpointer      invocation_hint,
+                                                                                          gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_DOUBLE_STRING_POINTER_POINTER (GClosure     *closure,
+                                                                              GValue       *return_value G_GNUC_UNUSED,
+                                                                              guint         n_param_values,
+                                                                              const GValue *param_values,
+                                                                              gpointer      invocation_hint G_GNUC_UNUSED,
+                                                                              gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_DOUBLE_STRING_POINTER_POINTER) (gpointer     data1,
+                                                                                  gpointer     arg_1,
+                                                                                  gdouble      arg_2,
+                                                                                  gpointer     arg_3,
+                                                                                  gpointer     arg_4,
+                                                                                  gpointer     arg_5,
+                                                                                  gpointer     data2);
+  register GMarshalFunc_BOOLEAN__STRING_DOUBLE_STRING_POINTER_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 6);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__STRING_DOUBLE_STRING_POINTER_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_string (param_values + 1),
+                       g_marshal_value_peek_double (param_values + 2),
+                       g_marshal_value_peek_string (param_values + 3),
+                       g_marshal_value_peek_pointer (param_values + 4),
+                       g_marshal_value_peek_pointer (param_values + 5),
                        data2);
 
   g_value_set_boolean (return_value, v_return);
@@ -298,35 +541,33 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:STRING,STRING,STRING,STRING,POINTER */
-extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_STRING_STRING_STRING_POINTER (GClosure     *closure,
-                                                                                         GValue       *return_value,
-                                                                                         guint         n_param_values,
-                                                                                         const GValue *param_values,
-                                                                                         gpointer      invocation_hint,
-                                                                                         gpointer      marshal_data);
+/* BOOLEAN:STRING,BOOLEAN,POINTER */
+extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_BOOLEAN_POINTER (GClosure     *closure,
+                                                                            GValue       *return_value,
+                                                                            guint         n_param_values,
+                                                                            const GValue *param_values,
+                                                                            gpointer      invocation_hint,
+                                                                            gpointer      marshal_data);
 void
-dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_STRING_STRING_STRING_POINTER (GClosure     *closure,
-                                                                             GValue       *return_value G_GNUC_UNUSED,
-                                                                             guint         n_param_values,
-                                                                             const GValue *param_values,
-                                                                             gpointer      invocation_hint G_GNUC_UNUSED,
-                                                                             gpointer      marshal_data)
+dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_BOOLEAN_POINTER (GClosure     *closure,
+                                                                GValue       *return_value G_GNUC_UNUSED,
+                                                                guint         n_param_values,
+                                                                const GValue *param_values,
+                                                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                                                gpointer      marshal_data)
 {
-  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_STRING_STRING_STRING_POINTER) (gpointer     data1,
-                                                                                 gpointer     arg_1,
-                                                                                 gpointer     arg_2,
-                                                                                 gpointer     arg_3,
-                                                                                 gpointer     arg_4,
-                                                                                 gpointer     arg_5,
-                                                                                 gpointer     data2);
-  register GMarshalFunc_BOOLEAN__STRING_STRING_STRING_STRING_POINTER callback;
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_BOOLEAN_POINTER) (gpointer     data1,
+                                                                    gpointer     arg_1,
+                                                                    gboolean     arg_2,
+                                                                    gpointer     arg_3,
+                                                                    gpointer     data2);
+  register GMarshalFunc_BOOLEAN__STRING_BOOLEAN_POINTER callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
   gboolean v_return;
 
   g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 6);
+  g_return_if_fail (n_param_values == 4);
 
   if (G_CCLOSURE_SWAP_DATA (closure))
     {
@@ -338,14 +579,12 @@
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_BOOLEAN__STRING_STRING_STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_BOOLEAN__STRING_BOOLEAN_POINTER) (marshal_data ? marshal_data : cc->callback);
 
   v_return = callback (data1,
                        g_marshal_value_peek_string (param_values + 1),
-                       g_marshal_value_peek_string (param_values + 2),
-                       g_marshal_value_peek_string (param_values + 3),
-                       g_marshal_value_peek_string (param_values + 4),
-                       g_marshal_value_peek_pointer (param_values + 5),
+                       g_marshal_value_peek_boolean (param_values + 2),
+                       g_marshal_value_peek_pointer (param_values + 3),
                        data2);
 
   g_value_set_boolean (return_value, v_return);
@@ -359,26 +598,30 @@
 static const DBusGMethodInfo dbus_glib_cd_dbus_main_methods[] = {
   { (GCallback) cd_dbus_main_reboot, dbus_glib_marshal_cd_dbus_main_BOOLEAN__POINTER, 0 },
   { (GCallback) cd_dbus_main_quit, dbus_glib_marshal_cd_dbus_main_BOOLEAN__POINTER, 34 },
-  { (GCallback) cd_dbus_main_show_desklet, dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_POINTER, 66 },
-  { (GCallback) cd_dbus_main_reload_module, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_POINTER, 121 },
-  { (GCallback) cd_dbus_main_activate_module, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_BOOLEAN_POINTER, 177 },
-  { (GCallback) cd_dbus_main_show_dock, dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_POINTER, 249 },
-  { (GCallback) cd_dbus_main_create_launcher_from_scratch, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_STRING_STRING_STRING_POINTER, 294 },
-  { (GCallback) cd_dbus_main_load_launcher_from_file, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_POINTER, 405 },
-  { (GCallback) cd_dbus_main_reload_launcher, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_POINTER, 470 },
-  { (GCallback) cd_dbus_main_remove_launcher, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_POINTER, 529 },
-  { (GCallback) cd_dbus_main_set_quick_info, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_STRING_STRING_STRING_POINTER, 588 },
-  { (GCallback) cd_dbus_main_set_label, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_STRING_STRING_STRING_POINTER, 690 },
-  { (GCallback) cd_dbus_main_set_icon, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_STRING_STRING_STRING_POINTER, 784 },
-  { (GCallback) cd_dbus_main_set_emblem, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_STRING_STRING_POINTER, 877 },
-  { (GCallback) cd_dbus_main_animate, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_STRING_STRING_POINTER, 986 },
-  { (GCallback) cd_dbus_main_show_dialog, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_STRING_STRING_POINTER, 1097 },
+  { (GCallback) cd_dbus_main_show_dock, dbus_glib_marshal_cd_dbus_main_BOOLEAN__INT_POINTER, 66 },
+  { (GCallback) cd_dbus_main_show_desklet, dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_POINTER, 118 },
+  { (GCallback) cd_dbus_main_reload_module, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_POINTER, 173 },
+  { (GCallback) cd_dbus_main_activate_module, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_BOOLEAN_POINTER, 229 },
+  { (GCallback) cd_dbus_main_get_icon_properties, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_POINTER_POINTER, 301 },
+  { (GCallback) cd_dbus_main_get_container_properties, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_POINTER_POINTER, 390 },
+  { (GCallback) cd_dbus_main_get_module_properties, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_POINTER_POINTER, 484 },
+  { (GCallback) cd_dbus_main_add_launcher, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_DOUBLE_STRING_POINTER_POINTER, 572 },
+  { (GCallback) cd_dbus_main_add_temporary_icon, dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOXED_POINTER, 679 },
+  { (GCallback) cd_dbus_main_reload_icon, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_POINTER, 747 },
+  { (GCallback) cd_dbus_main_remove_icon, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_POINTER, 800 },
+  { (GCallback) cd_dbus_main_set_quick_info, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_STRING_POINTER, 853 },
+  { (GCallback) cd_dbus_main_set_label, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_STRING_POINTER, 923 },
+  { (GCallback) cd_dbus_main_set_icon, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_STRING_POINTER, 985 },
+  { (GCallback) cd_dbus_main_set_emblem, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_POINTER, 1046 },
+  { (GCallback) cd_dbus_main_animate, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_POINTER, 1123 },
+  { (GCallback) cd_dbus_main_demands_attention, dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_STRING_STRING_POINTER, 1202 },
+  { (GCallback) cd_dbus_main_show_dialog, dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_POINTER, 1287 },
 };
 
 const DBusGObjectInfo dbus_glib_cd_dbus_main_object_info = {  1,
   dbus_glib_cd_dbus_main_methods,
-  16,
-"org.cairodock.CairoDock\0Reboot\0S\0\0org.cairodock.CairoDock\0Quit\0S\0\0org.cairodock.CairoDock\0ShowDesklet\0S\0widgetLayer\0I\0b\0\0org.cairodock.CairoDock\0ReloadModule\0S\0cModuleName\0I\0s\0\0org.cairodock.CairoDock\0ActivateModule\0S\0cModuleName\0I\0s\0bActivate\0I\0b\0\0org.cairodock.CairoDock\0ShowDock\0S\0show\0I\0b\0\0org.cairodock.CairoDock\0CreateLauncherFromScratch\0S\0cIconFile\0I\0s\0cLabel\0I\0s\0cCommand\0I\0s\0cParentDockName\0I\0s\0\0org.cairodock.CairoDock\0LoadLauncherFromFile\0S\0cDesktopFile\0I\0s\0\0org.cairodock.CairoDock\0ReloadLauncher\0S\0cDesktopFile\0I\0s\0\0org.cairodock.CairoDock\0RemoveLauncher\0S\0cDesktopFile\0I\0s\0\0org.cairodock.CairoDock\0SetQuickInfo\0S\0cQuickInfo\0I\0s\0cIconName\0I\0s\0cIconCommand\0I\0s\0cModuleName\0I\0s\0\0org.cairodock.CairoDock\0SetLabel\0S\0cLabel\0I\0s\0cIconName\0I\0s\0cIconCommand\0I\0s\0cModuleName\0I\0s\0\0org.cairodock.CairoDock\0SetIcon\0S\0cImage\0I\0s\0cIconName\0I\0s\0cIconCommand\0I\0s\0cModuleName\0I\0s\0\0org.cairodock.CairoDock\0SetEmblem\0S\0cImage\0I\0s\0iPosition\0I\0i\0cIconName\0I\0s\0cIconCommand\0I\0s\0cModuleName\0I\0s\0\0org.cairodock.CairoDock\0Animate\0S\0cAnimation\0I\0s\0iNbRounds\0I\0i\0cIconName\0I\0s\0cIconCommand\0I\0s\0cModuleName\0I\0s\0\0org.cairodock.CairoDock\0ShowDialog\0S\0message\0I\0s\0iDuration\0I\0i\0cIconName\0I\0s\0cIconCommand\0I\0s\0cModuleName\0I\0s\0\0\0",
+  20,
+"org.cairodock.CairoDock\0Reboot\0S\0\0org.cairodock.CairoDock\0Quit\0S\0\0org.cairodock.CairoDock\0ShowDock\0S\0iVisibility\0I\0i\0\0org.cairodock.CairoDock\0ShowDesklet\0S\0widgetLayer\0I\0b\0\0org.cairodock.CairoDock\0ReloadModule\0S\0cModuleName\0I\0s\0\0org.cairodock.CairoDock\0ActivateModule\0S\0cModuleName\0I\0s\0bActivate\0I\0b\0\0org.cairodock.CairoDock\0GetIconProperties\0S\0cIconQuery\0I\0s\0pIconProperties\0O\0F\0N\0aa{sv}\0\0org.cairodock.CairoDock\0GetContainerProperties\0S\0cName\0I\0s\0pContainerProperties\0O\0F\0N\0aa{sv}\0\0org.cairodock.CairoDock\0GetModuleProperties\0S\0cName\0I\0s\0pModuleProperties\0O\0F\0N\0aa{sv}\0\0org.cairodock.CairoDock\0AddLauncher\0S\0cDesktopFilePath\0I\0s\0fOrder\0I\0d\0cDockName\0I\0s\0cLauncherFile\0O\0F\0N\0s\0\0org.cairodock.CairoDock\0AddTemporaryIcon\0S\0hIconProperties\0I\0a{sv}\0\0org.cairodock.CairoDock\0ReloadIcon\0S\0cIconQuery\0I\0s\0\0org.cairodock.CairoDock\0RemoveIcon\0S\0cIconQuery\0I\0s\0\0org.cairodock.CairoDock\0SetQuickInfo\0S\0cQuickInfo\0I\0s\0cIconQuery\0I\0s\0\0org.cairodock.CairoDock\0SetLabel\0S\0cLabel\0I\0s\0cIconQuery\0I\0s\0\0org.cairodock.CairoDock\0SetIcon\0S\0cImage\0I\0s\0cIconQuery\0I\0s\0\0org.cairodock.CairoDock\0SetEmblem\0S\0cImage\0I\0s\0iPosition\0I\0i\0cIconQuery\0I\0s\0\0org.cairodock.CairoDock\0Animate\0S\0cAnimation\0I\0s\0iNbRounds\0I\0i\0cIconQuery\0I\0s\0\0org.cairodock.CairoDock\0DemandsAttention\0S\0bStart\0I\0b\0cAnimation\0I\0s\0cIconQuery\0I\0s\0\0org.cairodock.CairoDock\0ShowDialog\0S\0message\0I\0s\0iDuration\0I\0i\0cIconQuery\0I\0s\0\0\0",
 "\0",
 "\0"
 };

=== modified file 'Dbus/src/dbus_introspectable.xml'
--- Dbus/src/dbus_introspectable.xml	2011-04-20 20:46:51 +0000
+++ Dbus/src/dbus_introspectable.xml	2011-08-09 20:07:46 +0000
@@ -6,6 +6,9 @@
 		</method>
 		<method name="Quit">
 		</method>
+		<method name="ShowDock">
+			<arg name="iVisibility" type="i" direction="in"/>
+		</method>
 		<method name="ShowDesklet">
 			<arg name="widgetLayer" type="b" direction="in"/>
 		</method>
@@ -16,62 +19,67 @@
 			<arg name="cModuleName" type="s" direction="in"/>
 			<arg name="bActivate" type="b" direction="in"/>
 		</method>
-		<method name="ShowDock">
-			<arg name="show" type="b" direction="in"/>
-		</method>
-		<method name="CreateLauncherFromScratch">
-			<arg name="cIconFile" type="s" direction="in"/>
-			<arg name="cLabel" type="s" direction="in"/>
-			<arg name="cCommand" type="s" direction="in"/>
-			<arg name="cParentDockName" type="s" direction="in"/>
-		</method>
-		<method name="LoadLauncherFromFile">
-			<arg name="cDesktopFile" type="s" direction="in"/>
-		</method>
-		<method name="ReloadLauncher">
-			<arg name="cDesktopFile" type="s" direction="in"/>
-		</method>
-		<method name="RemoveLauncher">
-			<arg name="cDesktopFile" type="s" direction="in"/>
-		</method>
+		
+		<method name="GetIconProperties">
+			<arg name="cIconQuery" type="s" direction="in"/>
+			<arg name="pIconProperties" direction="out" type="aa{sv}"/>
+		</method>
+		<method name="GetContainerProperties">
+			<arg name="cName" type="s" direction="in"/>
+			<arg name="pContainerProperties" direction="out" type="aa{sv}"/>
+		</method>
+		<method name="GetModuleProperties">
+			<arg name="cName" type="s" direction="in"/>
+			<arg name="pModuleProperties" direction="out" type="aa{sv}"/>
+		</method>
+		
+		<method name="AddLauncher">
+			<arg name="cDesktopFilePath" type="s" direction="in"/>
+			<arg name="fOrder" type="d" direction="in"/>
+			<arg name="cDockName" type="s" direction="in"/>
+			<arg name="cLauncherFile" type="s" direction="out"/>
+		</method>
+		<method name="AddTemporaryIcon">
+			<arg name="hIconProperties" direction="in" type="a{sv}"/>
+		</method>
+		<method name="ReloadIcon">
+			<arg name="cIconQuery" type="s" direction="in"/>
+		</method>
+		<method name="RemoveIcon">
+			<arg name="cIconQuery" type="s" direction="in"/>
+		</method>
+		
 		<method name="SetQuickInfo">
 			<arg name="cQuickInfo" type="s" direction="in"/>
-			<arg name="cIconName" type="s" direction="in"/>
-			<arg name="cIconCommand" type="s" direction="in"/>
-			<arg name="cModuleName" type="s" direction="in"/>
+			<arg name="cIconQuery" type="s" direction="in"/>
 		</method>
 		<method name="SetLabel">
 			<arg name="cLabel" type="s" direction="in"/>
-			<arg name="cIconName" type="s" direction="in"/>
-			<arg name="cIconCommand" type="s" direction="in"/>
-			<arg name="cModuleName" type="s" direction="in"/>
+			<arg name="cIconQuery" type="s" direction="in"/>
 		</method>
 		<method name="SetIcon">
 			<arg name="cImage" type="s" direction="in"/>
-			<arg name="cIconName" type="s" direction="in"/>
-			<arg name="cIconCommand" type="s" direction="in"/>
-			<arg name="cModuleName" type="s" direction="in"/>
+			<arg name="cIconQuery" type="s" direction="in"/>
 		</method>
 		<method name="SetEmblem">
 			<arg name="cImage" type="s" direction="in"/>
 			<arg name="iPosition" type="i" direction="in"/>
-			<arg name="cIconName" type="s" direction="in"/>
-			<arg name="cIconCommand" type="s" direction="in"/>
-			<arg name="cModuleName" type="s" direction="in"/>
+			<arg name="cIconQuery" type="s" direction="in"/>
 		</method>
 		<method name="Animate">
 			<arg name="cAnimation" type="s" direction="in"/>
 			<arg name="iNbRounds" type="i" direction="in"/>
-			<arg name="cIconName" type="s" direction="in"/>
-			<arg name="cIconCommand" type="s" direction="in"/>
-			<arg name="cModuleName" type="s" direction="in"/>
+			<arg name="cIconQuery" type="s" direction="in"/>
+		</method>
+		<method name="DemandsAttention">
+			<arg name="bStart" type="b" direction="in"/>
+			<arg name="cAnimation" type="s" direction="in"/>
+			<arg name="cIconQuery" type="s" direction="in"/>
 		</method>
 		<method name="ShowDialog">
 			<arg name="message" type="s" direction="in"/>
 			<arg name="iDuration" type="i" direction="in"/>
-			<arg name="cIconName" type="s" direction="in"/>
-			<arg name="cIconCommand" type="s" direction="in"/>
-			<arg name="cModuleName" type="s" direction="in"/>
+			<arg name="cIconQuery" type="s" direction="in"/>
 		</method>
 	</interface>
 </node>

=== modified file 'Dbus/src/interface-applet-methods.c'
--- Dbus/src/interface-applet-methods.c	2011-04-20 20:46:51 +0000
+++ Dbus/src/interface-applet-methods.c	2011-08-09 20:07:46 +0000
@@ -435,6 +435,7 @@
 					gtk_range_set_value (GTK_RANGE (pScale), fInitialValue);
 					
 					gtk_widget_set (pScale, "width-request", 150, NULL);
+					cairo_dock_set_dialog_widget_text_color (pScale);
 					
 					if (cMinLabel || cMaxLabel)
 					{
@@ -669,8 +670,8 @@
 			pIcon->pSubDock = NULL;
 		}
 		pInstance->pDesklet->icons = g_list_concat (pInstance->pDesklet->icons, pIconsList);
-		gpointer data[2] = {GINT_TO_POINTER (TRUE), GINT_TO_POINTER (FALSE)};
-		cairo_dock_set_desklet_renderer_by_name (pInstance->pDesklet, "Caroussel", (CairoDeskletRendererConfigPtr) data);
+		gpointer data[3] = {GINT_TO_POINTER (0), GINT_TO_POINTER (TRUE), NULL};
+		cairo_dock_set_desklet_renderer_by_name (pInstance->pDesklet, "Panel", (CairoDeskletRendererConfigPtr) data);
 	}
 	
 	return TRUE;
@@ -844,15 +845,15 @@
 		pRenderAttr->iMemorySize = (pIcon->fWidth > 1 ? pIcon->fWidth : 32);  // fWidht peut etre <= 1 en mode desklet au chargement.
 		// Line;Plain;Bar;Circle;Plain Circle
 		if (cTheme == NULL || strcmp (cTheme, "Line") == 0)
-			attr.iType = CAIRO_DOCK_GRAPH2_LINE;
+			attr.iType = CAIRO_DOCK_GRAPH_LINE;
 		else if (strcmp (cTheme, "Plain") == 0)
-			attr.iType = CAIRO_DOCK_GRAPH2_PLAIN;
+			attr.iType = CAIRO_DOCK_GRAPH_PLAIN;
 		else if (strcmp (cTheme, "Bar") == 0)
-			attr.iType = CAIRO_DOCK_GRAPH2_BAR;
+			attr.iType = CAIRO_DOCK_GRAPH_BAR;
 		else if (strcmp (cTheme, "Circle") == 0)
-			attr.iType = CAIRO_DOCK_GRAPH2_CIRCLE;
+			attr.iType = CAIRO_DOCK_GRAPH_CIRCLE;
 		else if (strcmp (cTheme, "Plain Circle") == 0)
-			attr.iType = CAIRO_DOCK_GRAPH2_CIRCLE_PLAIN;
+			attr.iType = CAIRO_DOCK_GRAPH_CIRCLE_PLAIN;
 		attr.iRadius = 10;
 		attr.bMixGraphs = FALSE;
 		double *fHighColor = g_new (double, iNbValues*3);
@@ -929,7 +930,9 @@
 		if (pIcon->cClass != NULL)
 			cairo_dock_deinhibite_class (pIcon->cClass, pIcon);
 		if (cClass != NULL)
-			cairo_dock_inhibite_class (cClass, pIcon);
+		{
+			cairo_dock_inhibite_class (cClass, pIcon);  /// useful to use cairo_dock_register_class ?...
+		}
 		if (! cairo_dock_is_loading ())
 		{
 			CairoContainer *pContainer = pInstance->pContainer;
@@ -1124,6 +1127,9 @@
 					{
 						image = gtk_image_new_from_stock (cIcon, GTK_ICON_SIZE_MENU);
 					}
+#if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
+					gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (pMenuItem), TRUE);
+#endif
 					gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (pMenuItem), image);
 				}
 			}
@@ -1268,7 +1274,7 @@
 	}
 	else if (strcmp (cProperty, "orientation") == 0)
 	{
-		CairoDockPositionType iScreenBorder = (g_pMainDock ? ((! g_pMainDock->container.bIsHorizontal) << 1) | (! g_pMainDock->container.bDirectionUp) : 0);
+		CairoDockPositionType iScreenBorder = ((! pContainer->bIsHorizontal) << 1) | (! pContainer->bDirectionUp);
 		g_value_init (v, G_TYPE_UINT);
 		g_value_set_uint (v, iScreenBorder);
 	}

=== modified file 'Dbus/src/interface-applet-signals.c'
--- Dbus/src/interface-applet-signals.c	2011-04-20 20:46:51 +0000
+++ Dbus/src/interface-applet-signals.c	2011-08-09 20:07:46 +0000
@@ -734,7 +734,7 @@
 
 void cd_dbus_emit_on_stop_module (CairoDockModuleInstance *pModuleInstance)
 {
-	//g_print ("%s (%s, %d)\n", __func__, pModuleInstance->pModule->pVisitCard->cModuleName, myData.bKeepObjectAlive);
+	//g_print ("%s (%s)\n", __func__, pModuleInstance->pModule->pVisitCard->cModuleName);
 	dbusApplet *pDbusApplet = cd_dbus_get_dbus_applet_from_instance (pModuleInstance);
 	if (pDbusApplet != NULL)
 		g_signal_emit (pDbusApplet,

=== modified file 'Dbus/src/interface-main-methods.c'
--- Dbus/src/interface-main-methods.c	2011-04-20 20:46:51 +0000
+++ Dbus/src/interface-main-methods.c	2011-08-09 20:07:46 +0000
@@ -21,21 +21,16 @@
 exemples : 
 ----------
 
-dbus-send --session --dest=org.cairodock.CairoDock /org/cairodock/CairoDock org.cairodock.CairoDock.CreateLauncherFromScratch string:gimp.png string:"fake gimp" string:gimp string:none
-
-dbus-send --session --dest=org.cairodock.CairoDock /org/cairodock/CairoDock org.cairodock.CairoDock.SetLabel string:new_label string:icon_name string:any string:none
-
-dbus-send --session --dest=org.cairodock.CairoDock /org/cairodock/CairoDock org.cairodock.CairoDock.SetQuickInfo string:123 string:none string:none string:dustbin
-
-dbus-send --session --dest=org.cairodock.CairoDock /org/cairodock/CairoDock org.cairodock.CairoDock.Animate string:default int32:2 string:any string:firefox string:none
-
-dbus-send --session --dest=org.cairodock.CairoDock /org/cairodock/CairoDock org.cairodock.CairoDock.SetIcon string:firefox-3.0 string:any string:nautilus string:none
+dbus-send --session --dest=org.cairodock.CairoDock /org/cairodock/CairoDock org.cairodock.CairoDock.SetQuickInfo string:123 string:"class=firefox"
+
+dbus-send --session --dest=org.cairodock.CairoDock /org/cairodock/CairoDock org.cairodock.CairoDock.Animate string:default int32:2 string:"class=firefox"
 
 ******************************************************************************/
 
 #include <unistd.h>
 #include <glib.h>
 
+#include "cairo-dock.h"
 #include "interface-main-methods.h"
 
 #define nullify_argument(string) do {\
@@ -61,6 +56,77 @@
 	return TRUE;
 }
 
+static void _show_hide_one_dock (const gchar *cDockName, CairoDock *pDock, gpointer data)
+{
+	if (pDock->iRefCount != 0)
+		return ;
+	gboolean bShow = GPOINTER_TO_INT (data);
+	if (bShow)
+	{
+		///cairo_dock_pop_up (pDock);
+		///if (pDock->bAutoHide)
+			cairo_dock_emit_enter_signal (CAIRO_CONTAINER (pDock));
+	}
+	else
+	{
+		///cairo_dock_pop_down (pDock);  // ne fait rien s'il n'etait pas "popped".
+		///if (pDock->bAutoHide)
+			cairo_dock_emit_leave_signal (CAIRO_CONTAINER (pDock));
+	}
+}
+gboolean cd_dbus_main_show_dock (dbusMainObject *pDbusCallback, gint iVisibiliy, GError **error)
+{
+	if (! myConfig.bEnableShowDock)
+		return FALSE;
+	
+	if (g_pMainDock == NULL)
+		return FALSE;
+	
+	gboolean bShow;
+	switch (iVisibiliy)
+	{
+		case 0:  // hide
+			bShow = FALSE;
+		break;
+		case 1:  // show
+			bShow = TRUE;
+		break;
+		case 2:  // toggle
+		default:
+			bShow = (g_pMainDock->bIsBelow || (g_pMainDock->bAutoHide && g_pMainDock->fHideOffset == 1));
+		break;		
+	}
+	
+	if (bShow)
+		cairo_dock_stop_quick_hide ();
+	
+	cairo_dock_foreach_docks ((GHFunc) _show_hide_one_dock, GINT_TO_POINTER (bShow));
+	
+	if (! bShow)
+		cairo_dock_quick_hide_all_docks ();
+	
+	return TRUE;
+}
+
+gboolean cd_dbus_main_show_desklet (dbusMainObject *pDbusCallback, gboolean *widgetLayer, GError **error)
+{
+	if (! myConfig.bEnableDesklets)
+		return FALSE;
+	if (dbus_deskletVisible)
+	{
+		cairo_dock_set_desklets_visibility_to_default ();
+		cairo_dock_show_xwindow (dbus_xLastActiveWindow);
+	}
+	else
+	{
+		dbus_xLastActiveWindow = cairo_dock_get_current_active_window ();
+		cairo_dock_set_all_desklets_visible (widgetLayer != NULL ? *widgetLayer : FALSE);
+	}
+	dbus_deskletVisible = !dbus_deskletVisible;
+	return TRUE;
+}
+
+
 gboolean cd_dbus_main_reload_module (dbusMainObject *pDbusCallback, const gchar *cModuleName, GError **error)
 {
 	if (! myConfig.bEnableReloadModule)
@@ -72,11 +138,9 @@
 	}
 	else
 	{
-		//CairoDockInternalModule *pInternalModule = cairo_dock_find_internal_module_from_name (cModuleName);
 		GldiManager *pManager = gldi_get_manager (cModuleName);
 		if (pManager != NULL)
 		{
-			//cairo_dock_reload_internal_module (pInternalModule, g_cConfFile);
 			gldi_reload_manager (pManager, g_cConfFile);
 		}
 		else
@@ -96,9 +160,9 @@
 	CairoDockModule *pModule = cairo_dock_find_module_from_name (cModuleName);
 	if (pModule == NULL)
 	{
-		/*if (cairo_dock_find_internal_module_from_name (cModuleName) != NULL)
+		if (gldi_get_manager (cModuleName) != NULL)
 			cd_warning ("Internal modules can't be (de)activated.");
-		else*/
+		else
 			cd_warning ("no such module (%s)", cModuleName);
 		return FALSE;
 	}
@@ -110,86 +174,864 @@
 	return TRUE;
 }
 
-gboolean cd_dbus_main_show_desklet(dbusMainObject *pDbusCallback, gboolean *widgetLayer, GError **error)
-{
-	if (! myConfig.bEnableDesklets)
-		return FALSE;
-	if (dbus_deskletVisible)
-	{
-		cairo_dock_set_desklets_visibility_to_default ();
-		cairo_dock_show_xwindow (dbus_xLastActiveWindow);
-	}
-	else
-	{
-		dbus_xLastActiveWindow = cairo_dock_get_current_active_window ();
-		cairo_dock_set_all_desklets_visible (widgetLayer != NULL ? *widgetLayer : FALSE);
-	}
-	dbus_deskletVisible = !dbus_deskletVisible;
-	return TRUE;
-}
-
-static void _show_hide_one_dock (const gchar *cDockName, CairoDock *pDock, gpointer data)
-{
-	if (pDock->iRefCount != 0)
-		return ;
-	gboolean bShow = GPOINTER_TO_INT (data);
-	if (bShow)
-	{
-		///cairo_dock_pop_up (pDock);
-		if (pDock->bAutoHide)
-			cairo_dock_emit_enter_signal (CAIRO_CONTAINER (pDock));
-	}
-	else
-	{
-		///cairo_dock_pop_down (pDock);  // ne fait rien s'il n'etait pas "popped".
-		if (pDock->bAutoHide)
-			cairo_dock_emit_leave_signal (CAIRO_CONTAINER (pDock));
-	}
-}
-gboolean cd_dbus_main_show_dock (dbusMainObject *pDbusCallback, gboolean bShow, GError **error)
-{
-	if (! myConfig.bEnableShowDock)
-		return FALSE;
-	
-	if (bShow)
-		cairo_dock_stop_quick_hide ();
-	
-	cairo_dock_foreach_docks ((GHFunc) _show_hide_one_dock, GINT_TO_POINTER (bShow));
-	
-	if (! bShow)
-		cairo_dock_quick_hide_all_docks ();
-	
-	return TRUE;
-}
-
-gboolean cd_dbus_main_create_launcher_from_scratch (dbusMainObject *pDbusCallback, const gchar *cIconFile, const gchar *cLabel, const gchar *cCommand, const gchar *cParentDockName, GError **error)
-{
-	if (! myConfig.bEnableCreateLauncher)
-		return FALSE;
-	
-	nullify_argument (cParentDockName);
-	if (cParentDockName == NULL)
-		cParentDockName = CAIRO_DOCK_MAIN_DOCK_NAME;
+
+  //////////////////
+ /// ICON QUERY ///
+//////////////////
+
+typedef struct {
+	const gchar *cType;
+	const gchar *cName;
+	const gchar *cCommand;
+	const gchar *cClass;
+	const gchar *cContainerName;
+	Window Xid;
+	const gchar *cDesktopFile;
+	const gchar *cModuleName;
+	gint iPosition;
+	gboolean bMatchAll;
+	GList *pMatchingIcons;
+} CDIconQueryBuffer;
+static inline gboolean _strings_match (const gchar *q, const gchar *p)  // query, parameter
+{
+	if (!p)
+		return (strcmp (q, "none") == 0);
+	int n = strlen(q);
+	if (n != 0 && q[n-1] == '*')  // ok with UTF-8 too.
+		return (strncmp (q, p, n-1) == 0);
+	return (strcmp (q, p) == 0);
+}
+static inline gboolean _strings_match_case (const gchar *q, const gchar *p)  // query, parameter
+{
+	if (!p)
+		return (strcmp (q, "none") == 0);
+	int n = strlen(q);
+	if (n != 0 && q[n-1] == '*')
+		return (g_ascii_strncasecmp (q, p, n-1) == 0);
+	return (g_ascii_strcasecmp (q, p) == 0);
+}
+static gboolean _icon_is_matching (Icon *pIcon, CairoContainer *pContainer, CDIconQueryBuffer *pQuery)
+{
+	gboolean bOr = FALSE;
+	gboolean bAnd = TRUE;  // at least 1 of the fields is not nul.
+	gboolean r;
+	if (pQuery->cType)
+	{
+		const gchar *cType;
+		if (CAIRO_DOCK_ICON_TYPE_IS_LAUNCHER (pIcon))
+			cType = "Launcher";
+		else if (CAIRO_DOCK_ICON_TYPE_IS_APPLI (pIcon))
+			cType = "Application";
+		else if (CAIRO_DOCK_ICON_TYPE_IS_APPLET (pIcon))
+			cType = "Applet";
+		else if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pIcon))
+			cType = "Separator";
+		else if (CAIRO_DOCK_ICON_TYPE_IS_CONTAINER (pIcon))
+			cType = "Container";
+		else if (CAIRO_DOCK_ICON_TYPE_IS_CLASS_CONTAINER (pIcon))
+			cType = "Class-Container";
+		else
+			cType = "Other";
+		r = (strcmp (pQuery->cType, cType) == 0);
+		bOr |= r;
+		bAnd &= r;
+	}
+	if (pQuery->cName)
+	{
+		r = _strings_match (pQuery->cName, pIcon->cName);
+		bOr |= r;
+		bAnd &= r;
+	}
+	if (pQuery->cCommand)
+	{
+		r = _strings_match (pQuery->cCommand, pIcon->cCommand);
+		bOr |= r;
+		bAnd &= r;
+	}
+	if (pQuery->cClass)
+	{
+		r = _strings_match_case (pQuery->cClass, pIcon->cClass);
+		bOr |= r;
+		bAnd &= r;
+	}
+	if (pQuery->cContainerName)
+	{
+		const gchar *cContainerName = NULL;
+		if (CAIRO_DOCK_IS_DOCK (pContainer))
+			cContainerName = pIcon->cParentDockName;
+		else if (CAIRO_DOCK_IS_DESKLET (pContainer))
+		{
+			Icon *pMainIcon = CAIRO_DESKLET (pContainer)->pIcon;
+			if (CAIRO_DOCK_IS_APPLET (pMainIcon))
+				cContainerName = pMainIcon->pModuleInstance->pModule->pVisitCard->cModuleName;
+		}
+		r = _strings_match (pQuery->cContainerName, cContainerName);
+		bOr |= r;
+		bAnd &= r;
+	}
+	if (pQuery->Xid != 0)
+	{
+		r = (pIcon->Xid == pQuery->Xid);
+		bOr |= r;
+		bAnd &= r;
+	}
+	if (pQuery->cDesktopFile)
+	{
+		r = _strings_match (pQuery->cDesktopFile, pIcon->cDesktopFileName);
+		if (!r && CAIRO_DOCK_IS_APPLET (pIcon) && pIcon->pModuleInstance->cConfFilePath)
+		{
+			if (*pQuery->cDesktopFile == '/')  // query the complete path.
+			{
+				r = _strings_match (pQuery->cDesktopFile, pIcon->pModuleInstance->cConfFilePath);
+			}
+			else  // query the file name only.
+			{
+				gchar *str = strrchr (pIcon->pModuleInstance->cConfFilePath, '/');
+				if (str)
+					r = _strings_match (pQuery->cDesktopFile, str+1);
+			}
+		}
+		bOr |= r;
+		bAnd &= r;
+	}
+	if (pQuery->cModuleName)
+	{
+		r = (CAIRO_DOCK_IS_APPLET (pIcon) && _strings_match (pQuery->cModuleName, pIcon->pModuleInstance->pModule->pVisitCard->cModuleName));
+		bOr |= r;
+		bAnd &= r;
+	}
+	
+	return ((pQuery->bMatchAll && bAnd) || (!pQuery->bMatchAll && bOr));
+}
+static void _check_icon_matching (Icon *pIcon, CairoContainer *pContainer, CDIconQueryBuffer *pQuery)
+{
+	if (_icon_is_matching (pIcon, pContainer, pQuery))
+		pQuery->pMatchingIcons = g_list_prepend (pQuery->pMatchingIcons, pIcon);
+}
+static void _get_icon_at_position_in_dock (const gchar *cDockName, CairoDock *pDock, CDIconQueryBuffer *pQuery)
+{
+	Icon *pIcon = g_list_nth_data (pDock->icons, pQuery->iPosition);
+	if (pIcon != NULL)
+		pQuery->pMatchingIcons = g_list_prepend (pQuery->pMatchingIcons, pIcon);
+}
+static gboolean _get_icon_at_position_in_desklet (CairoDesklet *pDesklet, CDIconQueryBuffer *pQuery)
+{
+	Icon *pIcon = g_list_nth_data (pDesklet->icons, pQuery->iPosition);
+	if (pIcon != NULL)
+		pQuery->pMatchingIcons = g_list_prepend (pQuery->pMatchingIcons, pIcon);
+	return FALSE;  // don't stop.
+}
+static gboolean _prepare_query (CDIconQueryBuffer *pQuery, const gchar *cKey, const gchar *cValue)
+{
+	g_return_val_if_fail (cKey != NULL, FALSE);
+	if (cValue == NULL)  // use "none" keyword to look for "icons that don't have key".
+		return FALSE;
+	
+	if (strcmp (cKey, "name") == 0 || strcmp (cKey, "label") == 0)
+		pQuery->cName = cValue;
+	else if (strcmp (cKey, "command") == 0)
+		pQuery->cCommand = cValue;
+	else if (strcmp (cKey, "class") == 0)
+		pQuery->cClass = cValue;
+	else if (strcmp (cKey, "container") == 0)
+		pQuery->cContainerName = cValue;
+	else if (strcmp (cKey, "Xid") == 0)
+		pQuery->Xid = strtol(cValue, NULL, 0);  // can read hexa, decimal or octal.
+	else if (strcmp (cKey, "config-file") == 0)
+		pQuery->cDesktopFile = cValue;
+	else if (strcmp (cKey, "module") == 0)
+		pQuery->cModuleName = cValue;
+	else if (strcmp (cKey, "position") == 0)
+		pQuery->iPosition = atoi (cValue);
+	else if (strcmp (cKey, "type") == 0)
+		pQuery->cType = cValue;
+	else
+	{
+		cd_warning ("wrong key (%s)", cKey);
+		return FALSE;
+	}
+	return TRUE;
+}
+static GList *_find_matching_icons_for_key (const gchar *cKey, const gchar *cValue)
+{
+	//g_print ("  %s (%s, %s)\n", __func__, cKey, cValue);
+	CDIconQueryBuffer query;
+	memset (&query, 0, sizeof (CDIconQueryBuffer));
+	query.iPosition = -1;
+	query.bMatchAll = TRUE;
+	
+	gboolean bValidQuery = _prepare_query (&query, cKey, cValue);
+	g_return_val_if_fail (bValidQuery, NULL);
+	
+	if (query.iPosition >= 0)
+	{
+		cairo_dock_foreach_docks ((GHFunc) _get_icon_at_position_in_dock, &query);
+		cairo_dock_foreach_desklet ((CairoDockForeachDeskletFunc) _get_icon_at_position_in_desklet, &query);
+	}
+	else
+	{
+		cairo_dock_foreach_icons ((CairoDockForeachIconFunc) _check_icon_matching, &query);
+	}
+	return query.pMatchingIcons;
+}
+static GList *_find_matching_icons_for_test (gchar *cTest)
+{
+	g_return_val_if_fail (cTest != NULL, NULL);
+	//g_print (" %s (%s)\n", __func__, cTest);
+	
+	gchar *str = strchr (cTest, '=');
+	g_return_val_if_fail (str != NULL, NULL);
+	
+	*str = '\0';
+	gchar *cKey = g_strstrip ((gchar*)cTest);  // g_strstrip modifies the string in place (by moving the rest of the characters forward and cutting the trailing spaces)
+	gchar *cValue = g_strstrip (str+1);
+	
+	return _find_matching_icons_for_key (cKey, cValue);
+}
+static GList *_merge (GList *pList1, GList *pList2)
+{
+	//g_print ("%s ()\n", __func__);
+	GList *pList = NULL;
+	GList *ic;
+	Icon *pIcon;
+	for (ic = pList1; ic != NULL; ic = ic->next)
+	{
+		pIcon = ic->data;
+		if (g_list_find (pList2, pIcon) != NULL)
+			pList = g_list_prepend (pList, pIcon);
+	}
+	g_list_free (pList1);
+	g_list_free (pList2);
+	return pList;
+}
+static GList *_concat (GList *pList1, GList *pList2)
+{
+	//g_print ("%s ()\n", __func__);
+	GList *pList = g_list_copy (pList2);
+	GList *ic;
+	Icon *pIcon;
+	for (ic = pList1; ic != NULL; ic = ic->next)
+	{
+		pIcon = ic->data;
+		if (!g_list_find (pList2, pIcon))
+			pList = g_list_prepend (pList, pIcon);
+	}
+	g_list_free (pList1);
+	g_list_free (pList2);
+	return pList;
+}
+GList *cd_dbus_find_matching_icons (gchar *cQuery)
+{
+	g_return_val_if_fail (cQuery != NULL, NULL);
+	//g_print ("%s (%s)\n", __func__, cQuery);
+	
+	gchar *str;
+	str = strchr (cQuery, '|');  // a && b || c && d <=> (a && b) || (c && d)
+	if (str)
+	{
+		*str = '\0';
+		GList *pList1 = cd_dbus_find_matching_icons (cQuery);
+		GList *pList2 = cd_dbus_find_matching_icons (str+1);
+		return _concat (pList1, pList2);
+	}
+	str = strchr (cQuery, '&');
+	if (str)
+	{
+		*str = '\0';
+		GList *pList1 = cd_dbus_find_matching_icons (cQuery);
+		GList *pList2 = cd_dbus_find_matching_icons (str+1);
+		return _merge (pList1, pList2);
+	}
+	return _find_matching_icons_for_test (cQuery);
+}
+
+
+gboolean cd_dbus_main_get_icon_properties (dbusMainObject *pDbusCallback, gchar *cIconQuery, GPtrArray **pIconAttributes, GError **error)
+{
+	GList *pList = cd_dbus_find_matching_icons (cIconQuery);  // if NULL, will just return an empty array.
+	
+	GPtrArray *pTab = g_ptr_array_new ();
+	*pIconAttributes = pTab;
+	
+	GHashTable *h;
+	GValue *v;
+	Icon *pIcon;
+	CairoContainer *pContainer;
+	int iPosition;
+	const gchar *cType;
+	const gchar *cContainerName;
+	const gchar *cDesktopFile;
+	GList *ic;
+	for (ic = pList; ic != NULL; ic = ic->next)
+	{
+		pIcon = ic->data;
+		pContainer = cairo_dock_search_container_from_icon (pIcon);
+		
+		h = g_hash_table_new_full (g_str_hash,
+			g_str_equal,
+			g_free,  /// can we use const char here instead of duplicating each string ?...
+			g_free);
+		g_ptr_array_add (pTab, h);
+		
+		if (CAIRO_DOCK_ICON_TYPE_IS_LAUNCHER (pIcon))
+			cType = "Launcher";
+		else if (CAIRO_DOCK_ICON_TYPE_IS_APPLI (pIcon))
+			cType = "Application";
+		else if (CAIRO_DOCK_ICON_TYPE_IS_APPLET (pIcon))
+			cType = "Applet";
+		else if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pIcon))
+			cType = "Separator";
+		else if (CAIRO_DOCK_ICON_TYPE_IS_CONTAINER (pIcon))
+			cType = "Container";
+		else if (CAIRO_DOCK_ICON_TYPE_IS_CLASS_CONTAINER (pIcon))
+			cType = "Class-Container";
+		else
+			cType = "Other";
+		v = g_new0 (GValue, 1);
+		g_value_init (v, G_TYPE_STRING);
+		g_value_set_string (v, cType);
+		g_hash_table_insert (h, g_strdup ("type"), v);
+		
+		cDesktopFile = NULL;
+		if (pIcon->cDesktopFileName != NULL)
+			cDesktopFile = pIcon->cDesktopFileName;
+		else if (CAIRO_DOCK_IS_APPLET (pIcon))
+			cDesktopFile = pIcon->pModuleInstance->cConfFilePath;
+		v = g_new0 (GValue, 1);
+		g_value_init (v, G_TYPE_STRING);
+		g_value_set_string (v, cDesktopFile);
+		g_hash_table_insert (h, g_strdup ("config-file"), v);
+		
+		if (CAIRO_DOCK_IS_APPLET (pIcon))
+		{
+			v = g_new0 (GValue, 1);
+			g_value_init (v, G_TYPE_STRING);
+			g_value_set_string (v, pIcon->pModuleInstance->pModule->pVisitCard->cModuleName);
+			g_hash_table_insert (h, g_strdup ("module"), v);
+		}
+		
+		v = g_new0 (GValue, 1);
+		g_value_init (v, G_TYPE_STRING);
+		g_value_set_string (v, pIcon->cName);  /// g_value_set_static_string ?...
+		g_hash_table_insert (h, g_strdup ("name"), v);
+		
+		v = g_new0 (GValue, 1);
+		g_value_init (v, G_TYPE_STRING);
+		g_value_set_string (v, pIcon->cCommand);
+		g_hash_table_insert (h, g_strdup ("command"), v);
+		
+		v = g_new0 (GValue, 1);
+		g_value_init (v, G_TYPE_STRING);
+		g_value_set_string (v, pIcon->cClass);
+		g_hash_table_insert (h, g_strdup ("class"), v);
+		
+		v = g_new0 (GValue, 1);
+		g_value_init (v, G_TYPE_STRING);
+		g_value_set_string (v, pIcon->cFileName);
+		g_hash_table_insert (h, g_strdup ("icon"), v);
+		
+		v = g_new0 (GValue, 1);
+		g_value_init (v, G_TYPE_STRING);
+		g_value_set_string (v, pIcon->cQuickInfo);
+		g_hash_table_insert (h, g_strdup ("quick-info"), v);
+		
+		v = g_new0 (GValue, 1);
+		g_value_init (v, G_TYPE_UINT);
+		g_value_set_uint (v, pIcon->Xid);
+		g_hash_table_insert (h, g_strdup ("Xid"), v);
+		
+		iPosition = -1;
+		cContainerName = NULL;
+		if (CAIRO_DOCK_IS_DOCK (pContainer))
+		{
+			CairoDock *pDock = CAIRO_DOCK (pContainer);
+			iPosition = g_list_index (pDock->icons, pIcon);
+			cContainerName = pIcon->cParentDockName;
+		}
+		else if (CAIRO_DOCK_IS_DESKLET (pContainer))
+		{
+			CairoDesklet *pDesklet = CAIRO_DESKLET (pContainer);
+			if (pDesklet->pIcon == pIcon)
+				iPosition = 0;
+			else
+				iPosition = g_list_index (pDesklet->icons, pIcon);
+			if (CAIRO_DOCK_IS_APPLET (pDesklet->pIcon))
+				cContainerName = pDesklet->pIcon->pModuleInstance->pModule->pVisitCard->cModuleName;
+		}
+		v = g_new0 (GValue, 1);
+		g_value_init (v, G_TYPE_INT);
+		g_value_set_int (v, iPosition);
+		g_hash_table_insert (h, g_strdup ("position"), v);
+		
+		v = g_new0 (GValue, 1);
+		g_value_init (v, G_TYPE_STRING);
+		g_value_set_string (v, cContainerName);
+		g_hash_table_insert (h, g_strdup ("container"), v);
+		
+		v = g_new0 (GValue, 1);
+		g_value_init (v, G_TYPE_DOUBLE);
+		g_value_set_double (v, pIcon->fOrder);
+		g_hash_table_insert (h, g_strdup ("order"), v);
+	}
+	
+	g_list_free (pList);
+	return TRUE;
+}
+
+static void _set_container_props (CairoContainer *pContainer, GHashTable *h)
+{
+	GValue *v;
+	int x, y, w, ht;
+	if (pContainer->bIsHorizontal)
+	{
+		x = pContainer->iWindowPositionX;
+		y = pContainer->iWindowPositionY;
+		w = pContainer->iWidth;
+		ht = pContainer->iHeight;
+	}
+	else
+	{
+		y = pContainer->iWindowPositionX;
+		x = pContainer->iWindowPositionY;
+		ht = pContainer->iWidth;
+		w = pContainer->iHeight;
+	}
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_INT);
+	g_value_set_int (v, pContainer->iWindowPositionX);
+	g_hash_table_insert (h, g_strdup ("x"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_INT);
+	g_value_set_int (v, y);
+	g_hash_table_insert (h, g_strdup ("y"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_INT);
+	g_value_set_int (v, w);
+	g_hash_table_insert (h, g_strdup ("width"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_INT);
+	g_value_set_int (v, ht);
+	g_hash_table_insert (h, g_strdup ("height"), v);
+	
+	CairoDockPositionType iScreenBorder = ((! pContainer->bIsHorizontal) << 1) | (! pContainer->bDirectionUp);
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_UINT);
+	g_value_set_uint (v, iScreenBorder);
+	g_hash_table_insert (h, g_strdup ("orientation"), v);
+}
+static void _insert_dock_props (const gchar *cDockName, CairoDock *pDock, GPtrArray *pTab)
+{
+	GHashTable *h = g_hash_table_new_full (g_str_hash,
+		g_str_equal,
+		g_free,  /// can we use const char here instead of duplicating each string ?...
+		g_free);
+	g_ptr_array_add (pTab, h);
+	
+	GValue *v;
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_STRING);
+	g_value_set_string (v, "Dock");
+	g_hash_table_insert (h, g_strdup ("type"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_STRING);
+	g_value_set_string (v, cDockName);
+	g_hash_table_insert (h, g_strdup ("name"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_BOOLEAN);
+	g_value_set_boolean (v, (pDock->iRefCount > 0));
+	g_hash_table_insert (h, g_strdup ("is-sub-dock"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_INT);
+	g_value_set_int (v, g_list_length (pDock->icons));
+	g_hash_table_insert (h, g_strdup ("nb-icons"), v);
+	
+	_set_container_props (CAIRO_CONTAINER (pDock), h);
+}
+static gboolean _insert_desklet_props (CairoDesklet *pDesklet, GPtrArray *pTab)
+{
+	GHashTable *h = g_hash_table_new_full (g_str_hash,
+		g_str_equal,
+		g_free,  /// can we use const char here instead of duplicating each string ?...
+		g_free);
+	g_ptr_array_add (pTab, h);
+	
+	GValue *v;
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_STRING);
+	g_value_set_string (v, "Desklet");
+	g_hash_table_insert (h, g_strdup ("type"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_STRING);
+	g_value_set_string (v, CAIRO_DOCK_IS_APPLET (pDesklet->pIcon) ? pDesklet->pIcon->pModuleInstance->pModule->pVisitCard->cModuleName : "");
+	g_hash_table_insert (h, g_strdup ("name"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_INT);
+	g_value_set_int (v, 1 + g_list_length (pDesklet->icons));
+	g_hash_table_insert (h, g_strdup ("nb-icons"), v);
+	
+	_set_container_props (CAIRO_CONTAINER (pDesklet), h);
+	return FALSE;
+}
+static gboolean _check_desklet_name (CairoDesklet *pDesklet, const gchar *cName)
+{
+	if (CAIRO_DOCK_IS_APPLET (pDesklet->pIcon))
+	{
+		return (strcmp (cName, pDesklet->pIcon->pModuleInstance->pModule->pVisitCard->cModuleName) == 0);
+	}
+	return FALSE;
+}
+gboolean cd_dbus_main_get_container_properties (dbusMainObject *pDbusCallback, const gchar *cName, GPtrArray **pAttributes, GError **error)
+{
+	nullify_argument (cName);
+	
+	GPtrArray *pTab = g_ptr_array_new ();
+	*pAttributes = pTab;
+	
+	if (cName == NULL)
+	{
+		cairo_dock_foreach_docks ((GHFunc)_insert_dock_props, pTab);
+		cairo_dock_foreach_desklet ((CairoDockForeachDeskletFunc) _insert_desklet_props, pTab);
+	}
+	else
+	{
+		CairoDock *pDock = cairo_dock_search_dock_from_name (cName);
+		if (pDock != NULL)
+		{
+			_insert_dock_props (cName, pDock, pTab);
+		}
+		else
+		{
+			CairoDesklet *pDesklet = cairo_dock_foreach_desklet ((CairoDockForeachDeskletFunc) _check_desklet_name, (gpointer)cName);
+			if (pDesklet != NULL)
+			{
+				_insert_desklet_props (pDesklet, pTab);
+			}
+		}
+	}
+	
+	return TRUE;
+}
+
+static gboolean _insert_module_props (CairoDockModule *pModule, GPtrArray *pTab)
+{
+	GHashTable *h = g_hash_table_new_full (g_str_hash,
+		g_str_equal,
+		g_free,  /// can we use const char here instead of duplicating each string ?...
+		g_free);
+	g_ptr_array_add (pTab, h);
+	
+	GValue *v;
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_STRING);
+	g_value_set_string (v, pModule->pVisitCard->cModuleName);
+	g_hash_table_insert (h, g_strdup ("name"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_UINT);
+	g_value_set_uint (v, pModule->pVisitCard->iContainerType);
+	g_hash_table_insert (h, g_strdup ("type"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_UINT);
+	g_value_set_uint (v, pModule->pVisitCard->iCategory);
+	g_hash_table_insert (h, g_strdup ("category"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_STRING);
+	g_value_set_string (v, pModule->pVisitCard->cTitle);
+	g_hash_table_insert (h, g_strdup ("title"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_STRING);
+	g_value_set_string (v, pModule->pVisitCard->cIconFilePath);
+	g_hash_table_insert (h, g_strdup ("icon"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_STRING);
+	g_value_set_string (v, pModule->pVisitCard->cPreviewFilePath);
+	g_hash_table_insert (h, g_strdup ("preview"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_STRING);
+	g_value_set_string (v, dgettext (pModule->pVisitCard->cGettextDomain, pModule->pVisitCard->cDescription));
+	g_hash_table_insert (h, g_strdup ("description"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_STRING);
+	g_value_set_string (v, pModule->pVisitCard->cAuthor);
+	g_hash_table_insert (h, g_strdup ("author"), v);
+	
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_BOOLEAN);
+	g_value_set_boolean (v, pModule->pVisitCard->bMultiInstance);
+	g_hash_table_insert (h, g_strdup ("is-multi-instance"), v);
+	
+	g_print ("list instances ...\n");
+	gchar **pInstances = g_new0 (gchar*, g_list_length (pModule->pInstancesList)+1);
+	CairoDockModuleInstance *pInstance;
+	int i = 0;
+	GList *mi;
+	for (mi = pModule->pInstancesList; mi != NULL; mi = mi->next)
+	{
+		pInstance = mi->data;
+		pInstances[i++] = g_strdup (pInstance->cConfFilePath);
+	}
+	g_print ("write instances ...\n");
+	v = g_new0 (GValue, 1);
+	g_value_init (v, G_TYPE_STRV);
+	g_value_set_boxed (v, pInstances);
+	g_hash_table_insert (h, g_strdup ("instances"), v);
+	g_print ("done.\n");
+	return TRUE;  // continue
+}
+gboolean cd_dbus_main_get_module_properties (dbusMainObject *pDbusCallback, const gchar *cName, GPtrArray **pAttributes, GError **error)
+{
+	nullify_argument (cName);
+	
+	GPtrArray *pTab = g_ptr_array_new ();
+	*pAttributes = pTab;
+	
+	if (cName == NULL)
+	{
+		cairo_dock_foreach_module_in_alphabetical_order ((GCompareFunc) _insert_module_props, pTab);
+	}
+	else
+	{
+		CairoDockModule *pModule = cairo_dock_find_module_from_name (cName);
+		if (pModule != NULL)
+		{
+			_insert_module_props (pModule, pTab);
+		}
+	}
+	return TRUE;
+}
+
+gboolean cd_dbus_main_add_launcher (dbusMainObject *pDbusCallback, const gchar *cDesktopFilePath, gdouble fOrder, const gchar *cDockName, gchar **cLauncherFile, GError **error)
+{
+	*cLauncherFile = NULL;
+	if (! myConfig.bEnableCreateLauncher)
+		return FALSE;
+	g_return_val_if_fail (cDesktopFilePath != NULL, FALSE);
+	
+	//\_______________ get the dock where to insert the icon.
+	nullify_argument (cDockName);
+	if (cDockName == NULL)
+		cDockName = CAIRO_DOCK_MAIN_DOCK_NAME;
+	
+	CairoDock * pParentDock = cairo_dock_search_dock_from_name (cDockName);
+	if (pParentDock == NULL)
+	{
+		cd_warning ("dock %s does not exist", cDockName);
+		pParentDock = g_pMainDock;
+	}
+	
+	//\_______________ add a new icon in the current theme.
+	int iLauncherType = -1;
+	if (strcmp (cDesktopFilePath, "separator.desktop") == 0)
+		iLauncherType = CAIRO_DOCK_DESKTOP_FILE_FOR_SEPARATOR;
+	else if (strcmp (cDesktopFilePath, "container.desktop") == 0)
+		iLauncherType = CAIRO_DOCK_DESKTOP_FILE_FOR_CONTAINER;
+	else if (strcmp (cDesktopFilePath, "launcher.desktop") == 0)
+		iLauncherType = CAIRO_DOCK_DESKTOP_FILE_FOR_LAUNCHER;
+	
+	if (fOrder < 0)
+		fOrder = CAIRO_DOCK_LAST_ORDER;
+	Icon *pNewIcon;
+	if (iLauncherType != -1)
+		pNewIcon = cairo_dock_add_new_launcher_by_type (iLauncherType, pParentDock, fOrder, CAIRO_DOCK_LAUNCHER);
+	else
+		pNewIcon = cairo_dock_add_new_launcher_by_uri (cDesktopFilePath, pParentDock, fOrder);
+	if (pNewIcon != NULL)
+	{
+		*cLauncherFile = g_strdup (pNewIcon->cDesktopFileName);
+		return TRUE;
+	}
+	else
+		return FALSE;
+}
+
+gboolean cd_dbus_main_add_temporary_icon (dbusMainObject *pDbusCallback, GHashTable *hIconAttributes, GError **error)
+{
+	if (! myConfig.bEnableCreateLauncher)
+		return FALSE;
+	
+	g_return_val_if_fail (hIconAttributes != NULL, FALSE);
+	
+	//\_______________ get the attributes.
+	GValue *v;
+	const gchar *cType = "Launcher";
+	v = g_hash_table_lookup (hIconAttributes, "type");
+	if (v && G_VALUE_HOLDS_STRING (v))
+	{
+		cType = g_value_get_string (v);
+	}
+	
+	const gchar *cIcon = NULL;
+	v = g_hash_table_lookup (hIconAttributes, "icon");
+	if (v && G_VALUE_HOLDS_STRING (v))
+	{
+		cIcon = g_value_get_string (v);
+	}
+	
+	const gchar *cName = NULL;
+	v = g_hash_table_lookup (hIconAttributes, "name");
+	if (!v)
+		v = g_hash_table_lookup (hIconAttributes, "label");
+	if (v && G_VALUE_HOLDS_STRING (v))
+	{
+		cName = g_value_get_string (v);
+	}
+	
+	const gchar *cParentDockName = CAIRO_DOCK_MAIN_DOCK_NAME;
+	v = g_hash_table_lookup (hIconAttributes, "container");
+	if (v && G_VALUE_HOLDS_STRING (v))
+	{
+		cParentDockName = g_value_get_string (v);
+	}
+	
+	const gchar *cQuickInfo = NULL;
+	v = g_hash_table_lookup (hIconAttributes, "quick-info");
+	if (v && G_VALUE_HOLDS_STRING (v))
+	{
+		cQuickInfo = g_value_get_string (v);
+	}
+	
+	double fOrder = CAIRO_DOCK_LAST_ORDER;
+	v = g_hash_table_lookup (hIconAttributes, "order");
+	if (v && G_VALUE_HOLDS_DOUBLE (v))
+	{
+		fOrder = g_value_get_double (v);
+	}
+	
+	int iPosition = -1;
+	v = g_hash_table_lookup (hIconAttributes, "position");
+	if (v && G_VALUE_HOLDS_INT (v))
+	{
+		iPosition = g_value_get_int (v);
+	}
+	
+	const gchar *cCommand = NULL;