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

[Matthieu Baerts]

Hello,

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

This is the Upstream (short) ChangeLog:
 * Upstream (short) ChangeLog (2.4.0~0beta2 -> 2.4.0~1):
   - Powermanager: correctly release the reference on the device object
   - logout: now works if there is no session-manager
   - Status-Notifier: fixed a small bug
      (wrong callback in cairo_dock_stop_watching_dbus_name_owner)
   - Folders: fixed the positionning of the new icon
      and the dialog when dropping a folder inside the dock
      and fixed the icon-rendering
   - Dustbin: use the default theme if no icon is found
   - Impulse: the default context seems to be ok and not an error
   - Status-Notifier: On Ubuntu Oneiric (with indicator-0.4)
      the ApplicationAdded signal has changed and has a new parameter
   - Disable MeMenu on Oneiric (no longer available with indicator-0.4)
   - CMakeLists.txt: Improved output messages
   - Slide view: fixed a small offset in vertical view
   - musicPlayer:
    + split MPRIS 1.0 and 2.0 to help debugging and finding the right
       name of the bug.
    + 'rhythmbox-client' tool is no longer available: used MPRIS
    + Disable Amazon service (it no longer work)
    + Cover: fixed corrupted icons: some players (e.g. the latest version
       of RB) copy covers on their cache forlder but it takes a few time.
    + Fixed the update the icon and its name if the player is stopped.
    + Prevent a crash if the name given by MPRIS is NULL
   - Powermanager: try to prevent to have a few dialogues at the same time
   - PowerManager and AlsaMixer: hidden gnome2 or 3 apps if not available
   - Messaging-Menu: Updated for Natty and Oneiric
      (dbus-menu gives us GVariant instead of GValue objects)
   - Alsamixer: fixed a small bug on reload
   - Dbus: Bash interface: Fixed a typo with emblem positions
   - Sys-monitor: fixed a bug which prevented from getting
      the CPU temperature in some cases
   - Compiz (0.9): type filter: replaced type=utility by type=Utility
   - Updated the version of all applets that have gauges
     in order to use the right directory
   - Wifi: Fixed the status if we are not connected
   - Dbus: removed a conflict with the Help applet
   - Messaging-Menu: updated applet-menu.c => Memory leaks on pixbufs
   - Dbus: Fixed a crash when changing dock theme if a 'third-party' applet
      is running
   - Netspeed: in /proc/net/dev, there are 8 values to drop after the card id
      except if there is whitespaces just after this ':' character
      and fixed order and value for ON_ICON display
   - dock-rendering/toto: removed a useless file
   - Clipper: fixed the loading of the remembered items
      (they had the wrong type) and fixed a bug if we reduce the list of items
   - Folders, dustbin, Network-Monitor: tried to not use cast if it's possible
   - Code cleaned and re-organised a few functions
     (e.g. emblem references has been renamed)
   - Removed useless files: powermanager-dbus*
   - Updating translations
   - Fixed a few warnings at the compilation
   - Removed a few useless output messages
   - Fixed these LP bugs:
    + Empty trash from the trashcan does not delete files
       from usb harddisks: LP: #658681
    + Switcher applet doesn't respect desktop numbers LP: #626782

Note that this is the stable version of the 2.4 branch. It fixes a lot of bugs of the previous version (2.4.0~0beta2).

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

Thank you for your help! :)

PS: Don't forget to upload this package AND THE CORE ( LP: #859982 )

[lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.4.0-1]

22. By Matthieu Baerts on 2011-09-27

* New upstream bug fix release. (LP: #859984)
* Upstream (short) ChangeLog (2.4.0~0beta2 -> 2.4.0~1):
 - Powermanager: correctly release the reference on the device object
 - logout: now works if there is no session-manager
 - Status-Notifier: fixed a small bug
    (wrong callback in cairo_dock_stop_watching_dbus_name_owner)
 - Folders: fixed the positionning of the new icon
    and the dialog when dropping a folder inside the dock
    and fixed the icon-rendering
 - Dustbin: use the default theme if no icon is found
 - Impulse: the default context seems to be ok and not an error
 - Status-Notifier: On Ubuntu Oneiric (with indicator-0.4)
    the ApplicationAdded signal has changed and has a new parameter
 - Disable MeMenu on Oneiric (no longer available with indicator-0.4)
 - CMakeLists.txt: Improved output messages
 - Slide view: fixed a small offset in vertical view
 - musicPlayer:
  + split MPRIS 1.0 and 2.0 to help debugging and finding the right
     name of the bug.
  + 'rhythmbox-client' tool is no longer available: used MPRIS
  + Disable Amazon service (it no longer work)
  + Cover: fixed corrupted icons: some players (e.g. the latest version
     of RB) copy covers on their cache forlder but it takes a few time.
  + Fixed the update the icon and its name if the player is stopped.
  + Prevent a crash if the name given by MPRIS is NULL
 - Powermanager: try to prevent to have a few dialogues at the same time
 - PowerManager and AlsaMixer: hidden gnome2 or 3 apps if not available
 - Messaging-Menu: Updated for Natty and Oneiric
    (dbus-menu gives us GVariant instead of GValue objects)
 - Alsamixer: fixed a small bug on reload
 - Dbus: Bash interface: Fixed a typo with emblem positions
 - Sys-monitor: fixed a bug which prevented from getting
    the CPU temperature in some cases
 - Compiz (0.9): type filter: replaced type=utility by type=Utility
 - Updated the version of all applets that have gauges
   in order to use the right directory
 - Wifi: Fixed the status if we are not connected
 - Dbus: removed a conflict with the Help applet
 - Messaging-Menu: updated applet-menu.c => Memory leaks on pixbufs
 - Dbus: Fixed a crash when changing dock theme if a 'third-party' applet
    is running
 - Netspeed: in /proc/net/dev, there are 8 values to drop after the card id
    except if there is whitespaces just after this ':' character
    and fixed order and value for ON_ICON display
 - dock-rendering/toto: removed a useless file
 - Clipper: fixed the loading of the remembered items
    (they had the wrong type) and fixed a bug if we reduce the list of items
 - Folders, dustbin, Network-Monitor: tried to not use cast if it's possible
 - Code cleaned and re-organised a few functions
   (e.g. emblem references has been renamed)
 - Removed useless files: powermanager-dbus*
 - Updating translations
 - Fixed a few warnings at the compilation
 - Removed a few useless output messages
 - Fixed these LP bugs:
  + Empty trash from the trashcan does not delete files
     from usb harddisks: LP: #658681
  + Switcher applet doesn't respect desktop numbers LP: #626782
* debian/control:
 - Updated the version of cairo-dock-[core;data;dev].
 - Added gvfs as 'Suggests' for cairo-dock-plug-ins-integration
    (Used for managing files)
 - Removed 'libthunar-vfs-1-dev' (libthunar-vfs is no longer installed
    by default since XFCE 4.8 and it is replaced by gvfs)
 - Removed 'indicator-me' (no longer available
    and the installation of Cairo-Dock produces an error)
 - Moved 'indicator-messages' to 'Recommends'
* debian/rules:
 - Updated the name of CMake extras flags

23. By Matthieu Baerts on 2011-10-04

* Upstream (short) ChangeLog (2.4.0~1 -> 2.4.0~2):
 - Messaging-Menu: fixed a wrong g_object_unref (double free)
    and a small memory leak
 - Folders: fixed a tiny warning at the compilation (32bits)
 - switcher: removed an unnecessary config parameter
 - Folders: file size: used English instead of French translation.
 - Indicator applet: Forced a cast to remove an annoying warning
    due to clumsy dbusmenu_gtkmenu_new() declaration
 - Fixed the detection of the screensaver
 - Fixed tiny warnings at the compilation (with CAIRO_CONTAINER)

[Fabrice Coutadeur (fabricesp)]

Hi,

Please follow the FFe process as described at https://wiki.ubuntu.com/FreezeExceptionProcess as we are way past Feature Freeze, as described in Bug #859984. Marking as Needs fixing in the meantime.

review: Needs Fixing

[Matthieu Baerts (matttbe)]

ACK given by pitti. Thanks to him!

[Ken VanDine (ken-vandine)]

FTBFS for me. Looks like there is a problem with the branch, files not removed then trying to keep the changes in the diff.

dpkg-source: error: cannot represent change to cairo-dock-plug-ins-2.4.0~2/terminal/data/icon.png: binary file contents changed

review: Disapprove

[Matthieu Baerts (matttbe)]

@Ken VanDine: I don't understand... this file is the same as before. The last changed has been made more than one year ago.
So... what can I do to fix this strange bug?

[lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.4.0-1]

24. By Matthieu Baerts on 2011-10-08

* debian/cairo-dock-plug-ins-data.lintian-overrides:
 - Deleted (now useless)
* debian/cairo-dock-plug-ins.lintian-overrides:
 - Cairo-Dock Plug-Ins are not linked to gldi
 - shlib-without-versioned-soname: forwarded to upstream.
* debian/cairo-dock-plug-ins-integration.lintian-overrides:
 - Cairo-Dock Plug-Ins are not linked to gldi
 - ldconfig and shlibs are not needed
* debian/cairo-dock-plug-ins.install:
 - Fixed lintian errors: package-installs-python-bytecode
* debian/control: Fixed lintian warnings:
 - python-script-but-no-python-dep
 - description-synopsis-starts-with-article
* debian/changelog:
 - Fixed lintian warning: old-fsf-address-in-copyright-file
* debian/patches/01-switcher-force-compact-view.patch:
 - Forced the compact view because the other doesn't work

=== added directory '.pc'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2011-10-08 22:23:24 +0000
@@ -0,0 +1,1 @@
+debian/patches
 
=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2011-10-08 22:23:24 +0000
@@ -0,0 +1,1 @@
+series
 
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2011-10-08 22:23:24 +0000
@@ -0,0 +1,1 @@
+2
 
=== added directory '.pc/01-switcher-force-compact-view.patch'
=== added directory '.pc/01-switcher-force-compact-view.patch/switcher'
=== added directory '.pc/01-switcher-force-compact-view.patch/switcher/data'
=== added file '.pc/01-switcher-force-compact-view.patch/switcher/data/switcher.conf.in'
--- .pc/01-switcher-force-compact-view.patch/switcher/data/switcher.conf.in	1970-01-01 00:00:00 +0000
+++ .pc/01-switcher-force-compact-view.patch/switcher/data/switcher.conf.in	2011-10-08 22:23:24 +0000
@@ -0,0 +1,177 @@
+#@VERSION_SWITCHER@
+
+#[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=
+
+#S+ Image filename:
+#{Leave empty to use the default one.}
+icon = 
+
+#j+[0;400] 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=switcher
+
+#[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):
+x position=10
+#i[-2048;2048] ...
+y position=10
+
+#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:
+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[Configuration]
+frame_conf =
+
+#B Use the compact mode?
+#{All desktops will be drawn on the main icon. Otherwise a sub-dock will contain all desktops.}
+Vue Simple = true
+
+#b Preserve the ratio of the screen ?
+preserve ratio = true
+
+#b Map wallpaper to icons?
+Map Wallpaper = true
+
+#b Show desktop number on icons?
+display numero desktop = true
+
+#B Draw windows on icons?
+Draw Windows = true
+
+#b Draw hidden windows?
+Draw hidden Windows = false
+
+#v
+sep_conf =
+
+#l[Show windows' list;Show desktop;Expose all the desktops;Expose all the windows] Action on middle-click:
+action on click = 0
+
+#U Workspace names :
+desktop names = 
+
+
+#F[Display options]
+frame_disp =
+
+#i+[0;8] Size of the inside lines :
+inlinesize = 3
+
+#C+ Internal line colour:
+#{r, g, b, a}
+rgbinlinecolor = 0.0; 0.0; 0.5; 1.
+
+#i+[0;8] External line size:
+linesize = 3
+
+#C+ External line colour:
+#{r, g, b, a}
+rgblinecolor = 0.0; 0.0; 0.5; 1.
+
+#C+ Window line colour:
+#{r, g, b, a}
+rgbwlinecolor = 0.0; 0.0; 0.5; 1.
+
+#v
+sep_cur =
+
+#C+ Current desktop colour:
+#{r, g, b, a}
+rgbindcolor = 0.0; 0.0; 0.5; 0.5
+
+#l+[draw a frame;fill;fill others] How to draw the current desktop:
+fill current = 1
+
+#v
+sep_other =
+
+#S+ Icon to use in expanded mode if wallpaper is not mapped:
+#{Leave empty to use the default one.}
+default icon = 
+
+
+#n+ Sub-dock view name:
+#{Leave empty to use default sub-dock view.}/
+renderer = 
+
+#b+ In expanded mode, render the desklet in 3D?
+3D desklet = true
 
=== added directory '.pc/01-switcher-force-compact-view.patch/switcher/src'
=== added file '.pc/01-switcher-force-compact-view.patch/switcher/src/applet-config.c'
--- .pc/01-switcher-force-compact-view.patch/switcher/src/applet-config.c	1970-01-01 00:00:00 +0000
+++ .pc/01-switcher-force-compact-view.patch/switcher/src/applet-config.c	2011-10-08 22:23:24 +0000
@@ -0,0 +1,78 @@
+/**
+* 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 <string.h>
+
+#include "applet-struct.h"
+#include "applet-config.h"
+#include "applet-load-icons.h"
+
+
+CD_APPLET_GET_CONFIG_BEGIN
+	//\_________________ On recupere toutes les valeurs de notre fichier de conf.
+	myConfig.bCompactView = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Vue Simple", TRUE);
+	myConfig.bPreserveScreenRatio = CD_CONFIG_GET_BOOLEAN ("Configuration", "preserve ratio");
+	myConfig.bMapWallpaper = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Map Wallpaper", TRUE);
+	myConfig.bDisplayNumDesk = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "display numero desktop", TRUE);
+	myConfig.bDrawWindows = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Draw Windows", TRUE);
+	myConfig.bDisplayHiddenWindows = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Draw hidden Windows", TRUE);
+	myConfig.iActionOnMiddleClick = CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "action on click", 0);
+	
+	// couleur des lignes interieures
+	myConfig.iInLineSize = CD_CONFIG_GET_INTEGER("Configuration", "inlinesize");
+	double inlinecouleur[4] = {0., 0., 0.5, 1.};
+	CD_CONFIG_GET_COLOR_WITH_DEFAULT ("Configuration", "rgbinlinecolor",myConfig.RGBInLineColors, inlinecouleur);
+	
+	// couleur du bureau courant.
+	double indcouleur[4] = {0., 0., 0.5, 1.};
+	CD_CONFIG_GET_COLOR_WITH_DEFAULT ("Configuration", "rgbindcolor",myConfig.RGBIndColors, indcouleur);
+	myConfig.iDrawCurrentDesktopMode = CD_CONFIG_GET_INTEGER ("Configuration", "fill current");
+	
+	// couleur des lignes exterieures.
+	myConfig.iLineSize = CD_CONFIG_GET_INTEGER("Configuration", "linesize");
+	double linecouleur[4] = {0., 0., 0.5, 1.};
+	CD_CONFIG_GET_COLOR_WITH_DEFAULT ("Configuration", "rgblinecolor",myConfig.RGBLineColors, linecouleur);
+	
+	// couleur des traits des fenetres.
+	double wlinecouleur[4] = {0., 0., 0.5, 1.};
+	CD_CONFIG_GET_COLOR_WITH_DEFAULT ("Configuration", "rgbwlinecolor",myConfig.RGBWLineColors, wlinecouleur);
+
+	myConfig.cDefaultIcon = CD_CONFIG_GET_FILE_PATH ("Configuration", "default icon", "default.svg");
+	myConfig.cRenderer = CD_CONFIG_GET_STRING ("Configuration", "renderer");
+	myConfig.bDesklet3D = CD_CONFIG_GET_BOOLEAN ("Configuration", "3D desklet");
+	
+	gsize iNbNamesSize;
+	myConfig.cDesktopNames = CD_CONFIG_GET_STRING_LIST_WITH_DEFAULT ("Configuration", "desktop names", &iNbNamesSize, "Work;Game;Video;Chat");
+	myConfig.iNbNames = (gint) iNbNamesSize;
+CD_APPLET_GET_CONFIG_END
+
+
+CD_APPLET_RESET_CONFIG_BEGIN
+	g_free (myConfig.cRenderer);
+	g_free (myConfig.cDefaultIcon);
+	if (myConfig.cDesktopNames != NULL)
+		g_strfreev (myConfig.cDesktopNames);
+CD_APPLET_RESET_CONFIG_END
+
+
+CD_APPLET_RESET_DATA_BEGIN
+	CD_APPLET_DELETE_MY_ICONS_LIST;
+	cairo_surface_destroy (myData.pDefaultMapSurface);
+	cairo_surface_destroy (myData.pDesktopBgMapSurface);
+CD_APPLET_RESET_DATA_END
 
=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2011-10-08 22:23:24 +0000
@@ -0,0 +1,1 @@
+01-switcher-force-compact-view.patch
 
=== modified file 'Animated-icons/src/applet-unfold.c'
--- Animated-icons/src/applet-unfold.c	2011-04-20 20:46:51 +0000
+++ Animated-icons/src/applet-unfold.c	2011-10-08 22:23:24 +0000
@@ -29,7 +29,7 @@
 {
 	g_return_if_fail (pIcon->pSubDock != NULL && pIcon->pIconBuffer != NULL);
 	int w, h;
-	cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pDock), &w, &h);
+	cairo_dock_get_icon_extent (pIcon, &w, &h);
 	double f = 1. - pIcon->pSubDock->fFoldingFactor;
 	double fMaxScale = cairo_dock_get_max_scale (CAIRO_CONTAINER (pDock));
 	double z = pIcon->fScale / fMaxScale * pDock->container.fRatio;
@@ -149,7 +149,7 @@
 {
 	g_return_if_fail (pIcon->pSubDock != NULL);
 	int w, h;
-	cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pDock), &w, &h);
+	cairo_dock_get_icon_extent (pIcon, &w, &h);
 	double f = 1. - pIcon->pSubDock->fFoldingFactor;
 	double fMaxScale = cairo_dock_get_max_scale (CAIRO_CONTAINER (pDock));
 	double z = pIcon->fScale / fMaxScale * pDock->container.fRatio;
 
=== modified file 'Applets.stable' (properties changed: +x to -x)
--- Applets.stable	2011-04-20 20:46:51 +0000
+++ Applets.stable	2011-10-08 22:23:24 +0000
@@ -23,7 +23,7 @@
 terminal
 Cairo-Penguin
 showDesktop
-compiz-icon
+# compiz-icon # removed in v2.4.0
 slider
 Clipper
 GMenu
@@ -44,7 +44,7 @@
 ###Last addition of v2.1.0 :
 System-Monitor
 dnd2share
-Music-Player
+musicPlayer
 mail
 ###Added in v2.1.3
 RSSReader
@@ -57,6 +57,12 @@
 Remote-Control
 Recent-Events
 Status-Notifier
+###Added in v2.4.0
+Composite-Manager
+Impulse
 ###All other applets are considered to be either not enough functionnal, buggy/untested, or under heavy development.
 #Scooby-Do
 #Network-Monitor
+#Disks
+#Doncky
+#KDE experimental
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-08-09 19:51:45 +0000
+++ CMakeLists.txt	2011-10-08 22:23:24 +0000
@@ -10,9 +10,9 @@
 ########### project ###############
 
 project ("cairo-dock-plugins")
-set (VERSION "2.4.0~0beta2")
+set (VERSION "2.4.0~2")
 
-add_definitions (-std=c99 -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) #-Wunreachable-code -Wno-unused-parameter -Wall
+add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) # removed for stable versions: -Wstrict-prototypes #-Wunreachable-code -Wno-unused-parameter -Wall
 if (NOT ${CMAKE_BUILD_TYPE})
 	add_definitions (-O3)
 endif()
@@ -130,7 +130,7 @@
 		set (MODULES_MISSING "${MODULES_MISSING} alsa")
 	else()
 		set (GETTEXT_ALSA_MIXER ${GETTEXT_PLUGINS})
-		set (VERSION_ALSA_MIXER "1.0.13")
+		set (VERSION_ALSA_MIXER "1.1.1")
 		set (PACKAGE_ALSA_MIXER "cd-AlsaMixer")
 		set (with_alsa "yes")
 		set (alsa_mixerdatadir "${pluginsdatadir}/AlsaMixer")
@@ -178,7 +178,7 @@
 	set (MODULES_MISSING "${MODULES_MISSING} libical")
 endif()
 set (GETTEXT_CLOCK ${GETTEXT_PLUGINS})
-set (VERSION_CLOCK "2.1.3")
+set (VERSION_CLOCK "2.1.4")
 set (PACKAGE_CLOCK "cd-clock")
 set (clockuserdirname "clock")
 set (clockdatadir "${pluginsdatadir}/clock")
@@ -186,7 +186,7 @@
 add_subdirectory (clock)
 
 ############# COMPOSITE_MANAGER #################
-message (STATUS "> Coposite Manager:")
+message (STATUS "> Composite Manager:")
 set (GETTEXT_COMPOSITE_MANAGER ${GETTEXT_PLUGINS})
 set (VERSION_COMPOSITE_MANAGER "1.0.0")
 set (PACKAGE_COMPOSITE_MANAGER "cd-Composite-Manager")
@@ -196,7 +196,7 @@
 
 ############# DBUS #################
 message (STATUS "> DBus:")
-message (STATUS "* Python:")
+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 "")
@@ -206,22 +206,22 @@
 	set (with_python "no")
 else()
 	STRING (REGEX REPLACE "\n" "" PYTHON_VERSION ${PYTHON_VERSION})
-	message (STATUS "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 "   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")
 endif()
 
-message (STATUS "* Ruby:")
+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']"
 	OUTPUT_VARIABLE RUBY_LIB_DIR)
-message (STATUS "RUBY_LIBRARY: ${RUBY_LIB_DIR}")
+message (STATUS "   Ruby library dir: ${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")
@@ -231,12 +231,12 @@
 	string (REGEX REPLACE "lib/ruby/[0-9].[0-9]" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}")
 	string (REGEX REPLACE "${RUBY_LIB_DIR_INSTALL}" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}")
 	set (RUBY_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${RUBY_LIB_DIR_INSTALL}")
-	message (STATUS "  will be installed in: ${RUBY_LIB_DIR}")
+	message (STATUS "   will be installed in: ${RUBY_LIB_DIR}")
 	set (RUBY_FOUND "TRUE")
 	set (with_ruby "yes")
 endif()
 
-message (STATUS "* Mono:")
+message (STATUS " * Mono:")
 #find_package (Mono)
 find_program (GMCS_EXECUTABLE gmcs)
 if ("${GMCS_EXECUTABLE}" STREQUAL "" OR NOT EXISTS ${GMCS_EXECUTABLE})
@@ -255,13 +255,13 @@
 	endif()
 endif()
 
-message (STATUS "* Vala:")
+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")
 set (with_valac "no")
 find_program (VALAC_EXE valac)
-message (STATUS "VALAC_EXE: ${VALAC_EXE}")
+message (STATUS "   Path to valac: ${VALAC_EXE}")
 
 if ("${WITH_VALA}" STREQUAL "no")
 	set (with_vala "no")
@@ -273,7 +273,7 @@
 		OUTPUT_VARIABLE "VALA_VERSION")
 	string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION})
 	string(STRIP ${VALA_VERSION} "VALA_VERSION")
-	message (STATUS "VALA_VERSION: ${VALA_VERSION}")
+	message (STATUS "   Vala version: ${VALA_VERSION}")
 
 	STRING (REGEX REPLACE "\\..*" "" VALA_MAJOR "${VALA_VERSION}")
 	# message (STATUS "VALA_MAJOR : ${VALA_MAJOR}")
@@ -288,11 +288,11 @@
 
 	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).")
+		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) or too new (> 0.12), 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.")
@@ -471,22 +471,20 @@
 
 ############# 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()
+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()
 
 ############# INDICATOR-APPLET #################
@@ -507,8 +505,10 @@
 endif()
 if ("${INDICATOR_04_FOUND}" STREQUAL "1")
 	pkg_check_modules (INDICATOR_APPLET indicator-0.4 libido-0.1)
+	set (INDICATOR_APPLICATIONADDED_HAS_HINT 1) # now the ApplicationAdded signal (Status-Notifier) has a new parameter (hint) => https://code.launchpad.net/~ted/indicator-application/name-hints/+merge/67213
 else()
 	pkg_check_modules (INDICATOR_APPLET indicator libido-0.1)
+	set (INDICATOR_APPLICATIONADDED_HAS_HINT 0)
 endif()
 
 if ("${INDICATOR_APPLET_FOUND}" STREQUAL "1" AND "${DBUSMENU_FOUND}" STREQUAL "1" AND "${DBUSMENU_GTK_FOUND}" STREQUAL "1")
@@ -601,7 +601,7 @@
 		 AND KIO_INCLUDE_DIR
 		 AND KIO_LIBRARY
 		 AND KDE_INCLUDE_DIR)
-		message (STATUS "KDE: OK")
+		message (STATUS "  KDE: OK")
 		set (VERSION_KDE_INTEGRATION "0.0.3")
 		set (PACKAGE_KDE_INTEGRATION "cd_kde-integration")
 		set (with_kde_integration2 "yes")
@@ -614,7 +614,7 @@
 	endif()
 elseif (NOT "${enable-kde-integration}" STREQUAL "no")
 	pkg_check_modules (KDE_INTEGRATION gio-2.0)
-	message (STATUS "KDE_INTEGRATION_FOUND: ${KDE_INTEGRATION_FOUND}")
+	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")
@@ -698,10 +698,10 @@
 	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}")
+	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.9")
 	set (PACKAGE_MAIL "cd-mail")
@@ -751,7 +751,7 @@
 endif()
 
 if (NOT "${DISTRO_ID}" STREQUAL "")
-	message (STATUS "DISTRO_ID: ${DISTRO_ID}, DISTRO_RELEASE: ${DISTRO_RELEASE}")
+	message (STATUS "  DISTRO_ID: ${DISTRO_ID}, DISTRO_RELEASE: ${DISTRO_RELEASE}")
 endif()
 
 ############# INDICATOR_NAME #################
@@ -759,19 +759,21 @@
 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)")
+	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.
 		set (INDICATOR_OLD_NAMES 1)
-		message (STATUS "Indicators: use old Ayatana Dbus names")
+		message (STATUS "  Indicators: use old Ayatana Dbus names")
 	endif()
 endif()
 
 ############# MEMENU #################
 set (with_me_menu "no")
-if ("${with_indicator}" STREQUAL "yes")
+if ("${INDICATOR_04_FOUND}" STREQUAL "1")
+	message (STATUS "> MeMenu: this applet has been automatically merged with Messaging-Menu")
+elseif ("${with_indicator}" STREQUAL "yes")
 	message (STATUS "> MeMenu:")
 	set (GETTEXT_MEMENU ${GETTEXT_PLUGINS})
 	set (VERSION_MEMENU "1.0.2")
@@ -784,7 +786,7 @@
 
 ############# MESSAGING_MENU #################
 set (with_messaging_menu "no")
-if ("${with_indicator}" STREQUAL "yes")
+if ("${with_indicator}" STREQUAL "yes") 
 	message (STATUS "> Messaging-Menu:")
 	set (GETTEXT_MESSAGING_MENU ${GETTEXT_PLUGINS})
 	set (VERSION_MESSAGING_MENU "1.0.2")
@@ -807,7 +809,7 @@
 ############# MUSICPLAYER #################
 message (STATUS "> MusicPlayer:")
 set (GETTEXT_MUSICPLAYER ${GETTEXT_PLUGINS})
-set (VERSION_MUSICPLAYER "1.0.8")
+set (VERSION_MUSICPLAYER "1.1.0")
 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)
@@ -816,7 +818,7 @@
 ############# NETSPEED #################
 message (STATUS "> NetSpeed:")
 set (GETTEXT_NETSPEED ${GETTEXT_PLUGINS})
-set (VERSION_NETSPEED "1.2.6")
+set (VERSION_NETSPEED "1.2.7")
 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)
@@ -827,7 +829,7 @@
 if ("${enable-network-monitor}" STREQUAL "yes")
 	message (STATUS "> Network Monitor:")
 	set (GETTEXT_NETWORK_MONITOR ${GETTEXT_PLUGINS})
-	set (VERSION_NETWORK_MONITOR "0.2.4")
+	set (VERSION_NETWORK_MONITOR "0.2.5")
 	set (PACKAGE_NETWORK_MONITOR "cd-network-monitor")
 	set (with_network_monitor "yes")
 	set (network_monitordatadir "${pluginsdatadir}/Network-Monitor")
@@ -838,7 +840,7 @@
 ############# POWERMANAGER #################
 message (STATUS "> PowerManager:")
 set (GETTEXT_POWERMANAGER ${GETTEXT_PLUGINS})
-set (VERSION_POWERMANAGER "1.3.5")
+set (VERSION_POWERMANAGER "1.3.7")
 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)
@@ -952,7 +954,7 @@
 	set (with_exif "no")
 endif()
 set (GETTEXT_SLIDER ${GETTEXT_PLUGINS})
-set (VERSION_SLIDER "2.0.9")
+set (VERSION_SLIDER "2.0.10")
 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)
@@ -975,6 +977,12 @@
 	# set (MODULES_MISSING "${MODULES_MISSING} dbusmenu-gtk(-0.4)") # it should already be in the list.
 	set (with_status_notifier "no")
 else()
+	if ("${force_indicator_applicationadded_have_hint}" STREQUAL "yes")
+		set (INDICATOR_APPLICATIONADDED_HAS_HINT 1)
+	elseif ("${force_indicator_applicationadded_have_hint}" STREQUAL "no")
+		set (INDICATOR_APPLICATIONADDED_HAS_HINT 0)
+	endif()
+	message (STATUS "  ApplicationAdded signal has 'Hint' = ${INDICATOR_APPLICATIONADDED_HAS_HINT}")
 	set (GETTEXT_STATUS_NOTIFIER ${GETTEXT_PLUGINS})
 	set (VERSION_STATUS_NOTIFIER "0.1.4")
 	set (PACKAGE_STATUS_NOTIFIER "cd-status-notifier")
@@ -1004,7 +1012,7 @@
 	set (with_sensors "no")
 endif()
 set (GETTEXT_SYSTEM_MONITOR ${GETTEXT_PLUGINS})
-set (VERSION_SYSTEM_MONITOR "1.0.7")
+set (VERSION_SYSTEM_MONITOR "1.0.9")
 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)
@@ -1049,7 +1057,7 @@
 ############# TOONS #################
 message (STATUS "> Toons:")
 set (GETTEXT_TOONS ${GETTEXT_PLUGINS})
-set (VERSION_TOONS "1.0.9")
+set (VERSION_TOONS "1.0.10")
 set (PACKAGE_TOONS "cd-Toons")
 set (toonsdatadir "${pluginsdatadir}/Toons")
 set (toonsuserdirname "Toons")
@@ -1089,7 +1097,7 @@
 ############# WIFI #################
 message (STATUS "> WiFi:")
 set (GETTEXT_WIFI ${GETTEXT_PLUGINS})
-set (VERSION_WIFI "1.2.7")
+set (VERSION_WIFI "1.2.9")
 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)
@@ -1145,15 +1153,20 @@
 message (STATUS "===============")
 message ("")
 message (STATUS "Stable:")
+message (STATUS " Integration plug-ins:")
+message (STATUS " - with Gnome support:             ${with_gnome_integration}")
+message (STATUS " - with KDE support:               ${with_kde_integration}")
+message (STATUS " - with XFCE support:              ${with_xfce_integration}")
+message (STATUS " Plug-ins:")
 message (STATUS " - with Alsa-Mixer applet:         ${with_alsa}")
 message (STATUS " - with iCal support:              ${with_ical}")
 message (STATUS " - with GMenu applet:              ${with_gmenu}")
-message (STATUS " - with Gnome support:             ${with_gnome_integration}")
-message (STATUS " - with KDE support:               ${with_kde_integration}")
-message (STATUS " - with XFCE support:              ${with_xfce_integration}")
+message (STATUS " - with Impulse applet:            ${with_impulse}")
 message (STATUS " - with Keyboard-indicator applet: ${with_keyboard_indicator}")
 message (STATUS " - with Mail applet:               ${with_mail}")
+if (NOT "${INDICATOR_04_FOUND}" STREQUAL "1")
 message (STATUS " - with Me-Menu applet:            ${with_me_menu}")
+endif()
 message (STATUS " - with Messaging-Menu:            ${with_messaging_menu}")
 message (STATUS " - with Screen Resolution support: ${with_xrandr}")
 message (STATUS " - with Status-Notifier applet:    ${with_status_notifier}")
@@ -1171,7 +1184,6 @@
 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}")
 
=== modified file 'Cairo-Penguin/src/applet-animation.c'
--- Cairo-Penguin/src/applet-animation.c	2011-04-20 20:46:51 +0000
+++ Cairo-Penguin/src/applet-animation.c	2011-10-08 22:23:24 +0000
@@ -89,7 +89,7 @@
 {
 	g_return_if_fail (pAnimation->iTexture != 0);
 	int iIconWidth, iIconHeight;
-	cairo_dock_get_icon_extent (myIcon, myContainer, &iIconWidth, &iIconHeight);
+	CD_APPLET_GET_MY_ICON_EXTENT (&iIconWidth, &iIconHeight);
 	
 	_cairo_dock_enable_texture ();
 	_cairo_dock_set_blend_alpha ();
@@ -198,7 +198,7 @@
 		CD_APPLET_START_DRAWING_MY_ICON_OR_RETURN ();
 		
 		int iIconWidth, iIconHeight;
-		cairo_dock_get_icon_extent (myIcon, myContainer, &iIconWidth, &iIconHeight);
+		CD_APPLET_GET_MY_ICON_EXTENT (&iIconWidth, &iIconHeight);
 		
 		g_return_if_fail (pAnimation->iTexture != 0);
 		double f = (1 + myIconsParam.fAmplitude) / fScale;
 
=== modified file 'Clipper/data/Clipper.conf.in'
--- Clipper/data/Clipper.conf.in	2011-08-09 18:08:08 +0000
+++ Clipper/data/Clipper.conf.in	2011-10-08 22:23:24 +0000
@@ -16,7 +16,7 @@
 
 #S+ Image filename:
 #{Leave empty to use the default one.}
-icon=accessories-text-editor.svg
+icon=accessories-text-editor
 
 #j+[0;128] Desired icon size for this applet
 #{Set to 0 to use the default applet size}
@@ -60,7 +60,7 @@
 #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)}
+#{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
 
=== modified file 'Clipper/src/applet-clipboard.c'
--- Clipper/src/applet-clipboard.c	2011-08-09 18:08:08 +0000
+++ Clipper/src/applet-clipboard.c	2011-10-08 22:23:24 +0000
@@ -25,6 +25,8 @@
 
 const gchar *cEnvName[4] = {"other", "gnome", "kde", "xfce"};  // "other" allows to handle all the other DE (put your own actions into the corresponding file).
 
+// TODO idea: cairo_dock_cut_string => g_strstrip + cut X first char, then add '...', then the X last char + removed '\n'
+
 static int _cd_clipper_compare_item (CDClipperItem *pItem1, CDClipperItem *pItem2)
 {
 	if (pItem1->iType < pItem2->iType)  // on insere en 1er les items de la primary.
@@ -35,7 +37,7 @@
 		return 0;
 }
 
-static GList *_cd_clipper_get_last_item (CDClipperItemType iItemType)
+GList *cd_clipper_get_last_item (CDClipperItemType iItemType)
 {
 	CDClipperItem *pItem = NULL;
 	GList *pElement;
@@ -136,10 +138,10 @@
 		myData.pItems = g_list_delete_link (myData.pItems, pElement);
 		myData.iNbItems[pItem->iType] --;
 		
-		if (pItem->iType != iType && myData.iNbItems[iType] == myConfig.iNbItems[iType])
+		if (pItem->iType != iType && myData.iNbItems[iType] >= myConfig.iNbItems[iType])
 		{
 			cd_debug ("Clipper : %s remplace le dernier de l'autre selection", text);
-			pElement = _cd_clipper_get_last_item (iType);
+			pElement = cd_clipper_get_last_item (iType);
 			CD_APPLET_LEAVE_IF_FAIL (pElement != NULL);
 			cd_clipper_free_item (pElement->data);
 			myData.pItems = g_list_delete_link (myData.pItems, pElement);
@@ -152,10 +154,10 @@
 	{
 		bExistingItem = FALSE;
 		cd_debug ("%d items / %d", myData.iNbItems[iType], myConfig.iNbItems[iType]);
-		if (myData.iNbItems[iType] == myConfig.iNbItems[iType])
+		if (myData.iNbItems[iType] >= myConfig.iNbItems[iType])
 		{
 			cd_debug ("Clipper : %s remplace le dernier", text);
-			pElement = _cd_clipper_get_last_item (iType);
+			pElement = cd_clipper_get_last_item (iType);
 			CD_APPLET_LEAVE_IF_FAIL (pElement != NULL);
 			cd_clipper_free_item (pElement->data);
 			myData.pItems = g_list_delete_link (myData.pItems, pElement);
@@ -168,7 +170,7 @@
 		pItem = g_new0 (CDClipperItem, 1);
 		pItem->iType = iType;
 		pItem->cText = g_strdup (text);
-		pItem->cDisplayedText = cairo_dock_cut_string (text, 50);
+		pItem->cDisplayedText = cairo_dock_cut_string (g_strstrip (g_strdup (text)), 50); // g_strstrip: Removes leading and trailing whitespace from a string
 	}
 	myData.pItems = g_list_insert_sorted (myData.pItems, pItem, (GCompareFunc)_cd_clipper_compare_item);
 	myData.iNbItems[pItem->iType] ++;
@@ -613,16 +615,20 @@
 void cd_clipper_load_items (const gchar *cItems)
 {
 	CDClipperItem *pItem;
+	int iClipperItemType = myConfig.bSeparateSelections ? CD_CLIPPER_CLIPBOARD : CD_CLIPPER_BOTH;
 	gchar **cItemList = g_strsplit (cItems, CD_ITEMS_DELIMITER, -1);
 	int i;
 	for (i = 0; cItemList[i] != NULL; i ++)
 	{
+		// if we have reduced the number of items to display
+		if (i == myConfig.iNbItems[iClipperItemType])
+			break;
 		pItem = g_new0 (CDClipperItem, 1);
-		pItem->iType = CD_CLIPPER_CLIPBOARD;
+		pItem->iType = iClipperItemType;
 		pItem->cText = cItemList[i];
-		pItem->cDisplayedText = cairo_dock_cut_string (pItem->cText, 50);
+		pItem->cDisplayedText = cairo_dock_cut_string (g_strstrip (pItem->cText), 50); // g_strstrip: Removes leading and trailing whitespace from a string
 		myData.pItems = g_list_insert_sorted (myData.pItems, pItem, (GCompareFunc)_cd_clipper_compare_item);
-		myData.iNbItems[pItem->iType] ++;
+		myData.iNbItems[iClipperItemType] ++;
 	}
 	g_free (cItemList);
 }
 
=== modified file 'Clipper/src/applet-clipboard.h'
--- Clipper/src/applet-clipboard.h	2010-08-10 00:05:57 +0000
+++ Clipper/src/applet-clipboard.h	2011-10-08 22:23:24 +0000
@@ -25,6 +25,7 @@
 #include <cairo-dock.h>
 #include "applet-struct.h"
 
+GList *cd_clipper_get_last_item (CDClipperItemType iItemType);
 
 void _on_text_received (GtkClipboard *pClipBoard, const gchar *text, gpointer user_data); // temporairement declaree ici.
 
 
=== modified file 'Clipper/src/applet-init.c'
--- Clipper/src/applet-init.c	2010-09-07 02:38:17 +0000
+++ Clipper/src/applet-init.c	2011-10-08 22:23:24 +0000
@@ -166,5 +166,19 @@
 			g_free (myConfig.cRememberedItems);
 			myConfig.cRememberedItems = NULL;
 		}
+		// if myConfig.iNbItems[X] has decreased...
+		int i;
+		for (i = 0; i < 4; i++)
+		{
+			while (myData.iNbItems[i] > myConfig.iNbItems[i])
+			{
+				GList *pElement = cd_clipper_get_last_item (i);
+				if (pElement == NULL)
+					continue;
+				cd_clipper_free_item (pElement->data);
+				myData.pItems = g_list_delete_link (myData.pItems, pElement);
+				myData.iNbItems[i] --;
+			}
+		}
 	}
 CD_APPLET_RELOAD_END
 
=== modified file 'Composite-Manager/data/Composite-Manager.conf.in'
--- Composite-Manager/data/Composite-Manager.conf.in	2011-08-09 18:08:08 +0000
+++ Composite-Manager/data/Composite-Manager.conf.in	2011-10-08 22:23:24 +0000
@@ -58,7 +58,7 @@
 #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)}
+#{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
 
=== modified file 'Composite-Manager/src/applet-composite-manager.c'
--- Composite-Manager/src/applet-composite-manager.c	2011-08-09 18:08:08 +0000
+++ Composite-Manager/src/applet-composite-manager.c	2011-10-08 22:23:24 +0000
@@ -171,7 +171,7 @@
 
 static CDWM *_get_prefered_wmc (CDWMIndex iCurrentWm)
 {
-	g_print ("%s (%s, %d)\n", __func__, myConfig.cWmCompositor, iCurrentWm);
+	cd_debug ("%s (%s, %d)", __func__, myConfig.cWmCompositor, iCurrentWm);
 	CDWM *wm;
 	if (myConfig.cWmCompositor != NULL)  // a composite WM is defined.
 	{
@@ -218,7 +218,7 @@
 	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);
+		cd_debug (" %d) %s, %d", index[i], wm->cName, wm->bIsAvailable);
 		if (wm->bIsAvailable)
 			return wm;
 	}
@@ -227,7 +227,7 @@
 
 static CDWM *_get_prefered_wmfb (CDWMIndex iCurrentWm)
 {
-	g_print ("%s (%s, %d)\n", __func__, myConfig.cWmFallback, iCurrentWm);
+	cd_debug ("%s (%s, %d)", __func__, myConfig.cWmFallback, iCurrentWm);
 	CDWM *wm;
 	if (myConfig.cWmFallback != NULL)  // a fallback WM is defined.
 	{
@@ -249,7 +249,7 @@
 		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);
+			cd_debug ("current wm: %d, %d", iCurrentWm, wm->bIsAvailable);
 			if (wm->bIsAvailable)  // just to be sure.
 				return wm;
 		}
@@ -277,7 +277,7 @@
 	for (i = 0; i < NB_FALLBACK_WM; i ++)
 	{
 		wm = _get_wm_by_index (index[i]);
-		g_print ("  %s (%d)\n", wm->cName, wm->bIsAvailable);
+		cd_debug ("  %s (%d)", wm->cName, wm->bIsAvailable);
 		if (wm->bIsAvailable)
 			return wm;
 	}
@@ -294,7 +294,7 @@
 	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);
+	cd_debug ("***** WM: %s / %s", myData.wmc?myData.wmc->cName:NULL, myData.wmfb?myData.wmfb->cName:NULL);
 }
 void cd_define_prefered_wms (void)
 {
@@ -369,7 +369,7 @@
 
 void cd_draw_current_state (void)
 {
-	g_print ("%s (%d)\n", __func__, myData.bIsComposited);
+	cd_debug ("%s (%d)", __func__, myData.bIsComposited);
 	if (myData.bIsComposited)
 		CD_APPLET_SET_USER_IMAGE_ON_MY_ICON (myConfig.cIconCompositeON, "composite-on.png");
 	else
 
=== modified file 'Dbus/demos/demo_bash/demo_bash.conf'
--- Dbus/demos/demo_bash/demo_bash.conf	2011-04-20 20:46:51 +0000
+++ Dbus/demos/demo_bash/demo_bash.conf	2011-10-08 22:23:24 +0000
@@ -39,7 +39,7 @@
 #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)}
+#{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
 
=== modified file 'Dbus/demos/demo_mono/auto-load.conf'
--- Dbus/demos/demo_mono/auto-load.conf	2010-08-10 00:05:57 +0000
+++ Dbus/demos/demo_mono/auto-load.conf	2011-10-08 22:23:24 +0000
@@ -10,4 +10,4 @@
 category = 5
 
 # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
-version = 0.0.2
+version = 0.0.3
 
=== modified file 'Dbus/demos/demo_mono/demo_mono.conf'
--- Dbus/demos/demo_mono/demo_mono.conf	2011-04-20 20:46:51 +0000
+++ Dbus/demos/demo_mono/demo_mono.conf	2011-10-08 22:23:24 +0000
@@ -1,4 +1,4 @@
-#!en;0.0.2
+#!en;0.0.3
 
 #[gtk-about]
 [Icon]
@@ -39,7 +39,7 @@
 #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)}
+#{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
@@ -90,7 +90,7 @@
 #[gtk-preferences]
 [Configuration]
 
-#h+[/usr/share/cairo-dock/gauges;gauges;gauges] Choose one of the available themes :/
+#h+[/usr/share/cairo-dock/gauges;gauges;gauges3] Choose one of the available themes :/
 theme = Turbo-night
 
 #i[10;100] Max value :
 
=== modified file 'Dbus/demos/demo_python/auto-load.conf'
--- Dbus/demos/demo_python/auto-load.conf	2011-04-20 20:46:51 +0000
+++ Dbus/demos/demo_python/auto-load.conf	2011-10-08 22:23:24 +0000
@@ -10,10 +10,10 @@
 category = 5
 
 # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
-version = 0.0.2
+version = 0.0.3
 
 # Default icon to use if no icon has been defined by the user. If not specified, or if the file is not found, the "icon" file will be used.
 icon = 
 
 # Whether the applet can be instanciated several times or not.
-multi-instance = true
 \ No newline at end of file
+multi-instance = true
 
=== modified file 'Dbus/demos/demo_python/demo_python.conf'
--- Dbus/demos/demo_python/demo_python.conf	2011-04-20 20:46:51 +0000
+++ Dbus/demos/demo_python/demo_python.conf	2011-10-08 22:23:24 +0000
@@ -1,4 +1,4 @@
-#!en;0.0.2
+#!en;0.0.3
 
 #[gtk-about]
 [Icon]
@@ -39,7 +39,7 @@
 #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)}
+#{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
@@ -90,7 +90,7 @@
 #[gtk-preferences]
 [Configuration]
 
-#h+[/usr/share/cairo-dock/gauges;gauges;gauges] Choose one of the available themes :/
+#h+[/usr/share/cairo-dock/gauges;gauges;gauges3] Choose one of the available themes :/
 theme = Turbo-night
 
 #i[10;100] Max value :
 
=== modified file 'Dbus/demos/demo_ruby/auto-load.conf'
--- Dbus/demos/demo_ruby/auto-load.conf	2011-04-20 20:46:51 +0000
+++ Dbus/demos/demo_ruby/auto-load.conf	2011-10-08 22:23:24 +0000
@@ -10,7 +10,7 @@
 category = 5
 
 # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
-version = 0.0.1
+version = 0.0.2
 
 # Default icon to use if no icon has been defined by the user. If not specified, or if the file is not found, the "icon" file will be used.
 icon = 
 
=== modified file 'Dbus/demos/demo_ruby/demo_ruby.conf'
--- Dbus/demos/demo_ruby/demo_ruby.conf	2011-04-20 20:46:51 +0000
+++ Dbus/demos/demo_ruby/demo_ruby.conf	2011-10-08 22:23:24 +0000
@@ -1,4 +1,4 @@
-#!en;0.0.1
+#!en;0.0.2
 
 #[gtk-about]
 [Icon]
@@ -39,7 +39,7 @@
 #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)}
+#{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
@@ -90,7 +90,7 @@
 #[gtk-preferences]
 [Configuration]
 
-#h+[/usr/share/cairo-dock/gauges;gauges;gauges] Choose one of the available themes :/
+#h+[/usr/share/cairo-dock/gauges;gauges;gauges3] Choose one of the available themes :/
 theme = Turbo-night
 
 #i[10;100] Max value :
 
=== modified file 'Dbus/demos/demo_vala/auto-load.conf'
--- Dbus/demos/demo_vala/auto-load.conf	2010-08-10 00:05:57 +0000
+++ Dbus/demos/demo_vala/auto-load.conf	2011-10-08 22:23:24 +0000
@@ -10,4 +10,4 @@
 category = 5
 
 # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
-version = 0.0.2
+version = 0.0.3
 
=== modified file 'Dbus/demos/demo_vala/demo_vala.conf'
--- Dbus/demos/demo_vala/demo_vala.conf	2011-08-09 18:08:08 +0000
+++ Dbus/demos/demo_vala/demo_vala.conf	2011-10-08 22:23:24 +0000
@@ -1,4 +1,4 @@
-#!en;0.0.2
+#!en;0.0.3
 
 #[gtk-about]
 [Icon]
@@ -39,7 +39,7 @@
 #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)}
+#{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
@@ -90,7 +90,7 @@
 #[gtk-preferences]
 [Configuration]
 
-#h+[/usr/share/cairo-dock/gauges;gauges;gauges] Choose one of the available themes :/
+#h+[/usr/share/cairo-dock/gauges;gauges;gauges3] Choose one of the available themes :/
 theme = Turbo-night
 
 #i[10;100] Max value :
 
=== modified file 'Dbus/interfaces/bash/CDBashApplet.sh'
--- Dbus/interfaces/bash/CDBashApplet.sh	2011-04-20 20:46:51 +0000
+++ Dbus/interfaces/bash/CDBashApplet.sh	2011-10-08 22:23:24 +0000
@@ -36,11 +36,15 @@
 LEFT=3
 DOCK=0
 DESKLET=1
-UPPER_LEFT=0
-LOWER_RIGHT=1
-LOWER_LEFT=2
-UPPER_RIGHT=3
-MIDDLE=4
+EMBLEM_TOP_LEFT=0
+EMBLEM_BOTTOM_RIGHT=1
+EMBLEM_BOTTOM_LEFT=2
+EMBLEM_TOP_RIGHT=3
+EMBLEM_MIDDLE=4
+EMBLEM_BOTTOM=5
+EMBLEM_TOP=6
+EMBLEM_RIGHT=7
+EMBLEM_LEFT=8
 MENU_ENTRY=0
 MENU_SUB_MENU=1
 MENU_SEPARATOR=2
 
=== modified file 'Dbus/interfaces/mono/CDApplet.cs'
--- Dbus/interfaces/mono/CDApplet.cs	2011-04-20 20:46:51 +0000
+++ Dbus/interfaces/mono/CDApplet.cs	2011-10-08 22:23:24 +0000
@@ -56,11 +56,15 @@
 		DESKLET
 	}
 	public enum EmblemPosition {
-		UPPER_LEFT = 0,
-		LOWER_RIGHT,
-		LOWER_LEFT,
-		UPPER_RIGHT,
-		MIDDLE
+		EMBLEM_TOP_LEFT = 0,
+		EMBLEM_BOTTOM_RIGHT,
+		EMBLEM_BOTTOM_LEFT,
+		EMBLEM_TOP_RIGHT,
+		EMBLEM_MIDDLE,
+		EMBLEM_BOTTOM,
+		EMBLEM_TOP,
+		EMBLEM_RIGHT,
+		EMBLEM_LEFT
 	}
 	public enum MenuItemType {
 		MENU_ENTRY = 0,
 
=== modified file 'Dbus/interfaces/python/CDApplet.py'
--- Dbus/interfaces/python/CDApplet.py	2011-08-09 18:08:08 +0000
+++ Dbus/interfaces/python/CDApplet.py	2011-10-08 22:23:24 +0000
@@ -56,11 +56,15 @@
 	DOCK    = 0
 	DESKLET = 1
 	# emblem position
-	UPPER_LEFT  = 0
-	LOWER_RIGHT = 1
-	LOWER_LEFT  = 2
-	UPPER_RIGHT = 3
-	MIDDLE      = 4
+	EMBLEM_TOP_LEFT     = 0
+	EMBLEM_BOTTOM_RIGHT = 1
+	EMBLEM_BOTTOM_LEFT  = 2
+	EMBLEM_TOP_RIGHT    = 3
+	EMBLEM_MIDDLE       = 4
+	EMBLEM_BOTTOM       = 5
+	EMBLEM_TOP          = 6
+	EMBLEM_RIGHT        = 7
+	EMBLEM_LEFT         = 8
 	# menu item types
 	MENU_ENTRY        = 0
 	MENU_SUB_MENU     = 1
 
=== modified file 'Dbus/interfaces/python/CairoDock.py'
--- Dbus/interfaces/python/CairoDock.py	2011-08-09 18:08:08 +0000
+++ Dbus/interfaces/python/CairoDock.py	2011-10-08 22:23:24 +0000
@@ -42,11 +42,15 @@
 	DOCK    = "Dock"
 	DESKLET = "Desklet"
 	# emblem position
-	UPPER_LEFT  = 0
-	LOWER_RIGHT = 1
-	LOWER_LEFT  = 2
-	UPPER_RIGHT = 3
-	MIDDLE      = 4
+	EMBLEM_TOP_LEFT     = 0
+	EMBLEM_BOTTOM_RIGHT = 1
+	EMBLEM_BOTTOM_LEFT  = 2
+	EMBLEM_TOP_RIGHT    = 3
+	EMBLEM_MIDDLE       = 4
+	EMBLEM_BOTTOM       = 5
+	EMBLEM_TOP          = 6
+	EMBLEM_RIGHT        = 7
+	EMBLEM_LEFT         = 8
 	# module category
 	CATEGORY_BEHAVIOR         = 0
 	CATEGORY_THEME            = 1
 
=== modified file 'Dbus/interfaces/ruby/CDApplet.rb'
--- Dbus/interfaces/ruby/CDApplet.rb	2011-04-20 20:46:51 +0000
+++ Dbus/interfaces/ruby/CDApplet.rb	2011-10-08 22:23:24 +0000
@@ -35,11 +35,15 @@
 	DOCK    = 0
 	DESKLET = 1
 	
-	UPPER_LEFT  = 0
-	LOWER_RIGHT = 1
-	LOWER_LEFT  = 2
-	UPPER_RIGHT = 3
-	MIDDLE      = 4
+	EMBLEM_TOP_LEFT     = 0
+	EMBLEM_BOTTOM_RIGHT = 1
+	EMBLEM_BOTTOM_LEFT  = 2
+	EMBLEM_TOP_RIGHT    = 3
+	EMBLEM_MIDDLE       = 4
+	EMBLEM_BOTTOM       = 5
+	EMBLEM_TOP          = 6
+	EMBLEM_RIGHT        = 7
+	EMBLEM_LEFT         = 8
 	
 	MENU_ENTRY        = 0
 	MENU_SUB_MENU     = 1
 
=== modified file 'Dbus/interfaces/vala/CDApplet.vala'
--- Dbus/interfaces/vala/CDApplet.vala	2011-04-20 20:46:51 +0000
+++ Dbus/interfaces/vala/CDApplet.vala	2011-10-08 22:23:24 +0000
@@ -97,11 +97,15 @@
 		DESKLET
 	}
 	public enum EmblemPosition {
-		UPPER_LEFT = 0,
-		LOWER_RIGHT,
-		LOWER_LEFT,
-		UPPER_RIGHT,
-		MIDDLE
+		EMBLEM_TOP_LEFT = 0,
+		EMBLEM_BOTTOM_RIGHT,
+		EMBLEM_BOTTOM_LEFT,
+		EMBLEM_TOP_RIGHT,
+		EMBLEM_MIDDLE,
+		EMBLEM_BOTTOM,
+		EMBLEM_TOP,
+		EMBLEM_RIGHT,
+		EMBLEM_LEFT
 	}
 	public enum MenuItemType {
 		MENU_ENTRY = 0,
@@ -254,10 +258,10 @@
 	}
 	private void _on_reload(bool bConfigHasChanged)
 	{
-		print (">>> our module is reloaded");
+		print (">>> our module is reloaded\n");
 		if (bConfigHasChanged)
 		{
-			print (">>>  and our config has changed");
+			print (">>>  and our config has changed\n");
 			this._get_config();
 			this.reload();
 		}
@@ -294,7 +298,7 @@
 		}
 		catch (IOError e)
 		{
-			GLib.error (">>> module '%s' can't be found on the bus, exit.\nError was: %s", this.cAppletName, e.message);
+			GLib.error (">>> module '%s' can't be found on the bus, exit.\nError was: %s\n", this.cAppletName, e.message);
 		}
 		try
 		{
@@ -304,7 +308,7 @@
 		}
 		catch (IOError e)
 		{
-			GLib.error (">>> module '%s' can't be found on the bus, exit.\nError was: %s", this.cAppletName, e.message);
+			GLib.error (">>> module '%s' can't be found on the bus, exit.\nError was: %s\n", this.cAppletName, e.message);
 		}
 		this.icon.on_click.connect(on_click);  // when the user left-clicks on our icon.
 		this.icon.on_middle_click.connect(on_middle_click);  // when the user middle-clicks on our icon.
 
=== modified file 'Dbus/interfaces/vala/src/CDApplet.h'
--- Dbus/interfaces/vala/src/CDApplet.h	2011-04-20 20:46:51 +0000
+++ Dbus/interfaces/vala/src/CDApplet.h	2011-10-08 22:23:24 +0000
@@ -1,8 +1,8 @@
 /* CDApplet.h generated by valac 0.10.0, the Vala compiler, do not modify */
 
 
-#ifndef ___HOME_FAB_CD2_CAIRO_DOCK_PLUG_INS_DBUS_INTERFACES_VALA_SRC_CDAPPLET_H__
-#define ___HOME_FAB_CD2_CAIRO_DOCK_PLUG_INS_DBUS_INTERFACES_VALA_SRC_CDAPPLET_H__
+#ifndef ___HOME_FAB_CD2_4_PLUG_INS_DBUS_INTERFACES_VALA_SRC_CDAPPLET_H__
+#define ___HOME_FAB_CD2_4_PLUG_INS_DBUS_INTERFACES_VALA_SRC_CDAPPLET_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -138,11 +138,15 @@
 } CairoDockAppletCDAppletContainerType;
 
 typedef enum  {
-	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_UPPER_LEFT = 0,
-	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_LOWER_RIGHT,
-	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_LOWER_LEFT,
-	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_UPPER_RIGHT,
-	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_MIDDLE
+	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_TOP_LEFT = 0,
+	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_BOTTOM_RIGHT,
+	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_BOTTOM_LEFT,
+	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_TOP_RIGHT,
+	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_MIDDLE,
+	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_BOTTOM,
+	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_TOP,
+	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_RIGHT,
+	CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_LEFT
 } CairoDockAppletCDAppletEmblemPosition;
 
 typedef enum  {
 
=== modified file 'Dbus/interfaces/vala/src/CDApplet.vapi'
--- Dbus/interfaces/vala/src/CDApplet.vapi	2011-04-20 20:46:51 +0000
+++ Dbus/interfaces/vala/src/CDApplet.vapi	2011-10-08 22:23:24 +0000
@@ -18,11 +18,15 @@
 			}
 			[CCode (cprefix = "CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_", cheader_filename = "CDApplet.h")]
 			public enum EmblemPosition {
-				UPPER_LEFT,
-				LOWER_RIGHT,
-				LOWER_LEFT,
-				UPPER_RIGHT,
-				MIDDLE
+				EMBLEM_TOP_LEFT,
+				EMBLEM_BOTTOM_RIGHT,
+				EMBLEM_BOTTOM_LEFT,
+				EMBLEM_TOP_RIGHT,
+				EMBLEM_MIDDLE,
+				EMBLEM_BOTTOM,
+				EMBLEM_TOP,
+				EMBLEM_RIGHT,
+				EMBLEM_LEFT
 			}
 			[CCode (cprefix = "CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_ID_", cheader_filename = "CDApplet.h")]
 			public enum MenuItemId {
 
=== modified file 'Dbus/src/applet-struct.h'
--- Dbus/src/applet-struct.h	2011-04-20 20:46:51 +0000
+++ Dbus/src/applet-struct.h	2011-10-08 22:23:24 +0000
@@ -105,7 +105,6 @@
 	dbusMainObject *pMainObject;
 	const gchar *cProgName;
 	gchar *cBasePath;
-	GList *pAppletList;
 	GtkWidget *pModuleSubMenu;
 	GtkWidget *pModuleMainMenu;
 	dbusApplet *pCurrentMenuDbusApplet;
 
=== modified file 'Dbus/src/interface-applet-methods.c'
--- Dbus/src/interface-applet-methods.c	2011-08-09 18:08:08 +0000
+++ Dbus/src/interface-applet-methods.c	2011-10-08 22:23:24 +0000
@@ -131,10 +131,18 @@
 	
 	g_return_val_if_fail (pIcon->pIconBuffer != NULL, FALSE);
 	
-	CairoEmblem *pEmblem = cairo_dock_make_emblem (cImage, pIcon, pContainer);
+	if (cImage == NULL || *cImage == '\0' || strcmp (cImage, "none") == 0)
+	{
+		cairo_dock_remove_overlay_at_position (pIcon, iPosition);
+	}
+	else
+	{
+		cairo_dock_add_overlay_from_image (pIcon, cImage, iPosition);
+	}
+	/**CairoEmblem *pEmblem = cairo_dock_make_emblem (cImage, pIcon);
 	pEmblem->iPosition = iPosition;
 	cairo_dock_draw_emblem_on_icon (pEmblem, pIcon, pContainer);
-	cairo_dock_free_emblem (pEmblem);
+	cairo_dock_free_emblem (pEmblem);*/
 	
 	cairo_dock_redraw_icon (pIcon, pContainer);
 	return TRUE;
@@ -149,7 +157,7 @@
 	
 	if (CAIRO_DOCK_IS_DOCK (pContainer) && cAnimation != NULL)
 	{
-		cairo_dock_request_icon_animation (pIcon, CAIRO_DOCK (pContainer), cAnimation, iNbRounds);
+		cairo_dock_request_icon_animation (pIcon, pContainer, cAnimation, iNbRounds);
 		return TRUE;
 	}
 	return FALSE;
@@ -371,7 +379,7 @@
 					}
 					if (iNbCharsMax != 0)
 					{
-						gchar *cLabel = g_strdup_printf ("<b>%d</b>", cInitialText ? strlen (cInitialText) : 0);
+						gchar *cLabel = g_strdup_printf ("<b>%zd</b>", cInitialText ? strlen (cInitialText) : 0);
 						GtkWidget *pLabel = gtk_label_new (cLabel);
 						g_free (cLabel);
 						gtk_label_set_use_markup (GTK_LABEL (pLabel), TRUE);
@@ -842,7 +850,9 @@
 		memset (&attr, 0, sizeof (CairoGraphAttribute));
 		pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
 		pRenderAttr->cModelName = "graph";
-		pRenderAttr->iMemorySize = (pIcon->fWidth > 1 ? pIcon->fWidth : 32);  // fWidht peut etre <= 1 en mode desklet au chargement.
+		int w, h;
+		cairo_dock_get_icon_extent (pIcon, &w, &h);
+		pRenderAttr->iMemorySize = (w > 1 ? w : 32);
 		// Line;Plain;Bar;Circle;Plain Circle
 		if (cTheme == NULL || strcmp (cTheme, "Line") == 0)
 			attr.iType = CAIRO_DOCK_GRAPH_LINE;
@@ -854,7 +864,6 @@
 			attr.iType = CAIRO_DOCK_GRAPH_CIRCLE;
 		else if (strcmp (cTheme, "Plain Circle") == 0)
 			attr.iType = CAIRO_DOCK_GRAPH_CIRCLE_PLAIN;
-		attr.iRadius = 10;
 		attr.bMixGraphs = FALSE;
 		double *fHighColor = g_new (double, iNbValues*3);
 		double *fLowColor = g_new (double, iNbValues*3);
@@ -1286,7 +1295,7 @@
 	else if (strcmp (cProperty, "width") == 0)
 	{
 		int iWidth, iHeight;
-		cairo_dock_get_icon_extent (pIcon, pContainer, &iWidth, &iHeight);
+		cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
 		if (pInstance->pDock)
 		{
 			double a = cairo_dock_get_max_scale (pContainer);
@@ -1299,7 +1308,7 @@
 	else if (strcmp (cProperty, "height") == 0)
 	{
 		int iWidth, iHeight;
-		cairo_dock_get_icon_extent (pIcon, pContainer, &iWidth, &iHeight);
+		cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
 		if (pInstance->pDock)
 		{
 			double a = cairo_dock_get_max_scale (pContainer);
@@ -1354,7 +1363,7 @@
 	}
 	CairoDockPositionType iScreenBorder = ((! pContainer->bIsHorizontal) << 1) | (! pContainer->bDirectionUp);
 	int iWidth, iHeight;
-	cairo_dock_get_icon_extent (pIcon, pContainer, &iWidth, &iHeight);
+	cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
 	if (pInstance->pDock)
 	{
 		double a = cairo_dock_get_max_scale (pContainer);
 
=== modified file 'Dbus/src/interface-applet-object.c'
--- Dbus/src/interface-applet-object.c	2011-04-20 20:46:51 +0000
+++ Dbus/src/interface-applet-object.c	2011-10-08 22:23:24 +0000
@@ -29,6 +29,7 @@
 #include "interface-applet-object.h"
 
 static int s_iModuleId = 1;
+static GList *s_pAppletList = NULL;
 
 static void cd_dbus_applet_dispose (GObject *object);
 static void cd_dbus_applet_finalize (GObject *object);
@@ -93,7 +94,7 @@
 {
 	dbusApplet *pDbusApplet = NULL;
 	GList *a;
-	for (a = myData.pAppletList; a != NULL; a = a->next)
+	for (a = s_pAppletList; a != NULL; a = a->next)
 	{
 		pDbusApplet = a->data;
 		if (pDbusApplet->pModuleInstance == pModuleInstance)
@@ -103,7 +104,7 @@
 }
 
 
-#define _applet_list_is_empty() (myData.pAppletList == NULL)
+#define _applet_list_is_empty() (s_pAppletList == NULL)
 
 dbusApplet *cd_dbus_create_remote_applet_object (CairoDockModuleInstance *pModuleInstance)
 {
@@ -182,13 +183,13 @@
 		myData.xActiveWindow = cairo_dock_get_current_active_window ();
 	}
 	
-	myData.pAppletList = g_list_prepend (myData.pAppletList, pDbusApplet);
+	s_pAppletList = g_list_prepend (s_pAppletList, pDbusApplet);
 	return pDbusApplet;
 }
 
 void cd_dbus_delete_remote_applet_object (dbusApplet *pDbusApplet)
 {
-	myData.pAppletList = g_list_remove (myData.pAppletList, pDbusApplet);
+	s_pAppletList = g_list_remove (s_pAppletList, pDbusApplet);
 	
 	if (_applet_list_is_empty ())  // si plus d'applet dbus, inutile de garder les notifications actives.
 	{
 
=== modified file 'Dbus/src/interface-applet-signals.c'
--- Dbus/src/interface-applet-signals.c	2011-08-09 18:08:08 +0000
+++ Dbus/src/interface-applet-signals.c	2011-10-08 22:23:24 +0000
@@ -258,7 +258,7 @@
 	}
 }
 
-#define CAIRO_DOCK_IS_EXTERNAL_APPLET(pIcon) (CAIRO_DOCK_IS_APPLET (pIcon) && pIcon->pModuleInstance->pModule->cSoFilePath == NULL)
+#define CAIRO_DOCK_IS_EXTERNAL_APPLET(pIcon) (CAIRO_DOCK_IS_APPLET (pIcon) && pIcon->pModuleInstance->pModule->cSoFilePath == NULL && pIcon->pModuleInstance->pModule->pInterface->stopModule == cd_dbus_emit_on_stop_module)
 
 static inline Icon *_get_main_icon_from_clicked_icon (Icon *pIcon, CairoContainer *pContainer)
 {
 
=== modified file 'Dbus/src/interface-main-methods.c'
--- Dbus/src/interface-main-methods.c	2011-08-09 18:08:08 +0000
+++ Dbus/src/interface-main-methods.c	2011-10-08 22:23:24 +0000
@@ -777,7 +777,7 @@
 	g_value_set_boolean (v, pModule->pVisitCard->bMultiInstance);
 	g_hash_table_insert (h, g_strdup ("is-multi-instance"), v);
 	
-	g_print ("list instances ...\n");
+	cd_debug ("list instances ...");
 	gchar **pInstances = g_new0 (gchar*, g_list_length (pModule->pInstancesList)+1);
 	CairoDockModuleInstance *pInstance;
 	int i = 0;
@@ -787,12 +787,12 @@
 		pInstance = mi->data;
 		pInstances[i++] = g_strdup (pInstance->cConfFilePath);
 	}
-	g_print ("write instances ...\n");
+	cd_debug ("write instances ...");
 	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");
+	cd_debug ("done.");
 	return TRUE;  // continue
 }
 gboolean cd_dbus_main_get_module_properties (dbusMainObject *pDbusCallback, const gchar *cName, GPtrArray **pAttributes, GError **error)
@@ -1013,7 +1013,7 @@
 			NULL,
 			fOrder);
 		pIcon->iTrueType = CAIRO_DOCK_ICON_TYPE_CONTAINER;
-		pIcon->iSubdockViewType = iSubdockViewType;
+		cairo_dock_set_subdock_content_renderer (pIcon, iSubdockViewType);
 		pIcon->pSubDock = cairo_dock_create_subdock_from_scratch (NULL, pIcon->cName, pParentDock);  // NULL <=> default sub-docks view.
 	}
 	else if (strcmp (cType, "Separator") == 0)
@@ -1281,14 +1281,22 @@
 		if (pContainer == NULL)
 			continue;
 		
-		cairo_t *pIconContext = cairo_create (pIcon->pIconBuffer);
-	
-		CairoEmblem *pEmblem = cairo_dock_make_emblem (cImage, pIcon, pContainer);
+		if (cImage == NULL || *cImage == '\0' || strcmp (cImage, "none") == 0)
+		{
+			cairo_dock_remove_overlay_at_position (pIcon, iPosition);
+		}
+		else
+		{
+			if (iPosition < 0)  // [-N, -1]
+				cairo_dock_print_overlay_on_icon (pIcon, pContainer, cImage, - iPosition - 1);
+			else  // [0, N-1]
+				cairo_dock_add_overlay_from_image (pIcon, cImage, iPosition);
+		}
+		/**CairoEmblem *pEmblem = cairo_dock_make_emblem (cImage, pIcon);
 		pEmblem->iPosition = iPosition;
 		cairo_dock_draw_emblem_on_icon (pEmblem, pIcon, pContainer);
-		cairo_dock_free_emblem (pEmblem);
+		cairo_dock_free_emblem (pEmblem);*/
 
-		cairo_destroy (pIconContext);
 		cairo_dock_redraw_icon (pIcon, pContainer);
 	}
 	
@@ -1314,7 +1322,7 @@
 		pContainer = cairo_dock_search_container_from_icon (pIcon);
 		if (! CAIRO_DOCK_IS_DOCK (pContainer))
 			continue;
-		cairo_dock_request_icon_animation (pIcon, CAIRO_DOCK (pContainer), cAnimation, iNbRounds);
+		cairo_dock_request_icon_animation (pIcon, pContainer, cAnimation, iNbRounds);
 	}
 	
 	g_list_free (pList);
 
=== modified file 'Disks/data/Disks.conf.in'
--- Disks/data/Disks.conf.in	2011-08-09 18:08:08 +0000
+++ Disks/data/Disks.conf.in	2011-10-08 22:23:24 +0000
@@ -42,7 +42,7 @@
 size = 96;96
 
 #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)}
+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
 accessibility=0
 
 #b Should be visible on all desktops?
@@ -116,9 +116,12 @@
 #X[Gauge;gtk-dialog-info]
 frame_gauge=
 
-#h+[@gaugesdir@;gauges;gauges] Choose one of the available themes:/
+#h+[@gaugesdir@;gauges;gauges3] Choose one of the available themes:/
 theme = Turbo-night-fuel
 
+#l+[No;With dock orientation;Yes] Rotate applet theme :
+rotate theme = No
+
 
 #X[Graph;gtk-dialog-info]
 frame_graph=
 
=== modified file 'Disks/src/applet-config.c'
--- Disks/src/applet-config.c	2011-08-09 18:08:08 +0000
+++ Disks/src/applet-config.c	2011-10-08 22:23:24 +0000
@@ -35,6 +35,7 @@
 
 	///\_________________ Gauge
 	myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");
+	myConfig.iRotateTheme = CD_CONFIG_GET_INTEGER ("Configuration", "rotate theme");
 		
 	///\_________________ Graph
 	myConfig.iGraphType = CD_CONFIG_GET_INTEGER ("Configuration", "graphic type");
 
=== modified file 'Disks/src/applet-disks.c'
--- Disks/src/applet-disks.c	2011-08-09 18:08:08 +0000
+++ Disks/src/applet-disks.c	2011-10-08 22:23:24 +0000
@@ -331,6 +331,7 @@
 		g_list_free_full (myData.lParts, g_free);
 #else
 		g_list_foreach (myData.lParts, (GFunc) _reset_parts_list, NULL);
+		g_list_free (myData.lParts);
 #endif
 		myData.lParts = NULL;
 	}
 
=== modified file 'Disks/src/applet-init.c'
--- Disks/src/applet-init.c	2011-08-09 18:08:08 +0000
+++ Disks/src/applet-init.c	2011-10-08 22:23:24 +0000
@@ -67,6 +67,7 @@
 		memset (&attr, 0, sizeof (CairoGaugeAttribute));
 		pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
 		pRenderAttr->cModelName = "gauge";
+		pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
 		attr.cThemePath = myConfig.cGThemePath;
 	}
 	else if (myConfig.iDisplayType == CD_DISKS_GRAPH)
@@ -75,7 +76,7 @@
 		memset (&attr, 0, sizeof (CairoGraphAttribute));
 		pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
 		pRenderAttr->cModelName = "graph";
-		pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32);  // fWidht peut etre <= 1 en mode desklet au chargement.
+		pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32);  // fWidth peut etre <= 1 en mode desklet au chargement.
 		attr.iType = myConfig.iGraphType;
 		attr.iRadius = 10;
 		attr.bMixGraphs = myConfig.bMixGraph;
@@ -202,7 +203,10 @@
 		}
 		if (myConfig.iInfoDisplay != CAIRO_DOCK_INFO_ON_LABEL)
 		{
-			CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
+			if (myConfig.defaultTitle) // has another default name
+				CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
+			else
+				CD_APPLET_SET_NAME_FOR_MY_ICON (myApplet->pModule->pVisitCard->cTitle);
 		}
 		
 		cairo_dock_relaunch_task_immediately (myData.pPeriodicTask, myConfig.iCheckInterval);
 
=== modified file 'Disks/src/applet-struct.h'
--- Disks/src/applet-struct.h	2011-08-09 18:08:08 +0000
+++ Disks/src/applet-struct.h	2011-10-08 22:23:24 +0000
@@ -47,6 +47,7 @@
 struct _AppletConfig {
 	gchar *defaultTitle;
 	gchar *cGThemePath;
+	RendererRotateTheme iRotateTheme;
 	gchar *cWatermarkImagePath;  // delete ?
 	gdouble fAlpha;
 	
 
=== modified file 'Doncky/data/Doncky.conf.in'
--- Doncky/data/Doncky.conf.in	2011-08-09 18:08:08 +0000
+++ Doncky/data/Doncky.conf.in	2011-10-08 22:23:24 +0000
@@ -54,7 +54,7 @@
 #b Is detached from the dock
 initially detached=true
 #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)}
+#{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
 
=== modified file 'Folders/data/CMakeLists.txt'
--- Folders/data/CMakeLists.txt	2010-08-10 00:05:57 +0000
+++ Folders/data/CMakeLists.txt	2011-10-08 22:23:24 +0000
@@ -5,6 +5,6 @@
 
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Folders.conf
 	preview.jpg
-	icon.svg
+	icon.png
 	DESTINATION ${foldersdatadir})
 
 
=== modified file 'Folders/data/Folders.conf.in'
--- Folders/data/Folders.conf.in	2011-08-09 18:08:08 +0000
+++ Folders/data/Folders.conf.in	2011-10-08 22:23:24 +0000
@@ -66,7 +66,7 @@
 #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)}
+#{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
 
=== modified file 'Folders/data/icon.png' (properties changed: +x to -x)
 Binary files Folders/data/icon.png	2010-08-10 00:05:57 +0000 and Folders/data/icon.png	2011-10-08 22:23:24 +0000 differ
=== removed file 'Folders/data/icon.svg'
--- Folders/data/icon.svg	2010-08-10 00:05:57 +0000
+++ Folders/data/icon.svg	1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created with Inkscape (http://www.inkscape.org/) --><svg height="128.00000pt" id="svg1" inkscape:version="0.39cvs" sodipodi:docbase="/home/andy/Desktop/etiquette-icons-0.4/scalable/filesystems" sodipodi:docname="gnome-fs-home.svg" sodipodi:version="0.32" width="128.00000pt" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <metadata>
-    <rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <cc:Work rdf:about="">
-        <dc:title>Etiquette Icons</dc:title>
-        <dc:description></dc:description>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>hash</rdf:li>
-            <rdf:li></rdf:li>
-            <rdf:li>filesystem</rdf:li>
-            <rdf:li>computer</rdf:li>
-            <rdf:li>icons</rdf:li>
-            <rdf:li>folder</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:publisher>
-          <cc:Agent rdf:about="http://www.openclipart.org">
-            <dc:title>Andy Fitzsimon</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andy Fitzsimon</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>Andy Fitzsimon</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:date></dc:date>
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
-        <dc:language>en</dc:language>
-      </cc:Work>
-      <cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
-        <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
-        <cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
-        <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <defs id="defs3">
-    <linearGradient id="linearGradient2102">
-      <stop id="stop2103" offset="0.0000000" style="stop-color:#bab5ab;stop-opacity:1.0000000;"/>
-      <stop id="stop2104" offset="1.0000000" style="stop-color:#eae8e3;stop-opacity:1.0000000;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient1520">
-      <stop id="stop1522" offset="0.0000000" style="stop-color:#7590ae;stop-opacity:1.0000000;"/>
-      <stop id="stop1523" offset="1.0000000" style="stop-color:#314e6c;stop-opacity:1.0000000;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient1806">
-      <stop id="stop1807" offset="0.0000000" style="stop-color:#000000;stop-opacity:0.40677965;"/>
-      <stop id="stop3276" offset="0.64777780" style="stop-color:#000000;stop-opacity:0.073446326;"/>
-      <stop id="stop1808" offset="1.0000000" style="stop-color:#000000;stop-opacity:0.0000000;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient1517">
-      <stop id="stop1518" offset="0.0000000" style="stop-color:#ffffff;stop-opacity:0.0000000;"/>
-      <stop id="stop1519" offset="1.0000000" style="stop-color:#ffffff;stop-opacity:1.0000000;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient1504">
-      <stop id="stop1505" offset="0.0000000" style="stop-color:#a3a3a3;stop-opacity:1.0000000;"/>
-      <stop id="stop1506" offset="1.0000000" style="stop-color:#ffffff;stop-opacity:1.0000000;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient1792">
-      <stop id="stop1793" offset="0.0000000" style="stop-color:#000000;stop-opacity:0.084745765;"/>
-      <stop id="stop1795" offset="0.63222224" style="stop-color:#000000;stop-opacity:0.38418078;"/>
-      <stop id="stop1794" offset="1.0000000" style="stop-color:#000000;stop-opacity:0.0000000;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient1511">
-      <stop id="stop1512" offset="0.0000000" style="stop-color:#4b6983;stop-opacity:1.0000000;"/>
-      <stop id="stop1513" offset="1.0000000" style="stop-color:#9db8d2;stop-opacity:1.0000000;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient1501">
-      <stop id="stop1502" offset="0.0000000" style="stop-color:#ffffff;stop-opacity:1.0000000;"/>
-      <stop id="stop1504" offset="1.0000000" style="stop-color:#ffffff;stop-opacity:0.0000000;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient1499" x1="0.85826772" x2="0.062992126" xlink:href="#linearGradient1501" y1="0.14062500" y2="0.54687500"/>
-    <linearGradient id="linearGradient1492">
-      <stop id="stop1493" offset="0.0000000" style="stop-color:#c0c0c0;stop-opacity:1.0000000;"/>
-      <stop id="stop1496" offset="0.34923077" style="stop-color:#f1f1f1;stop-opacity:1.0000000;"/>
-      <stop id="stop1494" offset="1.0000000" style="stop-color:#f0f0f0;stop-opacity:1.0000000;"/>
-    </linearGradient>
-    <linearGradient id="linearGradient1495" x1="0.88034189" x2="0.085470088" xlink:href="#linearGradient1492" y1="0.21093750" y2="1.1796875"/>
-    <linearGradient id="linearGradient1506" x1="0.68278474" x2="0.68278474" xlink:href="#linearGradient2102" y1="0.18663210" y2="1.0092229"/>
-    <radialGradient cx="0.49032259" cy="0.50649351" fx="0.50977784" fy="0.15800871" id="radialGradient1505" r="0.46014288" xlink:href="#linearGradient1806"/>
-    <radialGradient cx="0.49032259" cy="0.50649351" fx="0.49027237" fy="0.095238097" id="radialGradient1502" r="0.46014288" xlink:href="#linearGradient1806"/>
-    <linearGradient id="linearGradient1518">
-      <stop id="stop1520" offset="0.0000000" style="stop-color:#000000;stop-opacity:1.0000000;"/>
-      <stop id="stop1521" offset="1.0000000" style="stop-color:#ebebeb;stop-opacity:1.0000000;"/>
-    </linearGradient>
-    <linearGradient gradientTransform="scale(1.385990,0.721506)" gradientUnits="userSpaceOnUse" id="linearGradient1507" x1="68.708969" x2="68.708969" xlink:href="#linearGradient1511" y1="111.90047" y2="191.01146"/>
-    <linearGradient id="linearGradient1510" x1="0.55371535" x2="0.48209488" xlink:href="#linearGradient1806" y1="0.27680120" y2="1.4089690"/>
-    <linearGradient id="linearGradient1514" x1="0.49707603" x2="0.49707603" xlink:href="#linearGradient1520" y1="0.053910151" y2="0.40625000"/>
-    <radialGradient id="radialGradient1515" xlink:href="#linearGradient1511"/>
-    <linearGradient id="linearGradient1516" x1="0.51567942" x2="0.53310102" xlink:href="#linearGradient1517" y1="0.76666665" y2="-0.10000000"/>
-    <linearGradient id="linearGradient1521" xlink:href="#linearGradient1792"/>
-    <radialGradient cx="0.50522649" cy="0.54545456" fx="0.50871080" fy="0.26136363" id="radialGradient1950" r="0.38421080" xlink:href="#linearGradient1792"/>
-    <linearGradient id="linearGradient1522" xlink:href="#linearGradient1518"/>
-    <linearGradient id="linearGradient1599" xlink:href="#linearGradient1792"/>
-    <linearGradient id="linearGradient2352" x1="0.50522649" x2="0.50522649" xlink:href="#linearGradient1792" y1="1.8974513" y2="0.32051283"/>
-    <linearGradient id="linearGradient1497" xlink:href="#linearGradient1492"/>
-  </defs>
-  <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" gridspacingx="2.5000000mm" gridspacingy="2.5000000mm" id="base" inkscape:cx="156.35533" inkscape:cy="126.76260" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="501" inkscape:window-width="599" inkscape:window-x="265" inkscape:window-y="122" inkscape:zoom="1.2011993" pagecolor="#ffffff" showgrid="false" snaptogrid="false"/>
-  <g id="g1621" style="fill:#ffffff;fill-opacity:0.20430107;" transform="matrix(1.056550,0.000000,0.000000,1.056550,-132.2439,88.48814)">
-    <path d="M 158.06250,-77.656250 C 150.33842,-77.636797 145.44083,-69.199281 146.50263,-62.129272 C 146.31518,-52.347100 146.19816,-42.563767 146.03125,-32.781250 C 138.77736,-30.499103 134.85098,-22.678344 135.57329,-15.403545 C 136.11802,-3.9029094 138.14866,7.4720113 139.48318,18.898801 C 140.44347,23.963266 140.47980,29.388446 142.56319,34.132790 C 145.86543,39.628238 152.90598,40.529305 158.71739,39.905842 C 191.41553,40.062947 224.11447,40.054030 256.81250,39.875000 C 263.43388,36.980208 264.71813,29.043726 265.34933,22.646580 C 267.37683,9.1198459 269.91467,-4.3342879 271.45758,-17.930690 C 272.16212,-25.113770 265.70267,-29.565231 262.06495,-33.893679 C 261.15574,-40.218455 262.05399,-46.652921 261.36659,-53.015204 C 261.21848,-57.975877 260.14178,-64.521742 254.20179,-65.459786 C 248.53755,-66.553586 242.71560,-65.584010 236.98918,-66.020283 C 228.39904,-66.107275 219.80889,-66.194261 211.21875,-66.281250 C 205.29983,-69.099380 203.03646,-77.639836 195.72328,-77.801518 C 183.17051,-77.714934 170.61219,-78.111226 158.06250,-77.656250 z " id="path1559" style="fill-rule:evenodd;stroke-width:1.2500000;stroke-opacity:0.33962265;fill:#ffffff;fill-opacity:0.20430107;"/>
-    <path d="M 159.18750,-80.218750 C 150.48428,-80.838790 144.00999,-72.453178 144.11020,-64.254369 C 143.11939,-55.185354 144.07536,-45.992549 143.13363,-36.949168 C 138.04231,-29.926366 131.27934,-22.686941 133.07476,-12.723316 C 134.58995,2.5737368 136.91553,17.787633 138.90625,33.031250 C 142.42615,40.907408 151.49988,43.202015 159.36983,42.121944 C 192.40096,42.492716 225.43715,42.739921 258.46875,42.281250 C 268.88857,35.112424 267.93871,21.299242 270.00049,10.231906 C 271.27288,0.13302302 273.18321,-9.9475589 274.00945,-20.064209 C 273.34232,-28.182409 263.86174,-32.418893 264.47218,-40.850023 C 263.32975,-48.961625 265.74021,-59.212401 259.49201,-65.446312 C 251.23151,-70.897196 240.86542,-68.061580 231.59153,-68.904519 C 224.70096,-69.921717 216.33317,-67.112713 210.48638,-70.821698 C 205.17991,-76.745140 198.04305,-81.781910 189.67793,-80.269272 C 179.51446,-80.252431 169.35098,-80.235590 159.18750,-80.218750 z " id="path1573" style="fill-rule:evenodd;stroke-width:1.2500000;stroke-opacity:0.33962265;fill:#ffffff;fill-opacity:0.20430107;"/>
-    <path d="M 156.93750,-83.562500 C 148.47071,-82.628394 142.18560,-74.798771 141.31127,-66.614619 C 139.07719,-56.752443 141.26926,-46.463541 138.85705,-36.626083 C 134.93015,-31.182966 129.58151,-25.850344 130.46544,-18.524671 C 129.41574,-1.3542399 133.74672,15.485198 135.37623,32.475224 C 137.36469,40.898949 146.69001,45.462856 154.80951,45.128239 C 189.72134,45.756729 224.65378,45.974423 259.56595,45.137760 C 266.07960,42.104129 268.38738,34.444245 270.55919,28.161738 C 273.09625,17.158816 273.74056,5.8327491 275.69048,-5.2771292 C 276.35213,-10.552361 277.59576,-15.859126 277.51471,-21.164194 C 275.70845,-28.558585 268.28594,-33.767452 268.63587,-41.841151 C 267.68176,-49.393992 266.59069,-56.934002 265.12500,-64.406250 C 259.46495,-71.651339 249.49887,-72.170690 241.05096,-72.017609 C 232.16938,-72.365906 223.28782,-72.714204 214.40625,-73.062500 C 207.47201,-78.235969 199.93554,-84.650382 190.64723,-83.525120 C 179.41274,-83.790111 168.17272,-83.774900 156.93750,-83.562500 z " id="path1598" style="fill-rule:evenodd;stroke-width:1.2500000;stroke-opacity:0.33962265;fill:#ffffff;fill-opacity:0.20430107;"/>
-    <path d="M 159.46272,-75.628403 C 153.85497,-76.048570 148.97039,-71.364778 148.62954,-65.851779 C 148.25942,-55.724937 148.56005,-45.569167 148.46272,-35.430609 C 148.46272,-33.631955 148.46272,-31.833305 148.46272,-30.034653 C 143.53163,-30.746685 139.41403,-26.674828 138.27616,-22.143527 C 136.47571,-16.039411 138.47800,-9.7664554 138.93438,-3.6075384 C 140.32356,7.5515122 141.60903,18.725959 143.06334,29.875343 C 144.13526,34.611006 148.72294,38.398739 153.65729,37.652848 C 187.87052,37.614680 222.09048,37.729192 256.29952,37.595574 C 261.11343,35.982903 261.89033,30.225661 262.56719,25.827146 C 264.81056,11.935128 267.21895,-1.9342997 269.35756,-15.840659 C 269.90093,-21.665120 266.95201,-29.247111 260.42397,-30.011895 C 258.08379,-29.526034 259.62007,-32.828725 259.18146,-34.208072 C 259.10812,-41.961371 259.33115,-49.729480 259.06442,-57.473146 C 258.71232,-61.170556 255.30273,-64.138338 251.57460,-63.472152 C 238.06086,-63.495388 224.54474,-63.425673 211.03249,-63.507025 C 204.05055,-64.543769 203.56239,-74.556784 196.58046,-75.593530 C 184.20985,-75.674630 171.83483,-75.605353 159.46272,-75.628403 z " id="path963" style="fill-rule:evenodd;stroke-width:1.2500000;stroke-opacity:0.33962265;fill:#ffffff;fill-opacity:0.20430107;"/>
-  </g>
-  <path d="M 27.173984,98.211833 L 27.173984,26.986457 C 27.173984,19.788368 30.722756,14.591369 38.179233,14.591369 L 74.626759,14.591369 C 82.083245,14.591369 82.987870,26.749499 90.444357,26.749499 L 131.96554,26.749499 C 135.33208,26.749499 137.89713,30.231840 137.89713,34.233174 L 137.89713,98.211833 L 27.173984,98.211833 z " id="path1502" sodipodi:nodetypes="cczzzzzcc" style="fill:url(#linearGradient1514);fill-rule:evenodd;stroke:#565248;stroke-width:1.2500000;stroke-opacity:0.33962265;"/>
-  <path d="M 82.055313 175.83524 A 56.143108 56.143108 0 1 0 -30.230904,175.83524 A 56.143108 56.143108 0 1 0 82.055313 175.83524 z" id="path1809" sodipodi:cx="25.912205" sodipodi:cy="175.83524" sodipodi:rx="56.143108" sodipodi:ry="56.143108" sodipodi:type="arc" style="fill:url(#radialGradient1505);fill-opacity:1;fill-rule:evenodd;stroke-width:1.0000000pt;" transform="matrix(1.442331,0.000000,0.000000,0.353388,43.56779,62.11168)"/>
-  <g id="g1527" style="fill-opacity:0.037735824;" transform="matrix(0.926940,0.000000,0.000000,1.039779,-57.30231,-49.08006)">
-    <path d="M 77.776110,171.71342 L 83.600639,155.83612 C 84.135181,154.37897 88.524659,152.72237 92.914636,152.72237 L 207.01118,152.72237 C 210.89125,152.72237 213.36492,154.55589 213.99669,155.83612 L 221.83189,171.71342 C 223.23784,174.56248 218.51026,177.42373 211.59415,177.42373 L 88.013849,177.42373 C 81.097741,177.42373 76.724895,174.57895 77.776110,171.71342 z " id="path2363" sodipodi:nodetypes="czzzzzzzz" style="fill-rule:evenodd;stroke-width:1.2259742;stroke-opacity:0.28272250;"/>
-    <path d="M 81.210337,170.03356 L 86.757335,155.99569 C 87.266408,154.70737 91.446733,153.24269 95.627534,153.24269 L 204.28755,153.24269 C 207.98274,153.24269 210.33854,154.86378 210.94020,155.99569 L 218.40207,170.03356 C 219.74103,172.55255 215.23871,175.08232 208.65215,175.08232 L 90.960262,175.08232 C 84.373697,175.08232 80.209211,172.56711 81.210337,170.03356 z " id="path1525" sodipodi:nodetypes="czzzzzzzz" style="fill-rule:evenodd;stroke-width:1.2259742;stroke-opacity:0.28272250;"/>
-    <path d="M 88.078791,168.67401 L 93.070728,156.64279 C 93.528861,155.53862 97.290882,154.28331 101.05333,154.28331 L 198.84028,154.28331 C 202.16571,154.28331 204.28577,155.67268 204.82723,156.64279 L 211.54243,168.67401 C 212.74740,170.83292 208.69561,173.00107 202.76813,173.00107 L 96.853089,173.00107 C 90.925609,173.00107 87.177842,170.84540 88.078791,168.67401 z " id="path1526" sodipodi:nodetypes="czzzzzzzz" style="fill-rule:evenodd;stroke-width:1.2259742;stroke-opacity:0.28272250;"/>
-  </g>
-  <path d="M 117.78716,36.773767 L 117.78716,75.722650 L 117.78716,95.197088 L 117.78716,114.67154 L 100.01510,114.67154 L 82.243034,114.67154 L 64.470973,114.67154 L 46.698909,114.67154 L 46.698909,95.197088 L 46.698909,75.722650 L 46.775671,36.773767 L 82.243034,36.773767 L 117.78716,36.773767 z " id="rect900" sodipodi:nodetypes="ccccccccccccc" style="fill:url(#linearGradient1495);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.22607063;stroke-opacity:0.36477986;"/>
-  <path d="M 301.30655,174.90867 L 299.27069,628.90434 L 743.08709,628.90434 L 743.34157,516.67783 C 733.41677,520.49506 633.15091,378.49417 506.92790,384.60173 C 380.59029,390.71484 413.27857,193.23136 301.30655,174.90867 z " id="path1500" sodipodi:nodetypes="cccczc" style="fill:url(#linearGradient1499);fill-opacity:1;fill-rule:evenodd;stroke-width:1.0000000pt;" transform="matrix(0.157267,0.000000,0.000000,0.157267,-0.685311,17.09000)"/>
-  <path d="M 16.340118,75.850997 L 21.660243,119.35397 C 22.148493,123.34642 26.157842,127.88541 30.167647,127.88541 L 134.38341,127.88541 C 137.92746,127.88541 140.18692,122.86168 140.76397,119.35397 L 147.92063,75.850997 C 149.20483,68.044749 144.88666,60.205100 138.56949,60.205100 L 25.691267,60.205100 C 19.374096,60.205100 15.379940,67.999588 16.340118,75.850997 z " id="path1501" sodipodi:nodetypes="czzzzzzzz" style="fill:url(#linearGradient1507);fill-rule:evenodd;stroke:url(#linearGradient1521);stroke-width:1.2519596;stroke-opacity:0.33962265;"/>
-  <path d="M 17.363760,74.771310 C 17.144790,75.718777 21.236974,66.419549 28.174951,66.419549 L 134.15847,66.419549 C 142.69349,66.419549 145.42542,75.718777 145.64440,74.771310 C 145.86338,73.823852 150.22438,60.734754 134.33482,60.734754 L 28.673341,60.734754 C 15.227487,60.734754 17.582722,73.823852 17.363760,74.771310 z " id="path1503" sodipodi:nodetypes="czzzzzz" style="fill:url(#linearGradient1516);fill-rule:evenodd;stroke-width:0.90415878pt;"/>
-</svg>
 
=== modified file 'Folders/src/CMakeLists.txt'
--- Folders/src/CMakeLists.txt	2010-08-10 00:05:57 +0000
+++ Folders/src/CMakeLists.txt	2011-10-08 22:23:24 +0000
@@ -19,7 +19,7 @@
 add_definitions (-DMY_APPLET_VERSION="${VERSION_FOLDERS}")
 add_definitions (-DMY_APPLET_GETTEXT_DOMAIN="${GETTEXT_FOLDERS}")
 add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}")
-add_definitions (-DMY_APPLET_ICON_FILE="icon.svg")
+add_definitions (-DMY_APPLET_ICON_FILE="icon.png")
 add_definitions (-DCD_APPLET_MULTI_INSTANCE="1")
 ### uncomment the following line to allow extended OpenGL drawing.
 #add_definitions (-DGL_GLEXT_PROTOTYPES="1")
 
=== modified file 'Folders/src/applet-config.c'
--- Folders/src/applet-config.c	2011-08-09 18:08:08 +0000
+++ Folders/src/applet-config.c	2011-10-08 22:23:24 +0000
@@ -28,9 +28,9 @@
 //\_________________ Here you have to get all your parameters from the conf file. Use the macros CD_CONFIG_GET_BOOLEAN, CD_CONFIG_GET_INTEGER, CD_CONFIG_GET_STRING, etc. myConfig has been reseted to 0 at this point. This function is called at the beginning of init and reload.
 CD_APPLET_GET_CONFIG_BEGIN
 	myConfig.cDefaultTitle = CD_CONFIG_GET_STRING ("Icon", "name");
-	///myConfig.cImageFile = CD_CONFIG_GET_STRING ("Icon", "image file");
+	myConfig.cImageFile = CD_CONFIG_GET_STRING ("Icon", "image file");
 	myConfig.cDirPath = CD_CONFIG_GET_STRING ("Configuration", "dir path");
-	if (myConfig.cDirPath)
+	if (myConfig.cDirPath)  // transform the pah into an URI.
 	{
 		if (*myConfig.cDirPath == '~')
 		{
@@ -47,7 +47,6 @@
 	}
 	myConfig.bShowFiles = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "show files", TRUE);
 	myConfig.cRenderer = CD_CONFIG_GET_STRING ("Configuration", "renderer");
-	//myConfig.iNbIcons = CD_CONFIG_GET_INTEGER ("Configuration", "nb icons");
 	myConfig.iSortType = CD_CONFIG_GET_INTEGER ("Configuration", "sort type");
 	myConfig.bFoldersFirst = CD_CONFIG_GET_BOOLEAN ("Configuration", "folders first");
 	myConfig.bShowHiddenFiles = CD_CONFIG_GET_BOOLEAN ("Configuration", "show hidden");
@@ -60,7 +59,7 @@
 
 //\_________________ Here you have to free all ressources allocated for myConfig. This one will be reseted to 0 at the end of this function. This function is called right before you get the applet's config, and when your applet is stopped, in the end.
 CD_APPLET_RESET_CONFIG_BEGIN
-	///g_free (myConfig.cImageFile);
+	g_free (myConfig.cImageFile);
 	g_free (myConfig.cDefaultTitle);
 	
 	if (myConfig.cDirPath)
 
=== modified file 'Folders/src/applet-init.c'
--- Folders/src/applet-init.c	2011-08-09 18:08:08 +0000
+++ Folders/src/applet-init.c	2011-10-08 22:23:24 +0000
@@ -80,24 +80,42 @@
 
 //\___________ Here is where you initiate your applet. myConfig is already set at this point, and also myIcon, myContainer, myDock, myDesklet (and myDrawContext if you're in dock mode). The macro CD_APPLET_MY_CONF_FILE and CD_APPLET_MY_KEY_FILE can give you access to the applet's conf-file and its corresponding key-file (also available during reload). If you're in desklet mode, myDrawContext is still NULL, and myIcon's buffers has not been filled, because you may not need them then (idem when reloading).
 CD_APPLET_INIT_BEGIN
-	
-	//\_______________ On definit le dessin de l'icone principale.
-	_set_icon_label (myApplet);
-	
-	myIcon->iSubdockViewType = myConfig.iSubdockViewType;
-	if (myDock && myConfig.iSubdockViewType == 0)
-		CD_APPLET_SET_DEFAULT_IMAGE_ON_MY_ICON_IF_NONE;
-		///CD_APPLET_SET_USER_IMAGE_ON_MY_ICON (myConfig.cImageFile, MY_APPLET_ICON_FILE);
-	
-	//\_______________ On lance la tache recuperation des fichiers.
-	_set_comparaison_func (myApplet);
-	if (myConfig.bShowFiles)
+
+	if (myConfig.cDirPath == NULL)
 	{
-		cd_folders_start (myApplet);
+		CD_APPLET_SET_IMAGE_ON_MY_ICON (myConfig.cImageFile);
+		cairo_dock_show_temporary_dialog_with_icon (D_("Open the configuration of the applet to choose a folder to import."),
+			myIcon, myContainer,
+			8000.,
+			myConfig.iSubdockViewType == 0 ? "same icon" : MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE);
 	}
-	else if (myDesklet)  // comme on ne charge pas les icones, on met un renderer "simple" sur notre desklet.
+	else
 	{
-		CD_APPLET_SET_DESKLET_RENDERER ("Simple");
+		//\_______________ On lance la tache recuperation des fichiers.
+		_set_comparaison_func (myApplet);
+		if (myConfig.bShowFiles)
+		{
+			cd_folders_start (myApplet);
+		}
+
+		//\_______________ set the icon rendering
+		if (myDock)  // dock mode: set the image or the sub-dock renderer
+		{
+			cairo_dock_set_subdock_content_renderer (myIcon, myConfig.iSubdockViewType);
+			if (myConfig.iSubdockViewType == 0)
+				CD_APPLET_SET_IMAGE_ON_MY_ICON (myConfig.cImageFile);
+		}
+		else  // desklet mode: set the image if we don't show the files.
+		{
+			if (! myConfig.bShowFiles)
+			{
+				CD_APPLET_SET_DESKLET_RENDERER ("Simple");
+				CD_APPLET_SET_IMAGE_ON_MY_ICON (myConfig.cImageFile);
+			}
+		}
+		
+		//\_______________ set the label
+		_set_icon_label (myApplet);
 	}
 	
 	//\_______________ On enregistre nos notifications.
@@ -125,29 +143,47 @@
 	{
 		//\_______________ On detruit les icones des fichiers.
 		cd_folders_free_all_data (myApplet);
-		
-		//\_______________ On met a jour l'icone principale.
-		_set_icon_label (myApplet);
-		
-		myIcon->iSubdockViewType = myConfig.iSubdockViewType;
-		if (myDock && myConfig.iSubdockViewType == 0)
-			CD_APPLET_SET_DEFAULT_IMAGE_ON_MY_ICON_IF_NONE;
-			///CD_APPLET_SET_USER_IMAGE_ON_MY_ICON (myConfig.cImageFile, MY_APPLET_ICON_FILE);
-		
-		//\_______________ On charge les icones dans un sous-dock.
-		_set_comparaison_func (myApplet);
-		if (myConfig.bShowFiles)
-		{
-			cd_folders_start (myApplet);
-		}
-		else if (myDock && myIcon->pSubDock)  // on veut un comportement de type lanceur, donc on ne veut pas d'un sous-dock vide.
-		{
-			cairo_dock_destroy_dock (myIcon->pSubDock, myIcon->cName);
-			myIcon->pSubDock = NULL;
-		}
-		else if (myDesklet)
-		{
-			CD_APPLET_SET_DESKLET_RENDERER ("Simple");
+
+		if (myConfig.cDirPath == NULL)
+		{
+			CD_APPLET_SET_IMAGE_ON_MY_ICON (myConfig.cImageFile);
+			cairo_dock_show_temporary_dialog_with_icon (D_("Open the configuration of the applet to choose a folder to import."),
+				myIcon, myContainer,
+				8000.,
+				myConfig.iSubdockViewType == 0 ? "same icon" : MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE);
+		}
+		else
+		{
+			//\_______________ On charge les icones dans un sous-dock.
+			_set_comparaison_func (myApplet);
+			if (myConfig.bShowFiles)
+			{
+				cd_folders_start (myApplet);
+			}
+			else if (myDock && myIcon->pSubDock)  // dans ce cas on veut un comportement de type lanceur, donc on ne veut pas d'un sous-dock vide.
+			{
+				cairo_dock_destroy_dock (myIcon->pSubDock, myIcon->cName);
+				myIcon->pSubDock = NULL;
+			}
+			
+			//\_______________ set the icon rendering
+			if (myDock)  // dock mode: set the image or the sub-dock renderer
+			{
+				cairo_dock_set_subdock_content_renderer (myIcon, myConfig.iSubdockViewType);
+				if (myConfig.iSubdockViewType == 0)
+					CD_APPLET_SET_IMAGE_ON_MY_ICON (myConfig.cImageFile);
+			}
+			else  // desklet mode: set the image if we don't show the files.
+			{
+				if (! myConfig.bShowFiles)
+				{
+					CD_APPLET_SET_DESKLET_RENDERER ("Simple");
+					CD_APPLET_SET_IMAGE_ON_MY_ICON (myConfig.cImageFile);
+				}
+			}
+			
+			//\_______________ set the label
+			_set_icon_label (myApplet);
 		}
 	}
 CD_APPLET_RELOAD_END
 
=== modified file 'Folders/src/applet-notifications.c'
--- Folders/src/applet-notifications.c	2011-08-09 18:08:08 +0000
+++ Folders/src/applet-notifications.c	2011-10-08 22:23:24 +0000
@@ -132,11 +132,11 @@
 
 		pLabel = gtk_label_new (NULL);
 		gtk_label_set_use_markup (GTK_LABEL (pLabel), TRUE);
-		g_string_printf (sInfo, "<u>Size</u> : %lld bytes", iSize);
+		g_string_printf (sInfo, "<u>Size</u> : %"G_GUINT64_FORMAT" bytes", iSize);
 		if (iSize > 1024*1024)
-			g_string_append_printf (sInfo, " (%.1f Mo)", 1. * iSize / 1024 / 1024);
+			g_string_append_printf (sInfo, " (%.1f MB)", 1. * iSize / 1024 / 1024);
 		else if (iSize > 1024)
-			g_string_append_printf (sInfo, " (%.1f Ko)", 1. * iSize / 1024);
+			g_string_append_printf (sInfo, " (%.1f KB)", 1. * iSize / 1024);
 		gtk_label_set_markup (GTK_LABEL (pLabel), sInfo->str);
 		gtk_container_add (GTK_CONTAINER (pVBox), pLabel);
 
@@ -428,11 +428,19 @@
 CD_APPLET_ON_BUILD_MENU_END
 
 
-static void _on_answer_import (int iClickedButton, GtkWidget *pInteractiveWidget, const gchar *cReceivedData, CairoDialog *pDialog)
+typedef struct {
+	gchar *cReceivedData;
+	double fOrder;
+} CDDropData;
+
+static void _on_answer_import (int iClickedButton, GtkWidget *pInteractiveWidget, CDDropData *data, CairoDialog *pDialog)
 {
 	cd_debug ("%s (%d)", __func__, iClickedButton);
+	const gchar *cReceivedData = data->cReceivedData;
+	double fOrder = data->fOrder;
 	gboolean bImportFiles = (iClickedButton == 0 || iClickedButton == -1);  // ok or Enter.
 	
+	// add a new conf file for the "Folders" module, with proper values.
 	CairoDockModule *pModule = cairo_dock_find_module_from_name ("Folders");
 	g_return_if_fail (pModule != NULL);
 
@@ -440,29 +448,37 @@
 	cairo_dock_update_conf_file (cConfFilePath,
 		G_TYPE_STRING, "Configuration", "dir path", cReceivedData,
 		G_TYPE_BOOLEAN, "Configuration", "show files", bImportFiles,
+		G_TYPE_DOUBLE, "Icon", "order", fOrder,
 		G_TYPE_INVALID);
-
+	
+	// instanciate the module from this conf file.
 	CairoDockModuleInstance *pNewInstance = cairo_dock_instanciate_module (pModule, cConfFilePath);  // prend le 'cConfFilePath'.
 	if (pNewInstance != NULL && pNewInstance->pDock)
 	{
 		cairo_dock_update_dock_size (pNewInstance->pDock);
 	}
-
+	
+	// show a success message on the new icon.
 	if (pNewInstance != NULL)
 		cairo_dock_show_temporary_dialog_with_icon (D_("The folder has been imported."),
 			pNewInstance->pIcon, pNewInstance->pContainer,
 			5000,
 			MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE);  // not "same icon" because the icon may not be loaded yet (eg. stack or emblem icon).
-
+	
+	// if the module has just been activated for the first time, write it down so that it is loaded on the next startup.
 	if (pModule->pInstancesList && pModule->pInstancesList->next == NULL)  // module nouvellement active.
 	{
 		cairo_dock_write_active_modules ();
 	}
 }
+static void _free_dialog_data (CDDropData *data)
+{
+	g_free (data->cReceivedData);
+	g_free (data);
+}
 gboolean cd_folders_on_drop_data (gpointer data, const gchar *cReceivedData, Icon *icon, double fOrder, CairoContainer *pContainer)
 {
 	//g_print ("Folders received '%s'\n", cReceivedData);
-	
 	if (icon != NULL || fOrder == CAIRO_DOCK_LAST_ORDER)  // drop on an icon or outside of icons.
 		return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 	
@@ -474,22 +490,42 @@
 	
 	if (g_file_test (cPath, G_FILE_TEST_IS_DIR))  // it's a folder, let's add a new instance of the applet that will handle it.
 	{
-		//g_print (" ajout d'un repertoire...\n");
-		if (icon == NULL)
+		// search the closest icon to the drop point (we want to place the dialog on it).
+		GList *pIconsList = NULL, *ic;
+		if (CAIRO_DOCK_IS_DOCK (pContainer))
+			pIconsList = CAIRO_DOCK (pContainer)->icons;
+		else if (CAIRO_DOCK_IS_DESKLET (pContainer))
+			pIconsList = CAIRO_DESKLET (pContainer)->icons;
+		Icon *pIcon = NULL;
+		for (ic = pIconsList; ic != NULL; ic = ic->next)
+		{
+			icon = ic->data;
+			if (icon->fOrder > fOrder)
+			{
+				pIcon = icon;
+				break;
+			}
+		}
+		if (pIcon == NULL)
 		{
 			if (CAIRO_DOCK_IS_DOCK (pContainer))
-				icon = cairo_dock_get_dialogless_icon_full (CAIRO_DOCK (pContainer));
+				pIcon = cairo_dock_get_dialogless_icon_full (CAIRO_DOCK (pContainer));
 			else
-				icon = cairo_dock_get_dialogless_icon ();
+				pIcon = cairo_dock_get_dialogless_icon ();
 		}
+		
+		// ask the user whether (s)he wants to import the folder's content.
+		CDDropData *data = g_new0 (CDDropData, 1);
+		data->cReceivedData = g_strdup (cReceivedData);
+		data->fOrder = fOrder;
 		cairo_dock_show_dialog_full (D_("Do you want to import the content of the folder too?"),
-			icon, pContainer,
+			pIcon, pContainer,
 			0,
 			MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE,
 			NULL,
 			(CairoDockActionOnAnswerFunc) _on_answer_import,
-			g_strdup (cReceivedData),
-			(GFreeFunc)g_free);
+			data,
+			(GFreeFunc)_free_dialog_data);
 		
 		return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
 	}
 
=== modified file 'Folders/src/applet-struct.h'
--- Folders/src/applet-struct.h	2011-08-09 18:08:08 +0000
+++ Folders/src/applet-struct.h	2011-10-08 22:23:24 +0000
@@ -25,7 +25,7 @@
 
 //\___________ structure containing the applet's configuration parameters.
 struct _AppletConfig {
-	///gchar *cImageFile;
+	gchar *cImageFile;
 	gchar *cDefaultTitle;
 	gchar *cDirPath;
 	gboolean bShowFiles;
 
=== modified file 'GMenu/data/GMenu.conf.in'
--- GMenu/data/GMenu.conf.in	2011-08-09 18:08:08 +0000
+++ GMenu/data/GMenu.conf.in	2011-10-08 22:23:24 +0000
@@ -59,7 +59,7 @@
 #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)}
+#{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
 
=== modified file 'Impulse/data/Impulse.conf.in'
--- Impulse/data/Impulse.conf.in	2011-08-09 18:08:08 +0000
+++ Impulse/data/Impulse.conf.in	2011-10-08 22:23:24 +0000
@@ -58,7 +58,7 @@
 #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)}
+#{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
 
=== modified file 'Impulse/src/Impulse.c'
--- Impulse/src/Impulse.c	2011-08-09 18:08:08 +0000
+++ Impulse/src/Impulse.c	2011-10-08 22:23:24 +0000
@@ -180,14 +180,14 @@
 
 	switch (pa_context_get_state (context))
 	{
+		case PA_CONTEXT_TERMINATED:
+		case PA_CONTEXT_FAILED:
+			return IM_FAILED;
 		case PA_CONTEXT_CONNECTING:
 		case PA_CONTEXT_AUTHORIZING:
 		case PA_CONTEXT_SETTING_NAME:
+		default: // default seems to be ok...
 			return IM_SUCCESS;
-		case PA_CONTEXT_TERMINATED:
-		case PA_CONTEXT_FAILED:
-		default:
-			return IM_FAILED;
 	}
 }
 
 
=== modified file 'Impulse/src/applet-config.c'
--- Impulse/src/applet-config.c	2011-08-09 18:08:08 +0000
+++ Impulse/src/applet-config.c	2011-10-08 22:23:24 +0000
@@ -27,6 +27,8 @@
 //\_________________ Here you have to get all your parameters from the conf file. Use the macros CD_CONFIG_GET_BOOLEAN, CD_CONFIG_GET_INTEGER, CD_CONFIG_GET_STRING, etc. myConfig has been reseted to 0 at this point. This function is called at the beginning of init and reload.
 CD_APPLET_GET_CONFIG_BEGIN
 	myConfig.cIconAnimation = CD_CONFIG_GET_STRING ("Configuration", "animation");
+	if (myConfig.cIconAnimation == NULL)
+		myConfig.cIconAnimation = g_strdup ("default");
 	myConfig.fMinValueToAnim = CD_CONFIG_GET_DOUBLE_WITH_DEFAULT ("Configuration", "sensitivity", 0.25) / 3; // PER 3
 	myConfig.iNbAnimations = CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "nb animations", 1);
 	myConfig.iLoopTime = CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "refresh", 250);
 
=== modified file 'Impulse/src/applet-impulse.c'
--- Impulse/src/applet-impulse.c	2011-08-09 18:08:08 +0000
+++ Impulse/src/applet-impulse.c	2011-10-08 22:23:24 +0000
@@ -132,7 +132,7 @@
 			{
 				//cd_debug ("Impulse: animation on this icon=%s", pIcon->cName);
 				cairo_dock_request_icon_animation (pIcon,
-					myData.pSharedMemory->pDock,
+					CAIRO_CONTAINER (myData.pSharedMemory->pDock),
 					myData.pSharedMemory->cIconAnimation,
 					myData.pSharedMemory->iNbAnimations);
 				bHasNotBeenAnimated = FALSE;
 
=== modified file 'Indicator-applet/indicator-applet.c'
--- Indicator-applet/indicator-applet.c	2011-04-20 20:46:51 +0000
+++ Indicator-applet/indicator-applet.c	2011-10-08 22:23:24 +0000
@@ -33,7 +33,7 @@
 {
 	if (pIndicator->pMenu == NULL)
 	{
-		pIndicator->pMenu = dbusmenu_gtkmenu_new (pIndicator->cBusName, pIndicator->cMenuObject);
+		pIndicator->pMenu = dbusmenu_gtkmenu_new ((gchar*)pIndicator->cBusName, (gchar*)pIndicator->cMenuObject);  // the cast is unorthodox, but the function definition is clumsy (it should require 2 const gchar*, since it actually duplicates the strings).
 		if (pIndicator->pMenu != NULL)
 		{
 			DbusmenuGtkClient * client = dbusmenu_gtkmenu_get_client (pIndicator->pMenu);
@@ -111,8 +111,8 @@
 	pIndicator->cServiceInterface = cServiceInterface;
 	pIndicator->cMenuObject = cMenuObject;
 	
-	pIndicator->service = indicator_service_manager_new_version (cBusName, INDICATOR_APPLET_DBUS_VERSION);
-	g_signal_connect (G_OBJECT(pIndicator->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), pIndicator);  // on sera appele une fois la connexion etablie.
+	pIndicator->service = indicator_service_manager_new_version ((gchar*)cBusName, INDICATOR_APPLET_DBUS_VERSION);
+	g_signal_connect (G_OBJECT(pIndicator->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), pIndicator);  // on sera appele une fois la connexion etablie.  // pour le cast, cf plus haut.
 	
 	return pIndicator;
 }
@@ -168,7 +168,12 @@
 	}
 	
 	cd_debug ("set %s", cIconPathFallback ? cIconPathFallback : cIconName);
-	CD_APPLET_SET_IMAGE_ON_MY_ICON (cIconPathFallback ? cIconPathFallback : cIconName);
+	//CD_APPLET_SET_IMAGE_ON_MY_ICON (cIconPathFallback ? cIconPathFallback : cIconName);
+	cairo_dock_set_image_on_icon_with_default (myDrawContext,
+		cIconPathFallback ? cIconPathFallback : cIconName,
+		myIcon,
+		myContainer,
+		myApplet->pModule->pVisitCard->cIconFilePath);
 	
 	g_free (tmp_icon_name);
 	g_free (cIconPath);
 
=== modified file 'MeMenu/data/MeMenu.conf.in'
--- MeMenu/data/MeMenu.conf.in	2011-08-09 18:08:08 +0000
+++ MeMenu/data/MeMenu.conf.in	2011-10-08 22:23:24 +0000
@@ -56,7 +56,7 @@
 #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)}
+#{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
 
=== modified file 'Messaging-Menu/data/Messaging-Menu.conf.in'
--- Messaging-Menu/data/Messaging-Menu.conf.in	2011-08-09 18:08:08 +0000
+++ Messaging-Menu/data/Messaging-Menu.conf.in	2011-10-08 22:23:24 +0000
@@ -57,7 +57,7 @@
 #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)}
+#{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
 
=== modified file 'Messaging-Menu/src/applet-config.c'
--- Messaging-Menu/src/applet-config.c	2010-08-10 00:05:57 +0000
+++ Messaging-Menu/src/applet-config.c	2011-10-08 22:23:24 +0000
@@ -33,13 +33,10 @@
 
 //\_________________ Here you have to free all ressources allocated for myConfig. This one will be reseted to 0 at the end of this function. This function is called right before you get the applet's config, and when your applet is stopped, in the end.
 CD_APPLET_RESET_CONFIG_BEGIN
-	g_free (myConfig.cAnimationName);
 	
 CD_APPLET_RESET_CONFIG_END
 
-
 //\_________________ Here you have to free all ressources allocated for myData. This one will be reseted to 0 at the end of this function. This function is called when your applet is stopped, in the very end.
 CD_APPLET_RESET_DATA_BEGIN
 	
-	
 CD_APPLET_RESET_DATA_END
 
=== modified file 'Messaging-Menu/src/applet-menu.c'
--- Messaging-Menu/src/applet-menu.c	2011-08-09 18:08:08 +0000
+++ Messaging-Menu/src/applet-menu.c	2011-10-08 22:23:24 +0000
@@ -41,12 +41,20 @@
 
 /* Sets the icon when it changes. */
 static void
+#if (INDICATOR_OLD_NAMES == 0)
+application_icon_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, gpointer user_data)
+#else
 application_icon_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, gpointer user_data)
+#endif
 {
 	if (!g_strcmp0(prop, APPLICATION_MENUITEM_PROP_ICON)) {
 		/* Set the main icon */
 		if (GTK_IS_IMAGE(user_data)) {
+#if (INDICATOR_OLD_NAMES == 0)
+			gtk_image_set_from_icon_name(GTK_IMAGE(user_data), g_variant_get_string(value, NULL), GTK_ICON_SIZE_MENU);
+#else
 			gtk_image_set_from_icon_name(GTK_IMAGE(user_data), g_value_get_string(value), GTK_ICON_SIZE_MENU);
+#endif
 		}
 	}
 
@@ -55,12 +63,20 @@
 
 /* Sets the label when it changes. */
 static void
+#if (INDICATOR_OLD_NAMES == 0)
+application_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, gpointer user_data)
+#else
 application_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, gpointer user_data)
+#endif
 {
 	if (!g_strcmp0(prop, APPLICATION_MENUITEM_PROP_NAME)) {
 		/* Set the main label */
 		if (GTK_IS_LABEL(user_data)) {
+#if (INDICATOR_OLD_NAMES == 0)
+			gtk_label_set_text(GTK_LABEL(user_data), g_variant_get_string(value, NULL));
+#else
 			gtk_label_set_text(GTK_LABEL(user_data), g_value_get_string(value));
+#endif
 		}
 	}
 
@@ -191,18 +207,24 @@
 static gboolean
 new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
 {
-	g_debug ("%s (\"%s\")", __func__, dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
+	gchar *cName = g_strdup (dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
+
+	cd_debug ("%s (\"%s\")", __func__, cName);
+
+#if (INDICATOR_OLD_NAMES == 0)
+	if (newitem == NULL || !dbusmenu_menuitem_property_get_bool(newitem, DBUSMENU_MENUITEM_PROP_VISIBLE))
+	{
+		cd_debug ("Not visible: %s", cName);
+		g_free (cName);
+		return TRUE;
+	}
+#endif
 
 	GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new());
 #if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
 	gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(gmi), TRUE);
 #endif
 
-	gint padding = 4;
-	gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL);
-
-	GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
-
 	/* Set the minimum size, we always want it to take space */
 	gint width, height;
 	gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
@@ -220,14 +242,12 @@
 	gtk_widget_show(icon);
 
 	/* Application name in a label */
-	GtkWidget * label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
+	GtkWidget * label = gtk_label_new(cName);
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, padding);
 	gtk_widget_show(label);
 
 	/* Insert the hbox */
-	gtk_container_add(GTK_CONTAINER(gmi), hbox);
-	gtk_widget_show(hbox);
+	gtk_container_add(GTK_CONTAINER(gmi), label);
 
 	/* Attach some of the standard GTK stuff */
 	dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
@@ -254,14 +274,32 @@
 /* Whenever we have a property change on a DbusmenuMenuitem
    we need to be responsive to that. */
 static void
+#if (INDICATOR_OLD_NAMES == 0)
+indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, indicator_item_t * mi_data)
+#else
 indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, indicator_item_t * mi_data)
+#endif
 {
+#if (INDICATOR_OLD_NAMES == 0)
+	cd_debug ("%s (\"%s\": %s)", __func__, prop, g_variant_get_string(value, NULL));
+#else
+	cd_debug ("%s (\"%s\": %s)", __func__, prop, g_value_get_string(value));
+#endif
+
 	if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_LABEL)) {
 		/* Set the main label */
+#if (INDICATOR_OLD_NAMES == 0)
+		gtk_label_set_text(GTK_LABEL(mi_data->label), g_variant_get_string(value, NULL));
+#else
 		gtk_label_set_text(GTK_LABEL(mi_data->label), g_value_get_string(value));
+#endif
 	} else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_RIGHT)) {
 		/* Set the right label */
+#if (INDICATOR_OLD_NAMES == 0)
+		gtk_label_set_text(GTK_LABEL(mi_data->right), g_variant_get_string(value, NULL));
+#else
 		gtk_label_set_text(GTK_LABEL(mi_data->right), g_value_get_string(value));
+#endif
 	} else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_ICON)) {
 		/* We don't use the value here, which is probably less efficient, 
 		   but it's easier to use the easy function.  And since th value
@@ -275,22 +313,20 @@
 			gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
 			if (gdk_pixbuf_get_width(pixbuf) > width ||
 					gdk_pixbuf_get_height(pixbuf) > height) {
-				g_debug("Resizing icon from %dx%d to %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), width, height);
+				cd_debug("Resizing icon from %dx%d to %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), width, height);
 				resized_pixbuf = gdk_pixbuf_scale_simple(pixbuf,
 				                                         width,
 				                                         height,
 				                                         GDK_INTERP_BILINEAR);
+				g_object_unref(pixbuf);
 			} else {
-				g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
+				cd_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
 				resized_pixbuf = pixbuf;
 			}
 	  
 			gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
 
-			/* The other pixbuf should be free'd by the dbusmenu. */
-			if (resized_pixbuf != pixbuf) {
-				g_object_unref(resized_pixbuf);
-			}
+			g_object_unref(resized_pixbuf);
 
 			gtk_widget_show(mi_data->icon);
 		} else {
@@ -312,6 +348,16 @@
 	g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
 	/* Note: not checking parent, it's reasonable for it to be NULL */
 
+	cd_debug ("%s (\"%s\")", __func__, dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL));
+
+#if (INDICATOR_OLD_NAMES == 0)
+	if (newitem == NULL || !dbusmenu_menuitem_property_get_bool(newitem, DBUSMENU_MENUITEM_PROP_VISIBLE))
+	{
+		cd_debug ("Not visible: %s", dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL));
+		return TRUE;
+	}
+#endif
+
 	indicator_item_t * mi_data = g_new0(indicator_item_t, 1);
 
 	GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new());
@@ -337,22 +383,20 @@
 		GdkPixbuf * resized_pixbuf;
 		if (gdk_pixbuf_get_width(pixbuf) > width ||
 		        gdk_pixbuf_get_height(pixbuf) > height) {
-			g_debug("Resizing icon from %dx%d to %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), width, height);
+			cd_debug("Resizing icon from %dx%d to %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), width, height);
 			resized_pixbuf = gdk_pixbuf_scale_simple(pixbuf,
 			                                         width,
 			                                         height,
 			                                         GDK_INTERP_BILINEAR);
+			g_object_unref(pixbuf);
 		} else {
-			g_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
+			cd_debug("Happy with icon sized %dx%d", gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
 			resized_pixbuf = pixbuf;
 		}
   
 		gtk_image_set_from_pixbuf(GTK_IMAGE(mi_data->icon), resized_pixbuf);
 
-		/* The other pixbuf should be free'd by the dbusmenu. */
-		if (resized_pixbuf != pixbuf) {
-			g_object_unref(resized_pixbuf);
-		}
+		g_object_unref(resized_pixbuf);
 	}
 	gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5);
 	gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, padding);
@@ -398,6 +442,6 @@
 {
 	indicator_right_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 	
-	dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), INDICATOR_MENUITEM_TYPE, new_indicator_item);
-	dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), APPLICATION_MENUITEM_TYPE, new_application_item);
+	dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), INDICATOR_MENUITEM_TYPE, (DbusmenuClientTypeHandler) new_indicator_item);
+	dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), APPLICATION_MENUITEM_TYPE, (DbusmenuClientTypeHandler) new_application_item);
 }
 
=== modified file 'Messaging-Menu/src/applet-messaging.c'
--- Messaging-Menu/src/applet-messaging.c	2011-04-20 20:46:51 +0000
+++ Messaging-Menu/src/applet-messaging.c	2011-10-08 22:23:24 +0000
@@ -57,7 +57,7 @@
 static void
 icon_changed_cb (DBusGProxy * proxy, gboolean hidden, CairoDockModuleInstance *myApplet)
 {
-	//g_print ("%s (hidden : %d)\n", __func__, hidden);
+	cd_debug ("%s (hidden : %d)", __func__, hidden);
 	if (hidden)
 	{
 		myIcon->fAlpha = .5;
@@ -74,7 +74,7 @@
 attention_cb (DBusGProxy * proxy, gboolean dot, GError * error, CairoDockModuleInstance *myApplet)
 {
 	if (error != NULL) {
-		g_warning("Unable to get attention status: %s", error->message);
+		cd_warning ("Unable to get attention status: %s", error->message);
 		g_error_free(error);
 		return;
 	}
@@ -87,7 +87,7 @@
 icon_cb (DBusGProxy * proxy, gboolean hidden, GError * error, CairoDockModuleInstance *myApplet)
 {
 	if (error != NULL) {
-		g_warning("Unable to get icon visibility: %s", error->message);
+		cd_warning ("Unable to get icon visibility: %s", error->message);
 		g_error_free(error);
 		return;
 	}
 
=== added file 'Messaging-Menu/src/make-dbus-headers.sh'
--- Messaging-Menu/src/make-dbus-headers.sh	1970-01-01 00:00:00 +0000
+++ Messaging-Menu/src/make-dbus-headers.sh	2011-10-08 22:23:24 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+dbus-binding-tool --prefix=_ --mode=glib-client  --output=messages-service-client.h messages-service.xml
 
=== removed file 'Messaging-Menu/src/make-dbus-heaers.sh'
--- Messaging-Menu/src/make-dbus-heaers.sh	2010-08-10 00:05:57 +0000
+++ Messaging-Menu/src/make-dbus-heaers.sh	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#!/bin/sh
-dbus-binding-tool --prefix=_ --mode=glib-client  --output=messages-service-client.h messages-service.xml
 
=== modified file 'Messaging-Menu/src/messages-service.xml'
--- Messaging-Menu/src/messages-service.xml	2010-08-10 00:05:57 +0000
+++ Messaging-Menu/src/messages-service.xml	2011-10-08 22:23:24 +0000
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
-	<interface name="org.ayatana.indicator.messages.service">
+	<interface name="com.canonical.indicator.messages.service">
 
 <!-- Methods -->
-		<method name="Watch">
-			<annotation name="org.freedesktop.DBus.GLib.Async" value="true" />
-		</method>
 		<method name="AttentionRequested">
 			<arg type="b" name="dot" direction="out" />
 		</method>
 		<method name="IconShown">
 			<arg type="b" name="hidden" direction="out" />
 		</method>
+		<method name="ClearAttention" />
 
 <!-- Signals -->
 		<signal name="AttentionChanged">
 
=== modified file 'Network-Monitor/data/Network-Monitor.conf.in'
--- Network-Monitor/data/Network-Monitor.conf.in	2011-08-09 18:08:08 +0000
+++ Network-Monitor/data/Network-Monitor.conf.in	2011-10-08 22:23:24 +0000
@@ -21,9 +21,12 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#b Always display the icon, even when the dock is hidden?
+#B Always display the icon, even when the dock is hidden?
 always visi = false
 
+#C+ Background color to add in this case
+bg color = .8;.8;.8;.5
+
 order=
 
 #F[Applet's Handbook]
@@ -60,7 +63,7 @@
 #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)}
+#{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
@@ -147,7 +150,7 @@
 #X[Gauge;gtk-dialog-info]
 frame_gauge=
 
-#h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/
+#h+[@gaugesdir@;gauges;gauges3;wifi] Choose one of the available themes:/
 theme = turbo-night-fuel
 
 #X[Graph;gtk-dialog-info]
@@ -186,7 +189,7 @@
 #X[Gauge;gtk-dialog-info]
 frame_gauge=
 
-#h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/
+#h+[@gaugesdir@;gauges;gauges3;wifi] Choose one of the available themes:/
 theme = turbo-night-fuel
 
 
 
=== modified file 'Network-Monitor/src/applet-connections.c'
--- Network-Monitor/src/applet-connections.c	2010-08-10 00:05:57 +0000
+++ Network-Monitor/src/applet-connections.c	2011-10-08 22:23:24 +0000
@@ -92,7 +92,7 @@
 	cd_debug ("%d devices\n", paDevices->len);
 	DBusGProxy *dbus_proxy_Device, *dbus_proxy_Device_prop;
 	gchar *cDevice;
-	int i;
+	uint i;
 	for (i = 0; i < paDevices->len; i++)
 	{
 		// on recupere le device.
@@ -217,7 +217,7 @@
 	
 	//\_____________ On en choisit une.
 	gchar *cConnection;
-	int i;
+	uint i;
 	for (i = 0; i < paConnections->len; i++)
 	{
 		cConnection = (gchar *)g_ptr_array_index(paConnections, i);
@@ -257,8 +257,8 @@
 	DBusGProxy *dbus_proxy_ActiveAccessPoint_prop = NULL;
 	GError *erreur = NULL;
 	
-	gint j,k;
-	GValue value = { 0 };
+	uint j,k;
+	GValue value = G_VALUE_INIT;
 	GPtrArray *paActiveConnections = NULL;
 	GPtrArray *paDevices = NULL;
 	gchar *cActiveConnection, *cDevice, *cAccessPointPath, *cConnection;
@@ -267,7 +267,7 @@
 	//\_____________ On recupere la liste des connexions actives (ce sont les configs tout-en-un de NM qui sont actuellement utilisees).
 	paActiveConnections = (GPtrArray*) cairo_dock_dbus_get_property_as_boxed (myData.dbus_proxy_NM_prop, "org.freedesktop.NetworkManager", "ActiveConnections");
 	cd_debug ("%d connections\n", paActiveConnections->len);
-	for (j=0; j<paActiveConnections->len; j++)
+	for (j=0; j < paActiveConnections->len; j++)
 	{
 		cActiveConnection = (gchar *)g_ptr_array_index(paActiveConnections,j);
 		cd_debug ("Network-Monitor : Active Connection path : %s\n", cActiveConnection);
@@ -328,7 +328,7 @@
 		{
 			GPtrArray *paDevices = g_value_get_boxed (v);
 			cd_debug (" %d devices\n", paDevices->len);
-			for (k=0; k<paDevices->len; k++)
+			for (k=0;  k < paDevices->len; k++)
 			{
 				// on recupere le device.
 				cDevice = (gchar *)g_ptr_array_index(paDevices,k);
@@ -595,7 +595,7 @@
 	{
 		GByteArray *a = g_value_get_boxed (v);
 		myData.cESSID = g_new0 (gchar, a->len+1);
-		for (int i = 0; i < a->len; i ++)
+		for (uint i = 0; i < a->len; i ++)
 		{
 			myData.cESSID[i] = a->data[i];
 		}
 
=== modified file 'Network-Monitor/src/applet-draw.c'
--- Network-Monitor/src/applet-draw.c	2011-04-20 20:46:51 +0000
+++ Network-Monitor/src/applet-draw.c	2011-10-08 22:23:24 +0000
@@ -34,7 +34,10 @@
 	if (myData.iPreviousQuality != myData.iQuality)
 	{
 		myData.iPreviousQuality = myData.iQuality;
-		CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
+		if (myConfig.defaultTitle) // has another default name
+			CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
+		else
+			CD_APPLET_SET_NAME_FOR_MY_ICON (myApplet->pModule->pVisitCard->cTitle);
 		CD_APPLET_SET_QUICK_INFO_ON_MY_ICON ("N/A");
 		cd_NetworkMonitor_draw_icon_with_effect (WIFI_QUALITY_NO_SIGNAL);
 		
 
=== modified file 'Network-Monitor/src/applet-menu.c'
--- Network-Monitor/src/applet-menu.c	2010-08-10 00:05:57 +0000
+++ Network-Monitor/src/applet-menu.c	2011-10-08 22:23:24 +0000
@@ -32,7 +32,7 @@
 	gchar *cConnection;
 	GHashTable *pSettings, *pSubSettings;
 	GValue *v;
-	int i;
+	uint i;
 	for (i = 0; i < paConnections->len; i++)
 	{
 		cConnection = (gchar *)g_ptr_array_index(paConnections, i);
@@ -119,7 +119,7 @@
 	GList *pConnList = NULL;
 	//\_____________ On cherche une connection qui ait le meme type (wifi ou filaire), et soit le meme SSID, soit la meme interface.
 	gchar *cConnection;
-	int i;
+	uint i;
 	for (i = 0; i < paConnections->len; i++)
 	{
 		cConnection = (gchar *)g_ptr_array_index(paConnections, i);
@@ -141,22 +141,26 @@
 		GHashTable *pSettings = g_hash_table_new_full (g_str_hash,
 			g_str_equal,
 			g_free,
-			g_hash_table_destroy);
-		
-		GHashTable *pSubSettings = g_hash_table_new_full (g_str_hash,
-			g_str_equal,
-			g_free,
-			g_free);
-		g_hash_table_insert (pSettings, "connection", pSubSettings);
-		g_hash_table_insert (pSubSettings, "type", g_strdup ("802-11-wireless"));
-		g_hash_table_insert (pSettings, "id", g_strdup_printf ("CD - %s", pItemData->cSsid));
-		
-		pSubSettings = g_hash_table_new_full (g_str_hash,
-			g_str_equal,
-			g_free,
-			g_free);
-		g_hash_table_insert (pSubSettings, "ssid", g_strdup (pItemData->cSsid));
-		g_hash_table_insert (pSubSettings, "mode", g_strdup ("infrastructure"));
+			(GDestroyNotify) g_hash_table_destroy);  // a table of tables.
+		GHashTable *pSubSettings;
+		
+		// connection: type, id, uuid
+		pSubSettings = g_hash_table_new_full (g_str_hash,
+			g_str_equal,
+			g_free,
+			g_free);
+		g_hash_table_insert (pSettings, g_strdup ("connection"), pSubSettings);
+		g_hash_table_insert (pSubSettings, g_strdup ("type"), g_strdup ("802-11-wireless"));
+		g_hash_table_insert (pSubSettings, g_strdup ("id"), g_strdup_printf ("CD - %s", pItemData->cSsid));
+		
+		// 802-11-wireless: ssid, mode, seen-bssids
+		pSubSettings = g_hash_table_new_full (g_str_hash,
+			g_str_equal,
+			g_free,
+			g_free);
+		g_hash_table_insert (pSettings, g_strdup ("802-11-wireless"), pSubSettings);
+		g_hash_table_insert (pSubSettings, g_strdup ("ssid"), g_strdup (pItemData->cSsid));
+		g_hash_table_insert (pSubSettings, g_strdup ("mode"), g_strdup ("infrastructure"));
 		
 		// AddConnection
 		DBusGProxy *dbus_proxy_Settings = cairo_dock_create_new_system_proxy (
@@ -191,7 +195,7 @@
 		
 		//ActivateConnection ( s: service_name, o: connection, o: device, o: specific_object )o
 		GError *erreur = NULL;
-		GValue active_connection_path = {0};
+		GValue active_connection_path = G_VALUE_INIT;
 		g_value_init (&active_connection_path, DBUS_TYPE_G_OBJECT_PATH);
 		
 		gchar *cNewActiveConnectionPath = NULL;
@@ -233,7 +237,7 @@
 		DBusGProxy *dbus_proxy_ConnectionSettings;
 		GError *erreur = NULL;
 		GHashTable *pSettingsTable;
-		int i;
+		uint i;
 		for (i = 0; i < paConnections->len; i++)
 		{
 			cConnection = (gchar *)g_ptr_array_index(paConnections, i);
@@ -281,13 +285,13 @@
 	gchar *cAccessPointPath;
 	GHashTable *hProperties;
 	GValue *v;
-	guint iPercent;
-	gchar *cSsid;
+	gint iPercent;
+	gchar *cSsid = NULL;
 	const gchar *cHwAddress;
 	int iMode, iWirelessCapabilities;
 	CDMenuItemData *pItemData;
 	GtkWidget *pHBox;
-	int i, j;
+	uint i, j;
 	for (i = 0; i < paDevices->len; i++)
 	{
 		// on recupere le device.
@@ -387,7 +391,7 @@
 				v = (GValue *)g_hash_table_lookup (hProperties, "Strength");
 				if (v != NULL && G_VALUE_HOLDS_UCHAR (v))
 				{
-					iPercent = (gint) g_value_get_uchar (v);
+					iPercent = g_value_get_uchar (v);
 				}
 				
 				v = (GValue *)g_hash_table_lookup (hProperties, "Ssid");
@@ -398,7 +402,7 @@
 				}
 				
 				// on empeche les doublons.
-				pItemData = g_hash_table_lookup (pSsidTable, cSsid);
+				pItemData = (cSsid ? g_hash_table_lookup (pSsidTable, cSsid) : NULL);
 				if (pItemData != NULL)
 				{
 					if (pItemData->iPercent > iPercent)
@@ -437,7 +441,7 @@
 				
 				cd_debug ("%d) %s : %s (%s, %d%%)\n", j, cSsid, cAccessPointPath, cHwAddress, iPercent);
 				
-				gchar *cImage = NULL;
+				const gchar *cImage = NULL;
 				if (iPercent > 80)
 					cImage = MY_APPLET_SHARE_DATA_DIR"/link-5.svg";
 				else if (iPercent > 60)
@@ -480,7 +484,7 @@
 						int n = GPOINTER_TO_INT (pConnList->data);
 						pItemData->cConnection = g_strdup (g_ptr_array_index (paConnections, n));
 					}
-					cairo_dock_add_in_menu_with_stock_and_data (cSsid, cImage, _on_select_access_point, pMenu, pItemData);
+					cairo_dock_add_in_menu_with_stock_and_data (cSsid, cImage, (GFunc) _on_select_access_point, pMenu, pItemData);
 				}
 				else
 				{
@@ -505,7 +509,7 @@
 							pItemData->cDevice = g_strdup (cDevice);
 							pItemData->cAccessPoint = g_strdup (cAccessPointPath);
 							
-							cairo_dock_add_in_menu_with_stock_and_data (cID, NULL, _on_select_access_point, pSubMenu, GINT_TO_POINTER (n));
+							cairo_dock_add_in_menu_with_stock_and_data (cID, NULL, (GFunc) _on_select_access_point, pSubMenu, GINT_TO_POINTER (n));
 						}
 					}
 				}
 
=== modified file 'Network-Monitor/src/applet-notifications.c'
--- Network-Monitor/src/applet-notifications.c	2011-04-20 20:46:51 +0000
+++ Network-Monitor/src/applet-notifications.c	2011-10-08 22:23:24 +0000
@@ -73,7 +73,6 @@
 		return;
 	}
 	
-	gchar *cCommand = NULL;
 	/*if (g_iDesktopEnv == CAIRO_DOCK_GNOME || g_iDesktopEnv == CAIRO_DOCK_XFCE) {
 		int iMajor, iMinor, iMicro;
 		cairo_dock_get_gnome_version (&iMajor, &iMinor, &iMicro);
@@ -91,9 +90,7 @@
 	else if (g_iDesktopEnv == CAIRO_DOCK_KDE) { //Ajouter les lignes de KDE
 		//cCommand = 
 	}*/
-        cCommand = "nm-connection-editor";  // network-admin n'est plus present depuis Intrepid, et nm-connection-editor marche aussi sous KDE.
-	
-	cairo_dock_launch_command (cCommand);
+	cairo_dock_launch_command ("nm-connection-editor");  // network-admin n'est plus present depuis Intrepid, et nm-connection-editor marche aussi sous KDE.
 }
 CD_APPLET_ON_BUILD_MENU_BEGIN
 	GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU ();
 
=== modified file 'Network-Monitor/src/applet-wifi.c'
--- Network-Monitor/src/applet-wifi.c	2010-08-10 00:05:57 +0000
+++ Network-Monitor/src/applet-wifi.c	2011-10-08 22:23:24 +0000
@@ -122,7 +122,7 @@
 	gchar **cInfopipesList = g_strsplit (cResult, "\n", -1);
 	g_free (cResult);
 	gchar *cOneInfopipe, *str, *str2;
-	int i, iMaxValue;
+	int i, iMaxValue = 0;
 	for (i = 0; cInfopipesList[i] != NULL; i ++)
 	{
 		cOneInfopipe = cInfopipesList[i];
@@ -163,10 +163,9 @@
 		{
 			_pick_string ("Access Point", myData.wifi._cAccessPoint);
 		}
-		
-		if (myData.wifi._iQuality == -1)  // Link Quality=54/100 Signal level=-76 dBm Noise level=-78 dBm OU Link Quality:5  Signal level:219  Noise level:177
+
+		if (myData.wifi._iQuality == (uint)-1)  // Link Quality=54/100 Signal level=-76 dBm Noise level=-78 dBm OU Link Quality:5  Signal level:219  Noise level:177
 		{
-			iMaxValue = 0;
 			_pick_value ("Link Quality", myData.wifi._iQuality, iMaxValue);
 			if (iMaxValue != 0)  // vieille version, qualite indiquee en %
 			{
 
=== modified file 'RSSreader/data/RSSreader.conf.in'
--- RSSreader/data/RSSreader.conf.in	2011-08-09 18:08:08 +0000
+++ RSSreader/data/RSSreader.conf.in	2011-10-08 22:23:24 +0000
@@ -60,7 +60,7 @@
 #b Is detached from the dock
 initially detached=true
 #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)}
+#{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
 
=== modified file 'Recent-Events/data/Recent-Events.conf.in'
--- Recent-Events/data/Recent-Events.conf.in	2011-08-09 18:08:08 +0000
+++ Recent-Events/data/Recent-Events.conf.in	2011-10-08 22:23:24 +0000
@@ -60,7 +60,7 @@
 #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)}
+#{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
 
=== modified file 'Recent-Events/src/applet-dialog.c'
--- Recent-Events/src/applet-dialog.c	2011-08-09 18:08:08 +0000
+++ Recent-Events/src/applet-dialog.c	2011-10-08 22:23:24 +0000
@@ -81,13 +81,13 @@
 	gint64 iTimeStamp;
 	const gchar *cEventURI;
 	guint id;
-	gchar *cName = NULL, *cURI = NULL, *cIconName = NULL, *cPath = NULL;
+	gchar *cName = NULL, *cURI = NULL, *cIconName = NULL, *cIconPath, *cPath = NULL;
 	double fOrder;
 	int iVolumeID;
 	gboolean bIsDirectory;
 	GdkPixbuf *pixbuf;
 	GtkTreeIter iter;
-	GHashTable *pHashTable = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
+	GHashTable *pHashTable = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);  // used to prevent doubles
 	
 	//\_____________ parse all the events.
 	while (zeitgeist_result_set_has_next (pEvents))
@@ -121,11 +121,13 @@
 			else
 			{
 				cairo_dock_fm_get_file_info (cEventURI, &cName, &cURI, &cIconName, &bIsDirectory, &iVolumeID, &fOrder, CAIRO_DOCK_FM_SORT_BY_DATE);
-				g_free (cName);
-				g_free (cURI);
 			}
 			if (cIconName != NULL)
-				pixbuf = gdk_pixbuf_new_from_file_at_size (cIconName, 32, 32, NULL);
+			{
+				cIconPath = cairo_dock_search_icon_s_path (cIconName);
+				pixbuf = gdk_pixbuf_new_from_file_at_size (cIconPath, 32, 32, NULL);
+				g_free (cIconPath);
+			}
 			else
 				pixbuf = NULL;
 			
@@ -166,7 +168,13 @@
 				CD_MODEL_ICON, pixbuf,
 				CD_MODEL_DATE, iTimeStamp,
 				CD_MODEL_ID, id, -1);
+			
 			g_free (cIconName);
+			cIconName = NULL;
+			g_free (cName);
+			cName = NULL;
+			g_free (cURI);
+			cURI = NULL;
 			if (pixbuf)
 				g_object_unref (pixbuf);
 			g_free (cPath);
@@ -467,11 +475,11 @@
 		// establish the connection to Zeitgesit.
 		if (myData.pLog == NULL)  // first search.
 		{
-			g_print ("first search\n");
+			cd_debug ("first search");
 			myData.pLog = zeitgeist_log_new ();  // may launch the Zeitgeist daemon if it's not yet running.
 			if (! zeitgeist_log_is_connected (myData.pLog))  // the connection may not be immediate (even if the daemon is already running), in this case come back in 1s.
 			{
-				g_print ("come back in 1s...\n");
+				cd_debug ("come back in 1s...");
 				g_timeout_add_seconds (1, _show_dialog_delayed, NULL);
 				return;
 			}
 
=== modified file 'Recent-Events/src/applet-notifications.c'
--- Recent-Events/src/applet-notifications.c	2011-04-20 20:46:51 +0000
+++ Recent-Events/src/applet-notifications.c	2011-10-08 22:23:24 +0000
@@ -101,7 +101,7 @@
 	gint                i,n;
 	GtkWidget *pMenuItem = NULL, *pSubMenu = NULL;
 	const gchar *cEventURI;
-	gchar *cName = NULL, *cURI = NULL, *cIconName = NULL;
+	gchar *cName = NULL, *cURI = NULL, *cIconName = NULL, *cIconPath;
 	gchar *cCommand;
 	double fOrder;
 	int iVolumeID;
@@ -119,16 +119,21 @@
 			cd_debug (" + %s", cEventURI);
 			
 			cairo_dock_fm_get_file_info (cEventURI, &cName, &cURI, &cIconName, &bIsDirectory, &iVolumeID, &fOrder, 0);
-			//g_free (cName);
-			//g_free (cURI);
 			
 			gchar *cPath = g_filename_from_uri (cEventURI, NULL, NULL);  // some programs dont support URI, so we feed them with path.
 			cCommand = g_strdup_printf ("%s \"%s\"", pIcon->cCommand, cPath);
 			g_free (cPath);
 			s_pEventList = g_list_prepend (s_pEventList, cCommand);
 			
-			CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (zeitgeist_subject_get_text (subject), cIconName, _open_file, pSubMenu, cCommand);
-			//g_free (cIconName);
+			cIconPath = cairo_dock_search_icon_s_path (cIconName);
+			CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (zeitgeist_subject_get_text (subject), cIconPath, _open_file, pSubMenu, cCommand);
+			g_free (cIconPath);
+			g_free (cIconName);
+			cIconName = NULL;
+			g_free (cName);
+			cName = NULL;
+			g_free (cURI);
+			cURI = NULL;
 		}
 	}
 	if (pSubMenu)
 
=== modified file 'Recent-Events/src/applet-search.c'
--- Recent-Events/src/applet-search.c	2011-08-09 18:08:08 +0000
+++ Recent-Events/src/applet-search.c	2011-10-08 22:23:24 +0000
@@ -417,7 +417,6 @@
 	if (iNbDays > 0)
 	{
 		// find events IDs of less than 'iNbDays' days
-		GArray *event_ids;
 		time_t t = (time_t) time (NULL);
 		gint64 now = t * 1e3;  // msec
 		ZeitgeistTimeRange *time_range = zeitgeist_time_range_new (now - iNbDays*24*3600*1e3, now);
 
=== modified file 'Remote-Control/src/applet-icon-finder.c'
--- Remote-Control/src/applet-icon-finder.c	2011-04-20 20:46:51 +0000
+++ Remote-Control/src/applet-icon-finder.c	2011-10-08 22:23:24 +0000
@@ -215,7 +215,7 @@
 		}
 		myData.iMouseX = x;
 		myData.iMouseY = y;
-		cairo_dock_request_icon_animation (pIcon, pDock, myConfig.cIconAnimation, 1e6);  // interrompt l'animation de "mouse over".
+		cairo_dock_request_icon_animation (pIcon, CAIRO_CONTAINER (pDock), myConfig.cIconAnimation, 1e6);  // interrompt l'animation de "mouse over".
 		cairo_dock_launch_animation (CAIRO_CONTAINER (pDock));
 		//if (myAccessibility.bShowSubDockOnClick)
 		//	cairo_dock_show_subdock (pIcon, pDock, FALSE);
 
=== modified file 'Scooby-Do/src/applet-draw.c'
--- Scooby-Do/src/applet-draw.c	2011-04-20 20:46:51 +0000
+++ Scooby-Do/src/applet-draw.c	2011-10-08 22:23:24 +0000
@@ -45,7 +45,7 @@
 		if (pIcon->pIconBuffer == NULL && pIcon->iIconTexture == 0)  // icone pas encore chargee.
 			continue;
 		pParentDock = cairo_dock_search_dock_from_name (pIcon->cParentDockName);
-		cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pParentDock), &iWidth, &iHeight);
+		cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
 		if (iHeight != 0)
 		{
 			fZoom = (double) g_pMainDock->container.iHeight/2 / iHeight;
@@ -71,7 +71,7 @@
 		if (pIcon->pIconBuffer == NULL && pIcon->iIconTexture == 0)  // icone pas encore chargee.
 			continue;
 		pParentDock = cairo_dock_search_dock_from_name (pIcon->cParentDockName);
-		cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pParentDock), &iWidth, &iHeight);
+		cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
 		if (iHeight != 0)
 		{
 			fZoom = (double) g_pMainDock->container.iHeight/2 / iHeight;
@@ -161,7 +161,7 @@
 				if (pIcon->pIconBuffer == NULL)  // icone pas encore chargee.
 					continue;
 				pParentDock = cairo_dock_search_dock_from_name (pIcon->cParentDockName);
-				cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pParentDock), &iWidth, &iHeight);
+				cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
 				fZoom = fIconScale * pMainDock->container.iHeight/2 / iHeight * (myData.pCurrentMatchingElement == ic ? 1. : 1.);
 				cairo_save (pCairoContext);
 				
@@ -346,7 +346,7 @@
 				if (pIcon->iIconTexture == 0)  // icone pas encore chargee.
 					continue;
 				pParentDock = cairo_dock_search_dock_from_name (pIcon->cParentDockName);
-				cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pParentDock), &iWidth, &iHeight);
+				cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
 				fZoom = (double) pMainDock->container.iHeight/2 / iHeight * (myData.pCurrentMatchingElement == ic ? 1. : 1.);
 				glPushMatrix ();
 				
 
=== modified file 'Scooby-Do/src/applet-icon-finder.c'
--- Scooby-Do/src/applet-icon-finder.c	2010-09-18 14:20:27 +0000
+++ Scooby-Do/src/applet-icon-finder.c	2011-10-08 22:23:24 +0000
@@ -159,7 +159,7 @@
 		myData.iPreviousMatchingOffset = myData.iCurrentMatchingOffset;  // on part du point courant.
 		CairoDock *pParentDock = cairo_dock_search_dock_from_name (pIcon->cParentDockName);
 		int iWidth, iHeight;
-		cairo_dock_get_icon_extent (pIcon, CAIRO_CONTAINER (pParentDock), &iWidth, &iHeight);
+		cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
 		if (iHeight != 0)
 		{
 			double fZoom = (double) g_pMainDock->container.iHeight/2 / iHeight;
 
=== modified file 'Status-Notifier/data/Status-Notifier.conf.in'
--- Status-Notifier/data/Status-Notifier.conf.in	2011-08-09 18:08:08 +0000
+++ Status-Notifier/data/Status-Notifier.conf.in	2011-10-08 22:23:24 +0000
@@ -60,7 +60,7 @@
 #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)}
+#{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
 
=== modified file 'Status-Notifier/src/CMakeLists.txt'
--- Status-Notifier/src/CMakeLists.txt	2011-08-09 18:08:08 +0000
+++ Status-Notifier/src/CMakeLists.txt	2011-10-08 22:23:24 +0000
@@ -25,6 +25,7 @@
 add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}")
 add_definitions (-DMY_APPLET_ICON_FILE="icon.png")
 add_definitions (-DINDICATOR_OLD_NAMES=${INDICATOR_OLD_NAMES})
+add_definitions (-DINDICATOR_APPLICATIONADDED_HAS_HINT=${INDICATOR_APPLICATIONADDED_HAS_HINT})
 add_definitions (-DCD_PLUGINS_DIR="${pluginsdir}")
 
 include_directories (
 
=== modified file 'Status-Notifier/src/applet-host-ias.c'
--- Status-Notifier/src/applet-host-ias.c	2011-08-09 18:08:08 +0000
+++ Status-Notifier/src/applet-host-ias.c	2011-10-08 22:23:24 +0000
@@ -94,7 +94,12 @@
 		data2);
 }
 #else  // Natty
-static void _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING (GClosure *closure,
+#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+static void _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING (
+#else
+static void _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING (
+#endif
+	GClosure *closure,
 	GValue *return_value G_GNUC_UNUSED,
 	guint n_param_values,
 	const GValue *param_values,
@@ -102,7 +107,11 @@
 	gpointer marshal_data)
 {
 	//cd_debug ("=== %s ()\n", __func__);
+	#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+	typedef void (*GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING) (
+	#else
 	typedef void (*GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING) (
+	#endif
 		gpointer     data1,
 		gchar      *arg_1,
 		gint        arg_2,
@@ -112,11 +121,23 @@
 		gchar      *arg_6,
 		gchar      *arg_7,
 		gchar      *arg_8,
+		#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+		gchar      *arg_9,
+		#endif
 		gpointer     data2);
+	#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+	register GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING callback;
+	#else
 	register GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING callback;
+	#endif
 	register GCClosure *cc = (GCClosure*) closure;
 	register gpointer data1, data2;
-	g_return_if_fail (n_param_values == 9);  // return_value est NULL ici, car la callback ne renvoit rien.
+	// return_value est NULL ici, car la callback ne renvoit rien.
+	#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+	g_return_if_fail (n_param_values == 10);
+	#else
+	g_return_if_fail (n_param_values == 9);
+	#endif
 
 	if (G_CCLOSURE_SWAP_DATA (closure))
 	{
@@ -128,7 +149,12 @@
 		data1 = g_value_peek_pointer (param_values + 0);
 		data2 = closure->data;
 	}
-	callback = (GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
+	#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+	callback = (GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING)
+	#else
+	callback = (GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING)
+	#endif
+		(marshal_data ? marshal_data : cc->callback);
 
 	callback (data1,
 		(char*) g_value_get_string (param_values + 1),
@@ -139,6 +165,9 @@
 		(char*) g_value_get_string (param_values + 6),
 		(char*) g_value_get_string (param_values + 7),
 		(char*) g_value_get_string (param_values + 8),
+		#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+		(char*) g_value_get_string (param_values + 9),
+		#endif
 		data2);
 }
 #endif
@@ -150,6 +179,9 @@
 static void on_new_application (DBusGProxy *proxy_watcher, const gchar *cIconName, gint iPosition, const gchar *cAdress, const gchar *cObjectPath, const gchar *cIconThemePath, const gchar *cLabel, const gchar *cLabelGuide,
 #if (INDICATOR_OLD_NAMES == 0)  // Natty
 const gchar *cAccessbleDesc,  // WTF is this new param ??
+#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+const gchar *cHint,
+#endif
 #endif
 CairoDockModuleInstance *myApplet)
 {
@@ -157,6 +189,9 @@
 	cd_debug ("=== %s (%s, %s, %s, %s, %d)", __func__, cAdress, cObjectPath, cIconName, cIconThemePath, iPosition);
 	#if (INDICATOR_OLD_NAMES == 0)  // Natty
 	cd_debug ("    %s", cAccessbleDesc);
+	#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+	cd_debug ("    %s", cHint);
+	#endif
 	#endif
 	
 	// position +1 for items placed after this one.
@@ -275,7 +310,7 @@
 		if (v && G_VALUE_HOLDS_BOXED (v))
 			cObjectPath = (gchar*)g_value_get_boxed (v);
 
-		/*g_print ("=== cObjectPath : %s\n", cObjectPath);
+		/*cd_debug ("=== cObjectPath : %s", cObjectPath);
 		if (cObjectPath != NULL && strncmp (cObjectPath, CD_INDICATOR_APPLICATION_ITEM_OBJ, strlen (CD_INDICATOR_APPLICATION_ITEM_OBJ)) == 0)
 		{
 			gchar *str = strrchr (cObjectPath, '/');  // I think this is because this path is actually the menu path, and fortunately it's just under the item object's path.
@@ -353,14 +388,19 @@
 	dbus_g_object_register_marshaller(_cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING,
 			G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
 	#else  // Natty
-	dbus_g_object_register_marshaller(_cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING,
+	dbus_g_object_register_marshaller(
+	#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+	_cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING,
+	#else
+	_cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING,
+	#endif
 			G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING,
-			#if (INDICATOR_OLD_NAMES != 0)  // Maverick
-			G_TYPE_STRING,  // dbusobject
-			#else  // Natty
 			DBUS_TYPE_G_OBJECT_PATH,  // dbusobject
+			G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
+			#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+			G_TYPE_STRING,
 			#endif
-			G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+			G_TYPE_INVALID);
 	#endif
 	dbus_g_proxy_add_signal(myData.pProxyIndicatorApplicationService, "ApplicationAdded",
 		G_TYPE_STRING,  // iconname
@@ -376,6 +416,9 @@
 		G_TYPE_STRING,  // labelguide
 		#if (INDICATOR_OLD_NAMES == 0)  // Natty
 		G_TYPE_STRING,  // accessibledesc
+		#if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1)
+		G_TYPE_STRING, // hint => only with indicator-0.4 (Oneiric)
+		#endif
 		#endif
 		G_TYPE_INVALID);
 	dbus_g_proxy_connect_signal(myData.pProxyIndicatorApplicationService, "ApplicationAdded",
@@ -429,7 +472,7 @@
 	}
 	CD_APPLET_LEAVE ();
 }
-static void _on_ias_owner_changed (gboolean bOwned, gpointer data)
+static void _on_ias_owner_changed (const gchar *cName, gboolean bOwned, gpointer data)
 {
 	CD_APPLET_ENTER;
 	cd_debug ("=== Indicator Applications Service is on the bus (%d)", bOwned);
@@ -475,7 +518,7 @@
 	// if present, set up proxy, else try to start the service.
 	if (bPresent)
 	{
-		_on_ias_owner_changed (TRUE, NULL);
+		_on_ias_owner_changed (CD_INDICATOR_APPLICATION_ADDR, TRUE, NULL);
 	}
 	else  // not present, maybe the service is not started => try starting it.
 	{
@@ -519,5 +562,5 @@
 	}
 	
 	cairo_dock_stop_watching_dbus_name_owner (CD_INDICATOR_APPLICATION_ADDR,
-		(CairoDockOnAppliPresentOnDbus) _on_detect_ias);
+		(CairoDockDbusNameOwnerChangedFunc) _on_ias_owner_changed);
 }
 
=== modified file 'Status-Notifier/src/applet-host-kde.c'
--- Status-Notifier/src/applet-host-kde.c	2011-08-09 18:08:08 +0000
+++ Status-Notifier/src/applet-host-kde.c	2011-10-08 22:23:24 +0000
@@ -220,7 +220,7 @@
 	}
 	CD_APPLET_LEAVE ();
 }
-static void _on_watcher_owner_changed (gboolean bOwned, gpointer data)
+static void _on_watcher_owner_changed (const gchar *cName, gboolean bOwned, gpointer data)
 {
 	cd_debug ("=== Watcher is on the bus (%d)", bOwned);
 	CD_APPLET_ENTER;
@@ -283,7 +283,7 @@
 	// if present, set up proxy.
 	if (bPresent)
 	{
-		_on_watcher_owner_changed (TRUE, NULL);
+		_on_watcher_owner_changed (CD_STATUS_NOTIFIER_WATCHER_ADDR, TRUE, NULL);
 	}
 	else if (myConfig.bCompactMode)  // in compact mode, draw a 'failed' image to not have an empty icon.
 	{
@@ -321,5 +321,5 @@
 		s_pDetectWatcherCall = NULL;
 	}
 	cairo_dock_stop_watching_dbus_name_owner (CD_STATUS_NOTIFIER_WATCHER_ADDR,
-		(CairoDockOnAppliPresentOnDbus) _on_detect_watcher);
+		(CairoDockDbusNameOwnerChangedFunc) _on_watcher_owner_changed);
 }
 
=== modified file 'Status-Notifier/src/applet-item.c'
--- Status-Notifier/src/applet-item.c	2011-08-09 18:08:08 +0000
+++ Status-Notifier/src/applet-item.c	2011-10-08 22:23:24 +0000
@@ -269,7 +269,7 @@
 		
 		if (pItem->cOverlayIconName != NULL)
 		{
-			CairoEmblem *pEmblem = cairo_dock_make_emblem (pItem->cOverlayIconName, pIcon, CAIRO_CONTAINER (myIcon->pSubDock));
+			CairoEmblem *pEmblem = cairo_dock_make_emblem (pItem->cOverlayIconName, pIcon);
 			cairo_dock_set_emblem_position (pEmblem, CAIRO_DOCK_EMBLEM_MIDDLE);
 			cairo_dock_draw_emblem_on_icon (pEmblem, pIcon, CAIRO_CONTAINER (myIcon->pSubDock));
 			cairo_dock_free_emblem (pEmblem);
 
=== modified file 'System-Monitor/data/System-Monitor.conf.in'
--- System-Monitor/data/System-Monitor.conf.in	2011-08-09 18:08:08 +0000
+++ System-Monitor/data/System-Monitor.conf.in	2011-10-08 22:23:24 +0000
@@ -20,9 +20,12 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#b Always display the icon, even when the dock is hidden?
+#B Always display the icon, even when the dock is hidden?
 always visi = false
 
+#C+ Background color to add in this case
+bg color = .8;.8;.8;.5
+
 order=
 
 #F[Applet's Handbook]
@@ -59,7 +62,7 @@
 #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)}
+#{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
@@ -111,9 +114,11 @@
 #X[Gauge;gtk-dialog-info]
 frame_gauge=
 
-#h+[@gaugesdir@;gauges;gauges2] Choose one of the available themes:/
+#h+[@gaugesdir@;gauges;gauges3;system] Choose one of the available themes:/
 theme = Turbo-night-fuel
 
+#l+[No;With dock orientation;Yes] Rotate applet theme :
+rotate theme = No
 
 #X[Graph;gtk-dialog-info]
 frame_graph=
 
=== modified file 'System-Monitor/src/applet-config.c'
--- System-Monitor/src/applet-config.c	2011-04-20 20:46:51 +0000
+++ System-Monitor/src/applet-config.c	2011-10-08 22:23:24 +0000
@@ -45,6 +45,7 @@
 	myConfig.iDisplayType = CD_CONFIG_GET_INTEGER ("Configuration", "renderer");
 	
 	myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");
+	myConfig.iRotateTheme = CD_CONFIG_GET_INTEGER ("Configuration", "rotate theme");
 	
 	myConfig.iGraphType = CD_CONFIG_GET_INTEGER ("Configuration", "graphic type");
 	myConfig.bMixGraph = CD_CONFIG_GET_BOOLEAN ("Configuration", "mix graph");
 
=== modified file 'System-Monitor/src/applet-init.c'
--- System-Monitor/src/applet-init.c	2011-04-20 20:46:51 +0000
+++ System-Monitor/src/applet-init.c	2011-10-08 22:23:24 +0000
@@ -66,7 +66,8 @@
 		memset (&attr, 0, sizeof (CairoGaugeAttribute));
 		pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
 		pRenderAttr->cModelName = "gauge";
-		attr.cThemePath = myConfig.cGThemePath;
+		pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
+		attr.cThemePath = myConfig.cGThemePath;  
 	}
 	else if (myConfig.iDisplayType == CD_SYSMONITOR_GRAPH)
 	{
@@ -74,10 +75,10 @@
 		memset (&attr, 0, sizeof (CairoGraphAttribute));
 		pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
 		pRenderAttr->cModelName = "graph";
-		pRenderAttr->iMemorySize = (myIcon->fWidth > 1 ? myIcon->fWidth : 32);  // fWidht peut etre <= 1 en mode desklet au chargement.
-		//g_print ("pRenderAttr->iMemorySize : %d\n", pRenderAttr->iMemorySize);
+		int w, h;
+		CD_APPLET_GET_MY_ICON_EXTENT (&w, &h);
+		pRenderAttr->iMemorySize = (w > 1 ? w : 32);  // fWidth peut etre <= 1 en mode desklet au chargement.
 		attr.iType = myConfig.iGraphType;
-		attr.iRadius = 10;
 		attr.bMixGraphs = myConfig.bMixGraph;
 		double fHighColor[CD_SYSMONITOR_NB_MAX_VALUES*3];
 		double fLowColor[CD_SYSMONITOR_NB_MAX_VALUES*3];
@@ -193,7 +194,10 @@
 		CD_APPLET_SET_QUICK_INFO_ON_MY_ICON (NULL);
 		if (myConfig.iInfoDisplay != CAIRO_DOCK_INFO_ON_LABEL)
 		{
-			CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
+			if (myConfig.defaultTitle) // has another default name
+				CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
+			else
+				CD_APPLET_SET_NAME_FOR_MY_ICON (myApplet->pModule->pVisitCard->cTitle);
 		}
 		
 		myData.bAcquisitionOK = TRUE;
 
=== modified file 'System-Monitor/src/applet-monitor.c'
--- System-Monitor/src/applet-monitor.c	2011-08-09 18:08:08 +0000
+++ System-Monitor/src/applet-monitor.c	2011-10-08 22:23:24 +0000
@@ -78,7 +78,12 @@
 		cd_warning ("One or more datas couldn't be retrieved");
 		CD_APPLET_SET_QUICK_INFO_ON_MY_ICON ("N/A");  // plus discret qu'une bulle de dialogue.
 		if (myConfig.iInfoDisplay == CAIRO_DOCK_INFO_ON_LABEL)
-			CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
+		{
+			if (myConfig.defaultTitle) // has another default name
+				CD_APPLET_SET_NAME_FOR_MY_ICON (myConfig.defaultTitle);
+			else
+				CD_APPLET_SET_NAME_FOR_MY_ICON (myApplet->pModule->pVisitCard->cTitle);
+		}
 		memset (s_fValues, 0, sizeof (s_fValues));
 		CD_APPLET_RENDER_NEW_DATA_ON_MY_ICON (s_fValues);
 	}
 
=== modified file 'System-Monitor/src/applet-sensors.c'
--- System-Monitor/src/applet-sensors.c	2011-04-20 20:46:51 +0000
+++ System-Monitor/src/applet-sensors.c	2011-10-08 22:23:24 +0000
@@ -214,7 +214,7 @@
 						break;
 					val = get_value (chip, sf);  // rpm
 					if (val == 0)
-						return;
+						break;
 					
 					// alarm
 					sf = sensors_get_subfeature (chip, feature,
@@ -383,7 +383,7 @@
 						break;
 					val = get_value (chip, sf);  // rpm
 					if (val == 0)
-						return;
+						break;
 					
 					// alarm
 					sf = sensors_get_subfeature (chip, feature,
 
=== modified file 'System-Monitor/src/applet-struct.h'
--- System-Monitor/src/applet-struct.h	2011-04-20 20:46:51 +0000
+++ System-Monitor/src/applet-struct.h	2011-10-08 22:23:24 +0000
@@ -80,6 +80,7 @@
 	gint iAlertLimit;
 	gboolean bAlert;
 	gboolean bAlertSound;
+	RendererRotateTheme iRotateTheme;
 } ;
 
 typedef struct {
 
=== modified file 'Toons/data/Toons.conf.in'
--- Toons/data/Toons.conf.in	2011-08-09 18:08:08 +0000
+++ Toons/data/Toons.conf.in	2011-10-08 22:23:24 +0000
@@ -20,9 +20,12 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#b Always display the icon, even when the dock is hidden?
+#B Always display the icon, even when the dock is hidden?
 always visi = false
 
+#C+ Background color to add in this case
+bg color = .8;.8;.8;.5
+
 order=
 
 #F[Applet's Handbook]
@@ -60,7 +63,7 @@
 #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)}
+#{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
 
=== modified file 'Xgamma/data/Xgamma.conf.in'
--- Xgamma/data/Xgamma.conf.in	2011-08-09 18:08:08 +0000
+++ Xgamma/data/Xgamma.conf.in	2011-10-08 22:23:24 +0000
@@ -60,7 +60,7 @@
 #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)}
+#{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
 
=== modified file 'alsaMixer/data/AlsaMixer.conf.in'
--- alsaMixer/data/AlsaMixer.conf.in	2011-08-09 18:08:08 +0000
+++ alsaMixer/data/AlsaMixer.conf.in	2011-10-08 22:23:24 +0000
@@ -59,7 +59,7 @@
 #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)}
+#{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
@@ -140,17 +140,29 @@
 #l[No;On label;On icon] Display volume :
 display volume = 1
 
-#l+[None;Zoom;Transparency;Draw Bar] Effect to apply to the icon when adjusting volume:
+#v
+sep_disp_vol =
+
+#Y+[None;0;0;Zoom;1;2;Transparency;1;2;Draw Bar;1;2;Gauge;3;2] Effect to apply to the icon when adjusting volume:
 effect = 3
 
 #S+ Default icon:
 #{Leave empty to use the default one.}
 default icon = 
 
+#S+ Mute icon:
+#{Leave empty to use the default one.}
+mute icon = 
+
+#h+[@gaugesdir@;gauges;gauges3;sound] Choose one of the available themes:/
+theme = Turbo-night-fuel
+
+#l+[No;With dock orientation;Yes] Rotate applet theme :
+rotate theme = No
+
+#v
+sep_disp =
+
 #S+ Broken icon:
 #{Leave empty to use the default one.}
 broken icon = 
-
-#S+ Mute icon:
-#{Leave empty to use the default one.}
-mute icon = 
 
=== modified file 'alsaMixer/src/applet-config.c'
--- alsaMixer/src/applet-config.c	2011-04-20 20:46:51 +0000
+++ alsaMixer/src/applet-config.c	2011-10-08 22:23:24 +0000
@@ -60,6 +60,12 @@
 	
 	myConfig.iVolumeEffect = CD_CONFIG_GET_INTEGER ("Configuration", "effect");
 	
+	if (myConfig.iVolumeEffect == VOLUME_EFFECT_GAUGE)
+	{
+		myConfig.cGThemePath = CD_CONFIG_GET_GAUGE_THEME ("Configuration", "theme");
+		myConfig.iRotateTheme = CD_CONFIG_GET_INTEGER ("Configuration", "rotate theme");
+	}
+	
 	myConfig.cDefaultIcon = CD_CONFIG_GET_STRING ("Configuration", "default icon");
 	myConfig.cBrokenIcon = CD_CONFIG_GET_STRING ("Configuration", "broken icon");
 	myConfig.cMuteIcon = CD_CONFIG_GET_STRING ("Configuration", "mute icon");
@@ -77,6 +83,7 @@
 	g_free (myConfig.cDefaultIcon);
 	g_free (myConfig.cBrokenIcon);
 	g_free (myConfig.cMuteIcon);
+	g_free (myConfig.cGThemePath);
 CD_APPLET_RESET_CONFIG_END
 
 
@@ -88,7 +95,8 @@
 	}
 	mixer_stop ();
 	cairo_surface_destroy (myData.pSurface);
-	cairo_surface_destroy (myData.pMuteSurface);
+	if (myData.pMuteSurface)
+		cairo_surface_destroy (myData.pMuteSurface);
 	cairo_dock_dialog_unreference (myData.pDialog);
 	g_free (myData.cErrorMessage);
 	g_free (myData.mixer_card_name);
 
=== modified file 'alsaMixer/src/applet-draw.c'
--- alsaMixer/src/applet-draw.c	2010-02-14 00:51:22 +0000
+++ alsaMixer/src/applet-draw.c	2011-10-08 22:23:24 +0000
@@ -26,6 +26,8 @@
 #include "applet-mixer.h"
 #include "applet-draw.h"
 
+static void _load_mute_surface (void);
+
 
 int mixer_element_update_with_event (snd_mixer_elem_t *elem, unsigned int mask)
 {
@@ -62,7 +64,21 @@
 		break;
 	}
 	
-	cairo_surface_t *pSurface = (myData.bIsMute ? myData.pMuteSurface : myData.pSurface);
+	
+	cairo_surface_t *pSurface = NULL;
+	if (myConfig.iVolumeEffect != VOLUME_EFFECT_GAUGE)
+	{
+		if (myData.bIsMute)
+		{
+			if (myData.pMuteSurface == NULL)
+				_load_mute_surface ();
+			pSurface = myData.pMuteSurface;
+		}
+		else
+		{
+			pSurface = myData.pSurface;
+		}
+	}
 	
 	switch (myConfig.iVolumeEffect)
 	{
@@ -86,6 +102,18 @@
 			bNeedRedraw = FALSE;
 		break;
 		
+		case VOLUME_EFFECT_GAUGE :
+		{
+			double fPercent;
+			if (myData.bIsMute)
+				fPercent = CAIRO_DATA_RENDERER_UNDEF_VALUE;
+			else
+				fPercent = (double) myData.iCurrentVolume / 100.;
+			CD_APPLET_RENDER_NEW_DATA_ON_MY_ICON (&fPercent);
+			bNeedRedraw = FALSE;
+		}
+		break;
+		
 		default :
 		break;
 	}
@@ -99,7 +127,6 @@
 	}
 	
 	CD_APPLET_LEAVE(0);
-	//return 0;
 }
 
 
@@ -119,3 +146,56 @@
 {
 	CD_APPLET_SET_SURFACE_ON_MY_ICON_WITH_BAR (pSurface, myData.iCurrentVolume * .01);
 }
+
+
+void mixer_load_surfaces (void)
+{
+	if (myData.pSurface != NULL)
+	{
+		cairo_surface_destroy (myData.pSurface);
+		myData.pSurface = NULL;
+	}
+	
+	if (myConfig.cDefaultIcon != NULL)
+	{
+		gchar *cImagePath = cairo_dock_search_icon_s_path (myConfig.cDefaultIcon);
+		if (cImagePath == NULL)
+			cImagePath = cairo_dock_search_image_s_path (myConfig.cDefaultIcon);
+		if (cImagePath != NULL)
+		{
+			myData.pSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (cImagePath);
+			g_free (cImagePath);
+		}
+	}
+	
+	if (myData.pSurface == NULL)
+	{
+		myData.pSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (MY_APPLET_SHARE_DATA_DIR"/default.svg");
+	}
+	
+	if (myData.pMuteSurface != NULL)
+	{
+		cairo_surface_destroy (myData.pMuteSurface);
+		myData.pMuteSurface = NULL;
+	}  // don't load the mute surface now, as we often won't even need it in the session. we'll load it on demand.
+}
+
+static void _load_mute_surface (void)
+{
+	if (myConfig.cMuteIcon != NULL)
+	{
+		gchar *cImagePath = cairo_dock_search_icon_s_path (myConfig.cMuteIcon);
+		if (cImagePath == NULL)
+			cImagePath = cairo_dock_search_image_s_path (myConfig.cMuteIcon);
+		if (cImagePath != NULL)
+		{
+			myData.pMuteSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (cImagePath);
+			g_free (cImagePath);
+		}
+	}
+	
+	if (myData.pMuteSurface == NULL)
+	{
+		myData.pMuteSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (MY_APPLET_SHARE_DATA_DIR"/mute.svg");
+	}
+}
 
=== modified file 'alsaMixer/src/applet-draw.h'
--- alsaMixer/src/applet-draw.h	2009-08-26 21:07:39 +0000
+++ alsaMixer/src/applet-draw.h	2011-10-08 22:23:24 +0000
@@ -17,7 +17,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #ifndef __APPLET_DRAW__
 #define  __APPLET_DRAW__
 
@@ -33,5 +32,7 @@
 
 void mixer_draw_bar (cairo_surface_t *pSurface);
 
+void mixer_load_surfaces (void);
+
 
 #endif
 
=== modified file 'alsaMixer/src/applet-init.c'
--- alsaMixer/src/applet-init.c	2011-08-09 18:08:08 +0000
+++ alsaMixer/src/applet-init.c	2011-10-08 22:23:24 +0000
@@ -45,47 +45,11 @@
 CD_APPLET_DEFINE_END
 
 
-static void _load_surfaces (void)
-{
-	GString *sImagePath = g_string_new ("");
-	
-	if (myData.pSurface != NULL)
-		cairo_surface_destroy (myData.pSurface);
-	if (myConfig.cDefaultIcon != NULL)
-	{
-		gchar *cUserImagePath = cairo_dock_generate_file_path (myConfig.cDefaultIcon);
-		myData.pSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (cUserImagePath);
-		g_free (cUserImagePath);
-	}
-	else
-	{
-		g_string_printf (sImagePath, "%s/default.svg", MY_APPLET_SHARE_DATA_DIR);
-		myData.pSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (sImagePath->str);
-	}
-	
-	if (myData.pMuteSurface != NULL)
-		cairo_surface_destroy (myData.pMuteSurface);
-	if (myConfig.cMuteIcon != NULL)
-	{
-		gchar *cUserImagePath = cairo_dock_generate_file_path (myConfig.cMuteIcon);
-		myData.pMuteSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (cUserImagePath);
-		g_free (cUserImagePath);
-	}
-	else
-	{
-		g_string_printf (sImagePath, "%s/mute.svg", MY_APPLET_SHARE_DATA_DIR);
-		myData.pMuteSurface = CD_APPLET_LOAD_SURFACE_FOR_MY_APPLET (sImagePath->str);
-	}
-	
-	g_string_free (sImagePath, TRUE);
-}
-
-
 static gboolean _cd_mixer_on_enter (GtkWidget* pWidget,
 	GdkEventCrossing* pEvent,
 	gpointer data)
 {
-	if (myDesklet && myDesklet->container.iHeight > 64)
+	if (myData.pScale && myDesklet && myDesklet->container.iHeight > 64)
 	{
 		gtk_widget_show (myData.pScale);
 	}
@@ -94,7 +58,7 @@
 	GdkEventCrossing* pEvent,
 	gpointer data)
 {
-	if (myDesklet && myDesklet->container.iHeight > 64)
+	if (myData.pScale && myDesklet && myDesklet->container.iHeight > 64)
 	{
 		if (! myDesklet->container.bInside)
 			gtk_widget_hide (myData.pScale);
@@ -102,6 +66,7 @@
 }
 
 CD_APPLET_INIT_BEGIN
+	// scale widget visibility in desklet
 	if (myDesklet)
 	{
 		int iScaleWidth = (myDesklet->container.iHeight > 64 ? 15 : 0);
@@ -121,8 +86,25 @@
 		}
 	}
 	
-	_load_surfaces ();
+	// data renderer
+	if (myConfig.iVolumeEffect == VOLUME_EFFECT_GAUGE)
+	{
+		CairoDataRendererAttribute *pRenderAttr = NULL;  // les attributs du data-renderer global.
+		CairoGaugeAttribute attr;  // les attributs de la jauge.
+		memset (&attr, 0, sizeof (CairoGaugeAttribute));
+		pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
+		pRenderAttr->cModelName = "gauge";
+		pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
+		attr.cThemePath = myConfig.cGThemePath;
+		
+		CD_APPLET_ADD_DATA_RENDERER_ON_MY_ICON (pRenderAttr);
+	}
+	else
+	{
+		mixer_load_surfaces ();
+	}
 	
+	// listen to the sound card
 	mixer_init (myConfig.card_id);
 	
 	mixer_get_controlled_element ();
@@ -157,12 +139,14 @@
 		myData.iSidCheckVolume = g_timeout_add (1000, (GSourceFunc) mixer_check_events, (gpointer) NULL);
 	}
 	
+	// mouse events
 	CD_APPLET_REGISTER_FOR_CLICK_EVENT;
 	CD_APPLET_REGISTER_FOR_MIDDLE_CLICK_EVENT;
 	CD_APPLET_REGISTER_FOR_BUILD_MENU_EVENT;
 	CD_APPLET_REGISTER_FOR_SCROLL_EVENT;
 	CD_APPLET_REGISTER_FOR_DOUBLE_CLICK_EVENT;
-
+	
+	// keyboard events
 	cd_keybinder_bind (myConfig.cShortcut, (CDBindkeyHandler) mixer_on_keybinding_pull, (gpointer)NULL);
 CD_APPLET_INIT_END
 
@@ -186,7 +170,8 @@
 
 CD_APPLET_RELOAD_BEGIN
 	//\_______________ On recharge les donnees qui ont pu changer.
-	_load_surfaces ();
+	if (myConfig.iVolumeEffect != VOLUME_EFFECT_GAUGE)
+		mixer_load_surfaces ();
 	
 	//\_______________ On recharge le mixer si necessaire.
 	if (CD_APPLET_MY_CONFIG_CHANGED)
@@ -224,6 +209,22 @@
 		}
 		else
 		{
+			if (myConfig.iVolumeEffect == VOLUME_EFFECT_GAUGE)
+			{
+				CairoDataRendererAttribute *pRenderAttr = NULL;  // les attributs du data-renderer global.
+				CairoGaugeAttribute attr;  // les attributs de la jauge.
+				memset (&attr, 0, sizeof (CairoGaugeAttribute));
+				pRenderAttr = CAIRO_DATA_RENDERER_ATTRIBUTE (&attr);
+				pRenderAttr->cModelName = "gauge";
+				pRenderAttr->iRotateTheme = myConfig.iRotateTheme;
+				attr.cThemePath = myConfig.cGThemePath;
+				
+				if (cairo_dock_get_icon_data_renderer (myIcon))
+					CD_APPLET_RELOAD_MY_DATA_RENDERER (pRenderAttr);
+				else
+					CD_APPLET_ADD_DATA_RENDERER_ON_MY_ICON (pRenderAttr);
+			}
+			
 			mixer_element_update_with_event (myData.pControledElement, 1);
 			if (myData.iSidCheckVolume == 0)
 				myData.iSidCheckVolume = g_timeout_add (1000, (GSourceFunc) mixer_check_events, (gpointer) NULL);
@@ -278,16 +279,26 @@
 				g_signal_handler_disconnect (G_OBJECT (myDesklet->container.pWidget), iOnLeaveCallbackID);
 			}
 		}
+		else
+		{
+			if (CD_APPLET_MY_CONTAINER_TYPE_CHANGED)
+			{
+				gtk_widget_destroy (myData.pScale);
+				myData.pScale = NULL;
+			}
+		}
 	}
 	else
 	{
 		///\_______________ On redessine notre icone.
+		if (myDesklet && myDesklet->container.iHeight <= 64)
+			gtk_widget_hide (myData.pScale);
+		
+		CD_APPLET_RELOAD_MY_DATA_RENDERER (NULL);
+		
 		if (myData.pControledElement != NULL)
 		{
 			mixer_element_update_with_event (myData.pControledElement, 0);
 		}
-		
-		if (myDesklet && myDesklet->container.iHeight <= 64)
-			gtk_widget_hide (myData.pScale);
 	}
 CD_APPLET_RELOAD_END
 
=== modified file 'alsaMixer/src/applet-mixer.c'
--- alsaMixer/src/applet-mixer.c	2011-08-09 18:08:08 +0000
+++ alsaMixer/src/applet-mixer.c	2011-10-08 22:23:24 +0000
@@ -264,24 +264,10 @@
 }
 
 
-/**static gboolean on_button_press_dialog (GtkWidget *widget,
-	GdkEventButton *pButton,
-	CairoDialog *pDialog)
-{
-	CD_APPLET_ENTER;
-	cairo_dock_dialog_unreference (pDialog);
-	myData.pDialog = NULL;
-	CD_APPLET_LEAVE(FALSE);
-	//return FALSE;
-}*/
 static void _on_dialog_destroyed (CairoDockModuleInstance *myApplet)
 {
 	myData.pDialog = NULL;
 }
-/**static gboolean _on_key_press_dialog (int iClickedButton, GtkWidget *pInteractiveWidget, gpointer *data, CairoDialog *pDialog)
-{
-	myData.pDialog = NULL;  // le dialogue est dereference donc tout ce qu'on a a faire c'est prendre en compte ce fait !
-}*/
 void mixer_show_hide_dialog (void)
 {
 	if (myDesklet)
@@ -303,15 +289,10 @@
 		attr.cText = cMessage;
 		attr.cImageFilePath = MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE;
 		attr.pInteractiveWidget = pScale;
-		///attr.pActionFunc = (CairoDockActionOnAnswerFunc) _on_key_press_dialog;
 		attr.pUserData = myApplet;
 		attr.pFreeDataFunc = (GFreeFunc)_on_dialog_destroyed;
 		
 		myData.pDialog = cairo_dock_build_dialog (&attr, myIcon, myContainer);
-		/**g_signal_connect (G_OBJECT (myData.pDialog->container.pWidget),
-			"button-press-event",
-			G_CALLBACK (on_button_press_dialog),
-			myData.pDialog);*/
 	}
 	else
 	{
@@ -325,5 +306,4 @@
 	CD_APPLET_ENTER;
 	snd_mixer_handle_events (myData.mixer_handle);  // ne renvoie pas d'evenements pour nos actions !
 	CD_APPLET_LEAVE(TRUE);
-	//return TRUE;
 }
 
=== modified file 'alsaMixer/src/applet-struct.h'
--- alsaMixer/src/applet-struct.h	2009-08-26 21:07:39 +0000
+++ alsaMixer/src/applet-struct.h	2011-10-08 22:23:24 +0000
@@ -37,6 +37,7 @@
 	VOLUME_EFFECT_ZOOM,
 	VOLUME_EFFECT_TRANSPARENCY,
 	VOLUME_EFFECT_BAR,
+	VOLUME_EFFECT_GAUGE,
 	VOLUME_NB_EFFECTS
 	} VolumeTypeEffect;
 
@@ -53,6 +54,8 @@
 	gchar *cShortcut;
 	gint iScrollVariation;
 	gboolean bHideScaleOnLeave;
+	gchar *cGThemePath;
+	RendererRotateTheme iRotateTheme;
 	} ;
 
 struct _AppletData {
@@ -68,7 +71,6 @@
 	guint iSidCheckVolume;
 	CairoDialog *pDialog;
 	cairo_surface_t *pSurface;
-	//cairo_surface_t *pBrokenSurface;
 	cairo_surface_t *pMuteSurface;
 	int iCurrentVolume;  // volume courant en %.
 	gboolean bIsMute;
 
=== modified file 'clock/data/clock.conf.in'
--- clock/data/clock.conf.in	2011-08-09 18:08:08 +0000
+++ clock/data/clock.conf.in	2011-10-08 22:23:24 +0000
@@ -21,9 +21,12 @@
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#b Always display the icon, even when the dock is hidden?
+#B Always display the icon, even when the dock is hidden?
 always visi = false
 
+#C+ Background color to add in this case
+bg color = .8;.8;.8;.5
+
 order=
 
 #F[Applet's Handbook]
@@ -62,7 +65,7 @@
 #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)}
+#{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
 
=== modified file 'clock/src/applet-backend-ical.c'
--- clock/src/applet-backend-ical.c	2010-09-18 14:20:27 +0000
+++ clock/src/applet-backend-ical.c	2011-10-08 22:23:24 +0000
@@ -133,7 +133,7 @@
 	{
 		//if( ICAL_VCALENDAR_COMPONENT != icalcomponent_isa(piCalComponent) ) continue;
 		cTaskID = g_strdup(icalcomponent_get_uid(piCalComponent));
-		g_print( "...Found task ID=%s\n", cTaskID );
+		cd_debug ( "...Found task ID=%s", cTaskID );
 		if( cTaskID != NULL && strcmp( uid, cTaskID ) == 0 )
 		{
 			break;
 
=== removed file 'debian/cairo-dock-plug-ins-data.lintian-overrides'
--- debian/cairo-dock-plug-ins-data.lintian-overrides	2009-08-26 21:07:39 +0000
+++ debian/cairo-dock-plug-ins-data.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-# Cairo-dock plugin config files uses shebang
-# upstream is warned
-cairo-dock-plug-ins-data: interpreter-not-absolute
-cairo-dock-plug-ins-data: script-not-executable
-cairo-dock-plug-ins-data: unusual-interpreter
 
=== added file 'debian/cairo-dock-plug-ins-integration.lintian-overrides'
--- debian/cairo-dock-plug-ins-integration.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/cairo-dock-plug-ins-integration.lintian-overrides	2011-10-08 22:23:24 +0000
@@ -0,0 +1,7 @@
+# Cairo-Dock Plug-Ins are not linked to gldi
+cairo-dock-plug-ins-integration: pkg-has-shlibs-control-file-but-no-actual-shared-libs
+# These integration plug-ins don't need shlibs and don't have to call ldconfig
+#  (these plug-ins are enable only if a lib is available)
+cairo-dock-plug-ins-integration: postinst-has-useless-call-to-ldconfig
+cairo-dock-plug-ins-integration: postrm-has-useless-call-to-ldconfig
+cairo-dock-plug-ins-integration: missing-dependency-on-libc
 
=== modified file 'debian/cairo-dock-plug-ins.install'
--- debian/cairo-dock-plug-ins.install	2011-08-09 19:51:45 +0000
+++ debian/cairo-dock-plug-ins.install	2011-10-08 22:23:24 +0000
@@ -1,6 +1,7 @@
 usr/lib*/cairo-dock/libcd-*.so
 usr/lib*/cli/CDApplet*.dll
-usr/lib*/python*/
+usr/lib*/python*/dist-packages/*.py
+usr/lib*/python*/dist-packages/*.egg-info
 usr/lib*/libCDApplet*.so
 usr/lib*/ruby*/
 usr/lib*/pkgconfig/
 
=== added file 'debian/cairo-dock-plug-ins.lintian-overrides'
--- debian/cairo-dock-plug-ins.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/cairo-dock-plug-ins.lintian-overrides	2011-10-08 22:23:24 +0000
@@ -0,0 +1,6 @@
+# Cairo-Dock Plug-Ins are not linked to gldi
+cairo-dock-plug-ins: pkg-has-shlibs-control-file-but-no-actual-shared-libs
+# Bug reported to upstream.
+cairo-dock-plug-ins: shlib-without-versioned-soname
+# Temporally lintian override: This package is going to be split
+cairo-dock-plug-ins: package-name-doesnt-match-sonames
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-08-11 23:17:39 +0000
+++ debian/changelog	2011-10-08 22:23:24 +0000
@@ -1,3 +1,104 @@
+cairo-dock-plug-ins (2.4.0~2-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream bug fix release. (LP: #859984)
+  * Upstream (short) ChangeLog (2.4.0~0beta2 -> 2.4.0~1):
+   - Powermanager: correctly release the reference on the device object
+   - logout: now works if there is no session-manager
+   - Status-Notifier: fixed a small bug
+      (wrong callback in cairo_dock_stop_watching_dbus_name_owner)
+   - Folders: fixed the positionning of the new icon
+      and the dialog when dropping a folder inside the dock
+      and fixed the icon-rendering
+   - Dustbin: use the default theme if no icon is found
+   - Impulse: the default context seems to be ok and not an error
+   - Status-Notifier: On Ubuntu Oneiric (with indicator-0.4)
+      the ApplicationAdded signal has changed and has a new parameter
+   - Disable MeMenu on Oneiric (no longer available with indicator-0.4)
+   - CMakeLists.txt: Improved output messages
+   - Slide view: fixed a small offset in vertical view
+   - musicPlayer:
+    + split MPRIS 1.0 and 2.0 to help debugging and finding the right
+       name of the bug.
+    + 'rhythmbox-client' tool is no longer available: used MPRIS
+    + Disable Amazon service (it no longer work)
+    + Cover: fixed corrupted icons: some players (e.g. the latest version
+       of RB) copy covers on their cache forlder but it takes a few time.
+    + Fixed the update the icon and its name if the player is stopped.
+    + Prevent a crash if the name given by MPRIS is NULL
+   - Powermanager: try to prevent to have a few dialogues at the same time
+   - PowerManager and AlsaMixer: hidden gnome2 or 3 apps if not available
+   - Messaging-Menu: Updated for Natty and Oneiric
+      (dbus-menu gives us GVariant instead of GValue objects)
+   - Alsamixer: fixed a small bug on reload
+   - Dbus: Bash interface: Fixed a typo with emblem positions
+   - Sys-monitor: fixed a bug which prevented from getting
+      the CPU temperature in some cases
+   - Compiz (0.9): type filter: replaced type=utility by type=Utility
+   - Updated the version of all applets that have gauges
+     in order to use the right directory
+   - Wifi: Fixed the status if we are not connected
+   - Dbus: removed a conflict with the Help applet
+   - Messaging-Menu: updated applet-menu.c => Memory leaks on pixbufs
+   - Dbus: Fixed a crash when changing dock theme if a 'third-party' applet
+      is running
+   - Netspeed: in /proc/net/dev, there are 8 values to drop after the card id
+      except if there is whitespaces just after this ':' character
+      and fixed order and value for ON_ICON display
+   - dock-rendering/toto: removed a useless file
+   - Clipper: fixed the loading of the remembered items
+      (they had the wrong type) and fixed a bug if we reduce the list of items
+   - Folders, dustbin, Network-Monitor: tried to not use cast if it's possible
+   - Code cleaned and re-organised a few functions
+     (e.g. emblem references has been renamed)
+   - Removed useless files: powermanager-dbus*
+   - Updating translations
+   - Fixed a few warnings at the compilation
+   - Removed a few useless output messages
+   - Fixed these LP bugs:
+    + Empty trash from the trashcan does not delete files
+       from usb harddisks: LP: #658681
+    + Switcher applet doesn't respect desktop numbers LP: #626782
+  * Upstream (short) ChangeLog (2.4.0~1 -> 2.4.0~2):
+   - Messaging-Menu: fixed a wrong g_object_unref (double free)
+      and a small memory leak
+   - Folders: fixed a tiny warning at the compilation (32bits)
+   - switcher: removed an unnecessary config parameter
+   - Folders: file size: used English instead of French translation.
+   - Indicator applet: Forced a cast to remove an annoying warning
+      due to clumsy dbusmenu_gtkmenu_new() declaration
+   - Fixed the detection of the screensaver
+   - Fixed tiny warnings at the compilation (with CAIRO_CONTAINER)
+  * debian/control:
+   - Updated the version of cairo-dock-[core;data;dev].
+   - Added gvfs as 'Suggests' for cairo-dock-plug-ins-integration
+      (Used for managing files)
+   - Removed 'libthunar-vfs-1-dev' (libthunar-vfs is no longer installed
+      by default since XFCE 4.8 and it is replaced by gvfs)
+   - Removed 'indicator-me' (no longer available
+      and the installation of Cairo-Dock produces an error)
+   - Moved 'indicator-messages' to 'Recommends'
+  * debian/rules:
+   - Updated the name of CMake extras flags
+  * debian/cairo-dock-plug-ins-data.lintian-overrides:
+   - Deleted (now useless)
+  * debian/cairo-dock-plug-ins.lintian-overrides:
+   - Cairo-Dock Plug-Ins are not linked to gldi
+   - shlib-without-versioned-soname: forwarded to upstream.
+  * debian/cairo-dock-plug-ins-integration.lintian-overrides:
+   - Cairo-Dock Plug-Ins are not linked to gldi
+   - ldconfig and shlibs are not needed
+  * debian/cairo-dock-plug-ins.install:
+   - Fixed lintian errors: package-installs-python-bytecode
+  * debian/control: Fixed lintian warnings:
+   - python-script-but-no-python-dep
+   - description-synopsis-starts-with-article
+  * debian/changelog:
+   - Fixed lintian warning: old-fsf-address-in-copyright-file
+  * debian/patches/01-switcher-force-compact-view.patch: 
+   - Forced the compact view because the other doesn't work
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Sun, 09 Oct 2011 00:19:16 +0200
+
 cairo-dock-plug-ins (2.4.0~0beta2-0ubuntu1) oneiric; urgency=low
 
   * New upstream release. (LP: #823514)
 
=== modified file 'debian/control'
--- debian/control	2011-08-09 19:51:45 +0000
+++ debian/control	2011-10-08 22:23:24 +0000
@@ -14,16 +14,15 @@
 		libxml2-dev,
 		libxtst-dev,
 		libglib2.0-dev (>= 2.20),
-		cairo-dock-data (>= 2.4.0~0beta2),
-		cairo-dock-core (>= 2.4.0~0beta2),
-		cairo-dock-dev (>= 2.4.0~0beta2),
+		cairo-dock-data (>= 2.4.0~1),
+		cairo-dock-core (>= 2.4.0~1),
+		cairo-dock-dev (>= 2.4.0~1),
 		libasound2-dev,
 		libvte-dev,
 		x11proto-xf86vidmode-dev,
 		libgnome-menu-dev,
 		libgnomevfs2-dev,
 		libgnomeui-dev,
-		libthunar-vfs-1-dev,
 		libgnome-keyring-dev,
 		libgnutls-dev,
 		libwebkitgtk-dev,
@@ -60,6 +59,7 @@
 Depends: 	cairo-dock-plug-ins-data (>= ${source:Version}),
 		cairo-dock-core (>= 2.0.8.0),
 		${misc:Depends}
+Suggests:	gvfs
 Description: Two plug-ins for cairo-dock for a better integration in GNOME or Xfce
  Cairo-dock-plug-ins is a set of plug-ins for Cairo-dock. It provides some new 
  functionnalities like controling music players or note-taking, a clock or a
@@ -76,13 +76,13 @@
 		cairo-dock-core (>= 2.0.8.0),
 		curl,
 		wget,
+		python,
 		${shlibs:Depends}, 
 		${misc:Depends}
 Suggests:	compiz,
-		gnote
-Recommends:	indicator-messages,
-		indicator-me
-Description: A set of plug-ins for cairo-dock
+		gnote,
+		indicator-messages
+Description: Set of plug-ins for cairo-dock
  Cairo-dock-plug-ins is a set of plug-ins for Cairo-dock. It provides some new 
  functionnalities like controling music players or note-taking, a clock or a
  desktop switcher but also some views, dialogs and desklets skins, etc.
 
=== modified file 'debian/copyright'
--- debian/copyright	2011-08-09 19:51:45 +0000
+++ debian/copyright	2011-10-08 22:23:24 +0000
@@ -18,8 +18,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
 
 Files: 	systray/src/cd-tray.h
 	systray/src/systray-config.*
@@ -40,7 +40,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
 
 Files: 	terminal/*
 Copyright: 2007, 2008 GESTES Cedric and Fabrice Rey
@@ -188,4 +189,5 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
 
=== added file 'debian/patches/01-switcher-force-compact-view.patch'
--- debian/patches/01-switcher-force-compact-view.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01-switcher-force-compact-view.patch	2011-10-08 22:23:24 +0000
@@ -0,0 +1,34 @@
+## From: Matthieu Baerts (matttbe) <[e-mail]>
+## Description: Forced the compact view because the other doesn't work
+## Forwarded: yes
+Index: cairo-dock-plug-ins/switcher/src/applet-config.c
+===================================================================
+--- cairo-dock-plug-ins.orig/switcher/src/applet-config.c	2011-10-08 23:26:53.222924952 +0200
++++ cairo-dock-plug-ins/switcher/src/applet-config.c	2011-10-08 23:26:53.306924951 +0200
+@@ -26,7 +26,7 @@
+ 
+ CD_APPLET_GET_CONFIG_BEGIN
+ 	//\_________________ On recupere toutes les valeurs de notre fichier de conf.
+-	myConfig.bCompactView = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Vue Simple", TRUE);
++	myConfig.bCompactView = TRUE; // CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Vue Simple", TRUE);
+ 	myConfig.bPreserveScreenRatio = CD_CONFIG_GET_BOOLEAN ("Configuration", "preserve ratio");
+ 	myConfig.bMapWallpaper = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "Map Wallpaper", TRUE);
+ 	myConfig.bDisplayNumDesk = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Configuration", "display numero desktop", TRUE);
+Index: cairo-dock-plug-ins/.bzr/checkout/dirstate
+===================================================================
+Binary files cairo-dock-plug-ins.orig/.bzr/checkout/dirstate	2011-10-08 23:28:01.502925141 +0200 and cairo-dock-plug-ins/.bzr/checkout/dirstate	2011-10-08 23:27:09.198924995 +0200 differ
+Index: cairo-dock-plug-ins/switcher/data/switcher.conf.in
+===================================================================
+--- cairo-dock-plug-ins.orig/switcher/data/switcher.conf.in	2011-10-08 23:28:00.542925138 +0200
++++ cairo-dock-plug-ins/switcher/data/switcher.conf.in	2011-10-08 23:27:55.810925124 +0200
+@@ -101,10 +101,6 @@
+ #F[Configuration]
+ frame_conf =
+ 
+-#B Use the compact mode?
+-#{All desktops will be drawn on the main icon. Otherwise a sub-dock will contain all desktops.}
+-Vue Simple = true
+-
+ #b Preserve the ratio of the screen ?
+ preserve ratio = true
+ 
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-10-08 22:23:24 +0000
@@ -0,0 +1,1 @@
+01-switcher-force-compact-view.patch
 
=== modified file 'debian/rules'
--- debian/rules	2011-04-20 20:46:51 +0000
+++ debian/rules	2011-10-08 22:23:24 +0000
@@ -3,10 +3,10 @@
 
 DH_ALWAYS_EXCLUDE=CVS:.bzr
 
-DEB_CMAKE_EXTRA_FLAGS += -Denable_gnome_integration=yes \
-	-Denable_old_gnome_integration=no \
-	-Denable_kde_integration=yes \
-	-Denable_xfce_integration=yes \
+DEB_CMAKE_EXTRA_FLAGS += -Denable-gnome-integration=yes \
+	-Denable-old-gnome-integration=no \
+	-Denable-kde-integration=yes \
+	-Denable-xfce-integration=yes \
 	-DROOT_PREFIX=$(CURDIR)/debian/tmp
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
=== modified file 'desklet-rendering/src/rendering-desklet-panel.c'
--- desklet-rendering/src/rendering-desklet-panel.c	2011-08-09 18:08:08 +0000
+++ desklet-rendering/src/rendering-desklet-panel.c	2011-10-08 22:23:24 +0000
@@ -62,7 +62,7 @@
 	double w = pDesklet->container.iWidth - 2 * pPanel->fMargin;
 	double h = pDesklet->container.iHeight - 2 * pPanel->fMargin;
 	pPanel->iMainIconSize = MIN (w, h) / 3;
-	g_print ("  desklet: %dx%d\n", (int)w, (int)h);
+	cd_debug ("  desklet: %dx%d", (int)w, (int)h);
 	
 	int iNbIcons = 0;
 	Icon *pIcon;
@@ -90,7 +90,7 @@
 		{
 			q = (int) ceil ((double)pPanel->iNbIcons / p);
 			iSize = MIN ((h - p * dy) / p - dh, ((w - (q - 1) * dx) / q - dw) / 2);
-			g_print ("  %dx%d -> %d\n", p, q, iSize);
+			cd_debug ("  %dx%d -> %d", p, q, iSize);
 			if (iSize > pPanel->iIconSize)
 			{
 				pPanel->iIconSize = iSize;
@@ -107,7 +107,7 @@
 		pPanel->iIconSize = MIN ((h - p * dy) / p - dh, ((w - (q - 1) * dx) / q - dw) / 2);
 	}
 	pPanel->iIconSize = MIN (pPanel->iIconSize, pPanel->iMainIconSize);
-	g_print (" panel desklet: %dx%d, %d\n", pPanel->iNbLines, pPanel->iNbColumns, pPanel->iIconSize);
+	cd_debug (" panel desklet: %dx%d, %d", pPanel->iNbLines, pPanel->iNbColumns, pPanel->iIconSize);
 	
 	if ((h - pPanel->iNbLines * (pPanel->iIconSize + dh)) / pPanel->iNbLines > dy)
 	{
 
=== modified file 'dnd2share/data/dnd2share.conf.in'
--- dnd2share/data/dnd2share.conf.in	2011-08-09 18:08:08 +0000
+++ dnd2share/data/dnd2share.conf.in	2011-10-08 22:23:24 +0000
@@ -55,7 +55,7 @@
 #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)}
+#{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
 
=== modified file 'dnd2share/src/applet-dnd2share.c'
--- dnd2share/src/applet-dnd2share.c	2011-04-20 20:46:51 +0000
+++ dnd2share/src/applet-dnd2share.c	2011-10-08 22:23:24 +0000
@@ -416,7 +416,7 @@
 	
 	if (myConfig.bDisplayLastImage)
 	{
-		CD_APPLET_SET_LOCAL_IMAGE_ON_MY_ICON (MY_APPLET_ICON_FILE);
+		CD_APPLET_SET_IMAGE_ON_MY_ICON (MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE);
 	}
 }
 
 
=== modified file 'dnd2share/src/applet-notifications.c'
--- dnd2share/src/applet-notifications.c	2011-08-09 18:08:08 +0000
+++ dnd2share/src/applet-notifications.c	2011-10-08 22:23:24 +0000
@@ -314,7 +314,7 @@
 
 
 CD_APPLET_ON_DROP_DATA_BEGIN
-	g_print  ("DND2SHARE : drop de '%s'\n", CD_APPLET_RECEIVED_DATA);
+	cd_debug  ("DND2SHARE : drop de '%s'", CD_APPLET_RECEIVED_DATA);
 	_on_drop_data (CD_APPLET_RECEIVED_DATA);
 CD_APPLET_ON_DROP_DATA_END
 
@@ -403,19 +403,18 @@
 	
 	CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Send the clipboard's content"), GTK_STOCK_PASTE, _send_clipboard, CD_APPLET_MY_MENU);
 	
-	GtkWidget *pHistoryMenu = gtk_menu_new ();
+	GtkWidget *pHistoryMenu = gtk_menu_new ();  // we don't use CD_APPLET_ADD_SUB_MENU_WITH_IMAGE, because we want to be able to set the menu-item unsensitive.
 	GtkWidget *mi = gtk_image_menu_item_new_with_label (D_("History"));
-	
+
 	GtkWidget *im = gtk_image_new_from_stock (GTK_STOCK_INDEX, GTK_ICON_SIZE_MENU);
-#if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
+	#if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
 	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (mi), TRUE);
-#endif
+	#endif
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), im);
-	
+
 	gtk_menu_shell_append (GTK_MENU_SHELL (CD_APPLET_MY_MENU), mi); 
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (mi), pHistoryMenu);
 	
-	//GtkWidget *pHistoryMenu = CD_APPLET_ADD_SUB_MENU_WITH_IMAGE (D_("History"), CD_APPLET_MY_MENU, GTK_STOCK_INDEX);
 	if (myData.pUpoadedItems != NULL)
 	{
 		CDSiteBackend *pBackend;
@@ -453,7 +452,10 @@
 			}
 			if (cPreview == NULL)
 			{
-				cairo_dock_fm_get_file_info (pItem->cLocalPath, &cName, &cURI, &cPreview, &bIsDirectory, &iVolumeID, &fOrder, 0);
+				gchar *cIconName = NULL;
+				cairo_dock_fm_get_file_info (pItem->cLocalPath, &cName, &cURI, &cIconName, &bIsDirectory, &iVolumeID, &fOrder, 0);
+				cPreview = cairo_dock_search_icon_s_path (cIconName);
+				g_free (cIconName);
 				g_free (cName);
 				cName = NULL;
 				g_free (cURI);
@@ -491,7 +493,7 @@
 	else
 		gtk_widget_set_sensitive (GTK_WIDGET (mi), FALSE);
 
-	pMenuItem = gtk_check_menu_item_new_with_label (_("Use only a files hosting site"));
+	pMenuItem = gtk_check_menu_item_new_with_label (D_("Use only a files hosting site"));
 	gtk_menu_shell_append (GTK_MENU_SHELL (CD_APPLET_MY_MENU), pMenuItem);
 	if (myConfig.bUseOnlyFileType)
 		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (pMenuItem), TRUE);
 
=== modified file 'dock-rendering/src/rendering-diapo-simple.c'
--- dock-rendering/src/rendering-diapo-simple.c	2011-08-09 18:08:08 +0000
+++ dock-rendering/src/rendering-diapo-simple.c	2011-10-08 22:23:24 +0000
@@ -81,10 +81,6 @@
 	*gridX = index % nRowsX;
 	*gridY = index / nRowsX;
 }
-static inline guint _get_index_from_gridXY (guint nRowsX, guint gridX, guint gridY)
-{
-	return gridX + gridY * nRowsX;
-}
 
 static guint _cd_rendering_diapo_simple_guess_grid (GList *pIconList, guint *nRowX, guint *nRowY)
 {
@@ -820,12 +816,13 @@
 	int iOffsetY;
 	if (pDock->container.bDirectionUp)
 		iOffsetY = .5 * pDock->iMaxIconHeight * pDock->container.fRatio * (my_diapo_simple_fScaleMax - 1) +  // les icones de la 1ere ligne zooment
-			myIconsParam.iLabelSize +  // le texte des icones de la 1ere ligne
+			(pDock->container.bIsHorizontal ? myIconsParam.iLabelSize : .5*myIconsParam.iLabelSize) +  // le texte des icones de la 1ere ligne
 			.5 * my_diapo_simple_lineWidth +  // demi-ligne du haut;
 			fScrollOffset;
 	else
 		iOffsetY = .5 * pDock->iMaxIconHeight * pDock->container.fRatio * (my_diapo_simple_fScaleMax - 1) +  // les icones de la 1ere ligne zooment
 				.5 * my_diapo_simple_lineWidth +  // demi-ligne du bas;
+				(pDock->container.bIsHorizontal ? 0 : myIconsParam.iLabelSize/2) +
 				fScrollOffset;
 	double fFoldingX = (pDock->fFoldingFactor > .2 ? (pDock->fFoldingFactor - .2) / .8 : 0.);  // placement de 1 a 0.2
 	double fFoldingY = (pDock->fFoldingFactor > .5 ? (pDock->fFoldingFactor - .5) / .5 : 0.);  // placement de 1 a 0.5
 
=== modified file 'dock-rendering/src/rendering-rainbow.c'
--- dock-rendering/src/rendering-rainbow.c	2011-08-09 18:08:08 +0000
+++ dock-rendering/src/rendering-rainbow.c	2011-10-08 22:23:24 +0000
@@ -314,7 +314,7 @@
 		x_abs = fFlatDockWidth+1;
 	
 	float x_cumulated = 0, fXMiddle, fDeltaExtremum;
-	double fPhase, fScale, fX;
+	double fPhase, fX, fScale = 0.0;
 	int iNumRow, iPointedRow=-1;
 	for (iNumRow = 0; iNumRow < iNbRows; iNumRow ++)
 	{
 
=== removed file 'dock-rendering/toto'
--- dock-rendering/toto	2010-08-10 00:05:57 +0000
+++ dock-rendering/toto	1970-01-01 00:00:00 +0000
@@ -1,217 +0,0 @@
-message :  (cairo-dock.c:main:427)  
-  Compiled with Glitz (hardware acceleration support)n
-message :  (cairo-dock-dock-manager.c:cairo_dock_initialize_dock_manager:59)  
-  
-message :  (cairo-dock-renderer-manager.c:cairo_dock_initialize_renderer_manager:135)  
-  
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57)  
-  cairo_dock_register_renderer (default)
-message :  (cairo-dock.c:main:506)  
-  environnement de bureau : 2
-message :  (cairo-dock-modules.c:cairo_dock_preload_module_from_directory:268)  
-  cairo_dock_preload_module_from_directory (/users/m340689/usr/lib/cairo-dock)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77)  
-  cairo_dock_register_desklet_renderer (Tree)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77)  
-  cairo_dock_register_desklet_renderer (Caroussel)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77)  
-  cairo_dock_register_desklet_renderer (Simple)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77)  
-  cairo_dock_register_desklet_renderer (Controler)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77)  
-  cairo_dock_register_desklet_renderer (Mediaplayer)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_dialog_renderer:122)  
-  cairo_dock_register_dialog_renderer (Text)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159)  
-  cairo_dock_set_renderer ((null))
-message :  (cairo-dock-keyfile-utilities.c:cairo_dock_write_keys_to_file:18)  
-  cairo_dock_write_keys_to_file (/users/m340689/.cairo-dock/current_theme/cairo-dock.conf)
-message :  (cairo-dock-dock-manager.c:cairo_dock_deactivate_temporary_auto_hide:485)  
-  
-message :  (cairo-dock-config.c:cairo_dock_read_conf_file:683)  
-  g_cMainDockDefaultRendererName <- default
-warning :  (cairo-dock-config.c:cairo_dock_read_conf_file:1121)  
-  Sorry but your X server does not support the extension.
- You can't have window thumbnails in the dock
-message :  (cairo-dock-dock-factory.c:cairo_dock_build_docks_tree_with_desktop_files:558)  
-  cairo_dock_build_docks_tree_with_desktop_files (/users/m340689/.cairo-dock/current_theme/launchers)
-message :  (cairo-dock-launcher-factory.c:cairo_dock_load_icon_info_from_desktop_file:367)  
-  no class defined for the launcher 01BitTorrent.desktop
- we will assume that its class is 'transmission-gtk'
-message :  (cairo-dock-launcher-factory.c:cairo_dock_create_icon_from_desktop_file:402)  
-  + BitTorrent/transmission-gtk
-message :  (cairo-dock-class-manager.c:cairo_dock_inhibate_class:254)  
-  cairo_dock_inhibate_class (transmission-gtk)
-message :  (cairo-dock-launcher-factory.c:cairo_dock_load_icon_info_from_desktop_file:367)  
-  no class defined for the launcher 01bmp.desktop
- we will assume that its class is 'beep-media-player'
-message :  (cairo-dock-launcher-factory.c:cairo_dock_create_icon_from_desktop_file:402)  
-  + Musique/beep-media-player
-message :  (cairo-dock-class-manager.c:cairo_dock_inhibate_class:254)  
-  cairo_dock_inhibate_class (beep-media-player)
-message :  (cairo-dock-launcher-factory.c:cairo_dock_create_icon_from_desktop_file:402)  
-  + Navigateur Web Firefox/firefox
-message :  (cairo-dock-class-manager.c:cairo_dock_inhibate_class:254)  
-  cairo_dock_inhibate_class (firefox)
-message :  (cairo-dock-launcher-factory.c:cairo_dock_load_icon_info_from_desktop_file:367)  
-  no class defined for the launcher 01gnome-terminal.desktop
- we will assume that its class is 'gnome-terminal'
-message :  (cairo-dock-launcher-factory.c:cairo_dock_create_icon_from_desktop_file:402)  
-  + Console/gnome-terminal
-message :  (cairo-dock-class-manager.c:cairo_dock_inhibate_class:254)  
-  cairo_dock_inhibate_class (gnome-terminal)
-message :  (cairo-dock-launcher-factory.c:cairo_dock_load_icon_info_from_desktop_file:367)  
-  no class defined for the launcher 01nautilus.desktop
- we will assume that its class is 'nautilus'
-message :  (cairo-dock-launcher-factory.c:cairo_dock_create_icon_from_desktop_file:402)  
-  + Fichiers/nautilus
-message :  (cairo-dock-class-manager.c:cairo_dock_inhibate_class:254)  
-  cairo_dock_inhibate_class (nautilus)
-message :  (cairo-dock-launcher-factory.c:cairo_dock_create_icon_from_desktop_file:402)  
-  + Courrier/thunderbird-bin
-message :  (cairo-dock-class-manager.c:cairo_dock_inhibate_class:254)  
-  cairo_dock_inhibate_class (thunderbird-bin)
-message :  (cairo-dock-application-factory.c:cairo_dock_create_icon_from_xwindow:417)  
-  recuperation de 'm340689 on mulx0202: /users/m340689/plug-ins/rendering - modules - Konsole' (bIsHidden : 0)
-message :  (cairo-dock-class-manager.c:cairo_dock_add_appli_to_class:193)  
-  cairo_dock_add_appli_to_class (konsole)
-message :  (cairo-dock-applications-manager.c:cairo_dock_insert_appli_in_dock:1115)  
-  cairo_dock_insert_appli_in_dock (m340689 on mulx0202: /users/m340689/plug-ins/rendering - modules - Konsole, 71303176)
-message :  (cairo-dock-class-manager.c:cairo_dock_prevent_inhibated_class:303)  
-  
-message :  (cairo-dock-application-factory.c:cairo_dock_manage_appli_class:236)  
-  cairo_dock_manage_appli_class (m340689 on mulx0202: /users/m340689/plug-ins/rendering - modules - Konsole)
-message :  (cairo-dock-dock-factory.c:cairo_dock_insert_icon_in_dock_full:705)  
-  separateur necessaire
-message :  (cairo-dock-dock-factory.c:cairo_dock_insert_icon_in_dock_full:752)  
-   insertion de m340689 on mulx0202: /users/m340689/plug-ins/rendering - modules - Konsole -> iSeparatorType : 3
-message :  (cairo-dock-applications-manager.c:cairo_dock_insert_appli_in_dock:1126)  
-   insertion de m340689 on mulx0202: /users/m340689/plug-ins/rendering - modules - Konsole complete (0,00 48,00x48,00) dans _MainDock_
-message :  (cairo-dock-application-factory.c:cairo_dock_create_icon_from_xwindow:417)  
-  recuperation de 'rendering-diapo-simple.c - Kate' (bIsHidden : 0)
-Impossible de trouver l'icône « kate ». Le thème « hicolor »
-n'a pas non plus été trouvé. Peut-être avez-vous besoin de
-l'installer. Vous pouvez obtenir une copie à :
-	http://icon-theme.freedesktop.org/releases
-message :  (cairo-dock-class-manager.c:cairo_dock_add_appli_to_class:193)  
-  cairo_dock_add_appli_to_class (kate)
-message :  (cairo-dock-applications-manager.c:cairo_dock_insert_appli_in_dock:1115)  
-  cairo_dock_insert_appli_in_dock (rendering-diapo-simple.c - Kate, 79691791)
-message :  (cairo-dock-class-manager.c:cairo_dock_prevent_inhibated_class:303)  
-  
-message :  (cairo-dock-application-factory.c:cairo_dock_manage_appli_class:236)  
-  cairo_dock_manage_appli_class (rendering-diapo-simple.c - Kate)
-message :  (cairo-dock-applications-manager.c:cairo_dock_insert_appli_in_dock:1126)  
-   insertion de rendering-diapo-simple.c - Kate complete (0,00 48,00x48,00) dans _MainDock_
-message :  (cairo-dock-modules.c:cairo_dock_activate_module:453)  
-  cairo_dock_activate_module (clock)
-cairo_dock_instanciate_module (/users/m340689/.cairo-dock/current_theme/plug-ins/clock/clock.conf)
-  ce module est une applet
-message :  (cairo-dock-applet-factory.c:cairo_dock_create_applet_surface:31)  
-  cairo_dock_create_applet_surface (48,00x48,00 x 2,00 / 1)
-message :  (cairo-dock-applet-factory.c:cairo_dock_create_applet_surface:40)  
-   -> 48,00x48,00 x 2,00
-cairo_dock_read_module_config (40f0b480)
-message :  (cairo-dock-keyfile-utilities.c:cairo_dock_write_keys_to_file:18)  
-  cairo_dock_write_keys_to_file (/users/m340689/.cairo-dock/current_theme/plug-ins/clock/clock.conf)
-message :  (applet-init.c:init:81)  
-  init (/users/m340689/.cairo-dock/current_theme/plug-ins/clock/clock.conf)
-
-message :  (applet-init.c:_load_theme:39)  
-  _load_theme (/users/m340689/usr/share/cairo-dock/plug-ins/clock/themes/silvia)
-message :  (cairo-dock-dock-factory.c:cairo_dock_insert_icon_in_dock_full:705)  
-  separateur necessaire
-message :  (cairo-dock-dock-factory.c:cairo_dock_insert_icon_in_dock_full:752)  
-   insertion de Poland -> iSeparatorType : 1
-message :  (cairo-dock-modules.c:cairo_dock_activate_module:453)  
-  cairo_dock_activate_module (rendering)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77)  
-  cairo_dock_register_desklet_renderer (Tree)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77)  
-  cairo_dock_register_desklet_renderer (Caroussel)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77)  
-  cairo_dock_register_desklet_renderer (Simple)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77)  
-  cairo_dock_register_desklet_renderer (Controler)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_desklet_renderer:77)  
-  cairo_dock_register_desklet_renderer (Mediaplayer)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_dialog_renderer:122)  
-  cairo_dock_register_dialog_renderer (Text)
-cairo_dock_instanciate_module (/users/m340689/.cairo-dock/current_theme/plug-ins/rendering/rendering.conf)
-  ce module est un plug-in
-cairo_dock_read_module_config (40f50ba0)
-message :  (rendering-init.c:init:120)  
-  init (/users/m340689/.cairo-dock/current_theme/plug-ins/rendering/rendering.conf)
-
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57)  
-  cairo_dock_register_renderer (Caroussel)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57)  
-  cairo_dock_register_renderer (3D plane)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57)  
-  cairo_dock_register_renderer (Parabolic)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57)  
-  cairo_dock_register_renderer (Rainbow)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57)  
-  cairo_dock_register_renderer (Slide)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57)  
-  cairo_dock_register_renderer (SimpleSlide)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_register_renderer:57)  
-  cairo_dock_register_renderer (Curve)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159)  
-  cairo_dock_set_renderer ((null))
-message :  (cairo-dock-modules.c:cairo_dock_activate_module:453)  
-  cairo_dock_activate_module (switcher)
-cairo_dock_instanciate_module (/users/m340689/.cairo-dock/current_theme/plug-ins/switcher/switcher.conf)
-  ce module est une applet
-message :  (cairo-dock-applet-factory.c:cairo_dock_create_applet_surface:31)  
-  cairo_dock_create_applet_surface (32,00x32,00 x 2,00 / 1)
-message :  (cairo-dock-applet-factory.c:cairo_dock_create_applet_surface:40)  
-   -> 48,00x48,00 x 2,00
-cairo_dock_read_module_config (40f26450)
-myConfig.bCompactView:0
-message :  (applet-init.c:init:83)  
-  init (/users/m340689/.cairo-dock/current_theme/plug-ins/switcher/switcher.conf)
-
-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159)  
-  cairo_dock_set_renderer ((null))
-message :  (cairo-dock-applications-manager.c:cairo_dock_update_applis_list:1203)  
-   cette fenetre (88080409) de la pile n'est pas dans la liste
-cd_switcher_draw_main_icon (0)
-message :  (cairo-dock-load.c:cairo_dock_load_desktop_background_surface:856)  
-  c'est un fond d'ecran de taille 1024x742
-message :  (cairo-dock-dock-factory.c:cairo_dock_reference_dock:476)  
-  position : 1/1
-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159)  
-  cairo_dock_set_renderer ((null))
-message :  (cairo-dock-load.c:cairo_dock_reload_buffers_in_dock:502)  
-  cairo_dock_reload_buffers_in_dock ((null), 1)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159)  
-  cairo_dock_set_renderer (SimpleSlide)
-cd_switcher_draw_main_icon (0)
- (0,00; 0,00) 38,40x38,40
- (0,00; 0,00) 38,40x38,40
- (0,00; 0,00) 38,40x38,40
- (0,00; 0,00) 38,40x38,40
-cd_switcher_draw_main_icon (0)
-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159)  
-  cairo_dock_set_renderer ((null))
-message :  (cairo-dock-renderer-manager.c:cairo_dock_set_renderer:159)  
-  cairo_dock_set_renderer (SimpleSlide)
-message :  (cairo-dock-dock-manager.c:cairo_dock_search_max_decorations_size:193)  
-    decorations max : 761x52
-message :  (cairo-dock-keyfile-utilities.c:cairo_dock_write_keys_to_file:18)  
-  cairo_dock_write_keys_to_file (/users/m340689/.cairo-dock/current_theme/cairo-dock_easy.conf)
-message :  (cairo-dock-keyfile-utilities.c:cairo_dock_write_keys_to_file:18)  
-  cairo_dock_write_keys_to_file (/users/m340689/.cairo-dock/current_theme/cairo-dock_easy.conf)
-cd_switcher_draw_main_icon (0)
-message :  (cairo-dock-dock-manager.c:cairo_dock_stop_quick_hide:494)  
-  
-message :  (cairo-dock-dock-manager.c:cairo_dock_stop_quick_hide:494)  
-  
-cd_switcher_draw_main_icon (0)
-message :  (cairo-dock-dock-manager.c:cairo_dock_stop_quick_hide:494)  
-  
-message :  (cairo-dock-dock-manager.c:cairo_dock_hide_child_docks:250)  
-  on est dans le sous-dock, donc on ne le cache pas
-message :  (cairo-dock-dock-manager.c:cairo_dock_hide_child_docks:250)  
-  on est dans le sous-dock, donc on ne le cache pas
 
=== modified file 'dustbin/data/dustbin.conf.in'
--- dustbin/data/dustbin.conf.in	2011-08-09 18:08:08 +0000
+++ dustbin/data/dustbin.conf.in	2011-10-08 22:23:24 +0000
@@ -57,7 +57,7 @@
 #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)}
+#{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
 
=== modified file 'dustbin/data/themes/CMakeLists.txt'
--- dustbin/data/themes/CMakeLists.txt	2010-08-10 00:05:57 +0000
+++ dustbin/data/themes/CMakeLists.txt	2011-10-08 22:23:24 +0000
@@ -1,12 +1,1 @@
 add_subdirectory(default)
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = \
-#	default
 
=== modified file 'dustbin/src/applet-init.c'
--- dustbin/src/applet-init.c	2010-09-07 02:38:17 +0000
+++ dustbin/src/applet-init.c	2011-10-08 22:23:24 +0000
@@ -37,6 +37,7 @@
 
 static void _get_theme (void)
 {
+	// get the user images first, as they overwrite the theme.
 	if (myConfig.cEmptyUserImage != NULL)
 	{
 		gchar *cPath = cairo_dock_search_icon_s_path (myConfig.cEmptyUserImage);
@@ -57,6 +58,7 @@
 		}
                 g_free (cPath);
 	}
+	// if a theme is defined, and user images are not defined, use the theme.
 	if (myConfig.cThemePath != NULL)
 	{
 		if (myConfig.cEmptyUserImage == NULL)
@@ -66,11 +68,11 @@
 			{
 				g_free (myConfig.cEmptyUserImage);
 				myConfig.cEmptyUserImage = g_strdup_printf ("%s/%s", myConfig.cThemePath, "trashcan_empty.png");
-				if (! g_file_test (myConfig.cEmptyUserImage, G_FILE_TEST_EXISTS))
+				if (! g_file_test (myConfig.cEmptyUserImage, G_FILE_TEST_EXISTS))  // no svg nor png, use the default theme.
 				{
 					g_free (myConfig.cEmptyUserImage);
-					myConfig.cEmptyUserImage = NULL;
-					cd_warning ("dustbin : couldn't find an image for empty dustbin, check the existence of the files in %s", myConfig.cThemePath);
+					myConfig.cEmptyUserImage = g_strdup (MY_APPLET_SHARE_DATA_DIR"/themes/default/trashcan_empty.svg");
+					cd_warning ("using the default theme for Dustbin, as neither the user image (%s) nor the theme (%s) are valid", myConfig.cEmptyUserImage, myConfig.cThemePath);
 				}
 			}
 		}
@@ -84,8 +86,8 @@
 				if (! g_file_test (myConfig.cFullUserImage, G_FILE_TEST_EXISTS))
 				{
 					g_free (myConfig.cFullUserImage);
-					myConfig.cFullUserImage = NULL;
-					cd_warning ("dustbin : couldn't find an image for full dustbin, check the existence of the files in %s", myConfig.cThemePath);
+					myConfig.cFullUserImage = g_strdup (MY_APPLET_SHARE_DATA_DIR"/themes/default/trashcan_full.svg");
+					cd_warning ("using the default theme for Dustbin, as neither the user image (%s) nor the theme (%s) are valid", myConfig.cFullUserImage, myConfig.cThemePath);
 				}
 			}
 		}
 
=== modified file 'dustbin/src/applet-trashes-manager.c'
--- dustbin/src/applet-trashes-manager.c	2011-04-20 20:46:51 +0000
+++ dustbin/src/applet-trashes-manager.c	2011-10-08 22:23:24 +0000
@@ -65,11 +65,11 @@
 		
 		if (myConfig.iQuickInfoType == CD_DUSTBIN_INFO_NB_TRASHES)
 		{
-			CD_APPLET_SET_QUICK_INFO_ON_MY_ICON_PRINTF ("%d%s", myData.iMeasure, (myDesklet ? D_(" trashe(s)") : ""));
+			CD_APPLET_SET_QUICK_INFO_ON_MY_ICON_PRINTF ("%ld%s", myData.iMeasure, (myDesklet ? D_(" trashe(s)") : ""));
 		}
 		else if (myConfig.iQuickInfoType == CD_DUSTBIN_INFO_NB_FILES)
 		{
-			CD_APPLET_SET_QUICK_INFO_ON_MY_ICON_PRINTF ("%d%s", myData.iMeasure, (myDesklet ? D_(" file(s)") : ""));
+			CD_APPLET_SET_QUICK_INFO_ON_MY_ICON_PRINTF ("%ld%s", myData.iMeasure, (myDesklet ? D_(" file(s)") : ""));
 		}
 		else if (myConfig.iQuickInfoType == CD_DUSTBIN_INFO_WEIGHT)
 		{
 
=== modified file 'gvfs-integration/cairo-dock-gio-vfs.c'
--- gvfs-integration/cairo-dock-gio-vfs.c	2011-08-09 18:08:08 +0000
+++ gvfs-integration/cairo-dock-gio-vfs.c	2011-10-08 22:23:24 +0000
@@ -91,7 +91,14 @@
 		for (i = 0; cFileNames[i] != NULL && cIconPath == NULL; i ++)
 		{
 			//g_print (" une icone possible est : %s\n", cFileNames[i]);
-			cIconPath = cairo_dock_search_icon_s_path (cFileNames[i]);
+			
+			gchar *path = cairo_dock_search_icon_s_path (cFileNames[i]);
+			if (path)
+			{
+				g_free (path);
+				cIconPath = g_strdup (cFileNames[i]);
+			}
+			
 			//g_print ("  chemin trouve : %s\n", cIconPath);
 		}
 	}
@@ -319,13 +326,26 @@
 		cd_message ("cVolumeName : %s", cVolumeName);
 		
 		GMount *pMount = NULL;
-		_cd_find_mount_from_volume_name (cVolumeName, &pMount, cURI, cIconName);
+		gchar *uri=NULL, *iconname=NULL;
+		_cd_find_mount_from_volume_name (cVolumeName, &pMount, &uri, &iconname);
 		g_return_if_fail (pMount != NULL);
 		
-		*cName = g_strdup (cVolumeName);
-		*bIsDirectory = TRUE;
-		*iVolumeID = 1;
-		*fOrder = 0;
+		if (cURI)
+			*cURI = uri;
+		else
+			g_free (uri);
+		if (cIconName)
+			*cIconName = iconname;
+		else
+			g_free (iconname);
+		if (cName)
+			*cName = g_strdup (cVolumeName);
+		if (bIsDirectory)
+			*bIsDirectory = TRUE;
+		if (iVolumeID)
+			*iVolumeID = 1;
+		if (fOrder)
+			*fOrder = 0;
 		//g_object_unref (pMount);
 		
 		g_free (cValidUri);
@@ -367,7 +387,6 @@
 		G_FILE_QUERY_INFO_NONE,  /// G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS
 		NULL,
 		&erreur);
-	//g_object_unref (pFile);
 	if (erreur != NULL)  // peut arriver si l'emplacement n'est pas monte.
 	{
 		cd_debug ("gvfs-integration : %s", erreur->message);  // inutile d'en faire un warning.
@@ -380,135 +399,155 @@
 	const gchar *cFileName = g_file_info_get_name (pFileInfo);
 	const gchar *cMimeType = g_file_info_get_content_type (pFileInfo);
 	GFileType iFileType = g_file_info_get_file_type (pFileInfo);
-	
-	if (iSortType == CAIRO_DOCK_FM_SORT_BY_DATE)
-	{
-		GTimeVal t;
-		g_file_info_get_modification_time (pFileInfo, &t);
-		*fOrder = t.tv_sec;
-	}
-	else if (iSortType == CAIRO_DOCK_FM_SORT_BY_ACCESS)
-		*fOrder =  g_file_info_get_attribute_uint64 (pFileInfo, G_FILE_ATTRIBUTE_TIME_ACCESS);
-	else if (iSortType == CAIRO_DOCK_FM_SORT_BY_SIZE)
-		*fOrder = g_file_info_get_size (pFileInfo);
-	else if (iSortType == CAIRO_DOCK_FM_SORT_BY_TYPE)
-		*fOrder = (cMimeType != NULL ? *((int *) cMimeType) : 0);
-	else
-		*fOrder = 0;
-	
-	*bIsDirectory = (iFileType == G_FILE_TYPE_DIRECTORY);
-	cd_message (" => '%s' (mime:%s ; bIsDirectory:%d)", cFileName, cMimeType, *bIsDirectory);
-	
 	const gchar *cTargetURI = g_file_info_get_attribute_string (pFileInfo, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
 	
-	// if it's a mount point, find a readable name.
+	// find the order of the file
+	if (fOrder)
+	{
+		if (iSortType == CAIRO_DOCK_FM_SORT_BY_DATE)
+		{
+			GTimeVal t;
+			g_file_info_get_modification_time (pFileInfo, &t);
+			*fOrder = t.tv_sec;
+		}
+		else if (iSortType == CAIRO_DOCK_FM_SORT_BY_ACCESS)
+			*fOrder =  g_file_info_get_attribute_uint64 (pFileInfo, G_FILE_ATTRIBUTE_TIME_ACCESS);
+		else if (iSortType == CAIRO_DOCK_FM_SORT_BY_SIZE)
+			*fOrder = g_file_info_get_size (pFileInfo);
+		else if (iSortType == CAIRO_DOCK_FM_SORT_BY_TYPE)
+			*fOrder = (cMimeType != NULL ? *((int *) cMimeType) : 0);
+		else
+			*fOrder = 0;
+	}
+	
+	if (bIsDirectory)
+		*bIsDirectory = (iFileType == G_FILE_TYPE_DIRECTORY);
+	
+	
+	// find a readable name if it's a mount point.
 	if (iFileType == G_FILE_TYPE_MOUNTABLE)
 	{
-		*cName = NULL;
-		*iVolumeID = 1;
+		if (iVolumeID)
+			*iVolumeID = 1;
 		
-		cd_message ("  cTargetURI:%s", cTargetURI);
-		GMount *pMount = NULL;
-		if (cTargetURI != NULL)
-		{