Merge lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.0beta1 into lp:ubuntu/precise/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:
   - The Log out applet has been rewritten, now allows to switch users.
   - Many shortkeys have been added in different applets
   - The Sound Menu from Ubuntu has been integrated into the
      Sound-Control applet.
   - The Sound Menu from Ubuntu has been integrated into the
      Sound-Control applet.
   - Cairo-Dock now uses GTK3, for a better integration in a Gnome desktop
   - Few additions to the DBus API.

Note that the next stable version if scheduled for March. (before the beta freeze)

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

Please upload this version before the Feature Freeze :)

Thank you for your help!

PS: 'cairo-dock' source package has to be uploaded before this package (if possible, min 20min before these plug-ins) ( LP: #932041 )

=== removed directory '.pc/01-removed-useless-g_print.patch'
=== removed directory '.pc/01-removed-useless-g_print.patch/switcher'
=== removed directory '.pc/01-removed-useless-g_print.patch/switcher/src'
=== removed file '.pc/01-removed-useless-g_print.patch/switcher/src/applet-draw.c'
--- .pc/01-removed-useless-g_print.patch/switcher/src/applet-draw.c	2011-11-05 21:55:39 +0000
+++ .pc/01-removed-useless-g_print.patch/switcher/src/applet-draw.c	1970-01-01 00:00:00 +0000
@@ -1,689 +0,0 @@
-/**
-* This file is a part of the Cairo-Dock project
-*
-* Copyright : (C) see the 'copyright' file.
-* E-mail    : see the 'copyright' file.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 3
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <string.h>
-#include <glib/gstdio.h>
-#include <math.h>
-
-#include "applet-struct.h"
-#include "applet-load-icons.h"
-#include "applet-desktops.h"
-#include "applet-draw.h"
-
-typedef struct {
-	gint iNumDesktop;
-	gint iNumViewportX;
-	gint iNumViewportY;
-	gint iOneViewportWidth;
-	gint iOneViewportHeight;
-	cairo_t *pCairoContext;
-	} CDSwitcherDesktop;
- 
-static void _cd_switcher_draw_windows_on_viewport (Icon *pIcon, CDSwitcherDesktop *data)
-{
-	if (pIcon == NULL || pIcon->fInsertRemoveFactor > 0)
-		return ;
-	if (pIcon->bIsHidden && ! myConfig.bDisplayHiddenWindows)
-		return ;
-	int iNumDesktop = data->iNumDesktop;
-	int iNumViewportX = data->iNumViewportX;
-	int iNumViewportY = data->iNumViewportY;
-	int iOneViewportWidth = data->iOneViewportWidth;
-	int iOneViewportHeight = data->iOneViewportHeight;
-	cairo_t *pCairoContext = data->pCairoContext;
-	
-	// On calcule les coordonnees en repere absolu.
-	int x = pIcon->windowGeometry.x;  // par rapport au viewport courant.
-	x += myData.switcher.iCurrentViewportX * g_desktopGeometry.iXScreenWidth[CAIRO_DOCK_HORIZONTAL];  // repere absolu
-	if (x < 0)
-		x += g_desktopGeometry.iNbViewportX * g_desktopGeometry.iXScreenWidth[CAIRO_DOCK_HORIZONTAL];
-	int y = pIcon->windowGeometry.y;
-	y += myData.switcher.iCurrentViewportY * g_desktopGeometry.iXScreenHeight[CAIRO_DOCK_HORIZONTAL];
-	if (y < 0)
-		y += g_desktopGeometry.iNbViewportY * g_desktopGeometry.iXScreenHeight[CAIRO_DOCK_HORIZONTAL];
-	int w = pIcon->windowGeometry.width, h = pIcon->windowGeometry.height;
-	
-	// test d'intersection avec le viewport donne.
-	//g_print (" %s : (%d;%d) %dx%d\n", pIcon->cName, x, y, w, h);
-	if ((pIcon->iNumDesktop != -1 && pIcon->iNumDesktop != iNumDesktop) ||
-		x + w <= iNumViewportX * g_desktopGeometry.iXScreenWidth[CAIRO_DOCK_HORIZONTAL] ||
-		x >= (iNumViewportX + 1) * g_desktopGeometry.iXScreenWidth[CAIRO_DOCK_HORIZONTAL] ||
-		y + h <= iNumViewportY * g_desktopGeometry.iXScreenHeight[CAIRO_DOCK_HORIZONTAL] ||
-		y >= (iNumViewportY + 1) * g_desktopGeometry.iXScreenHeight[CAIRO_DOCK_HORIZONTAL])
-		return ;
-	//g_print (" > on la dessine (%x)\n", pIcon->pIconBuffer);
-	
-	// on dessine ses traits.
-	cairo_save (pCairoContext);
-	
-	cairo_set_source_rgba (pCairoContext, myConfig.RGBWLineColors[0], myConfig.RGBWLineColors[1], myConfig.RGBWLineColors[2], myConfig.RGBWLineColors[3]);
-	cairo_rectangle (pCairoContext,
-		(1.*x/g_desktopGeometry.iXScreenWidth[CAIRO_DOCK_HORIZONTAL] - iNumViewportX)*iOneViewportWidth,
-		(1.*y/g_desktopGeometry.iXScreenHeight[CAIRO_DOCK_HORIZONTAL] - iNumViewportY)*iOneViewportHeight,
-		1.*w/g_desktopGeometry.iXScreenWidth[CAIRO_DOCK_HORIZONTAL]*iOneViewportWidth,
-		1.*h/g_desktopGeometry.iXScreenHeight[CAIRO_DOCK_HORIZONTAL]*iOneViewportHeight);
-	if (pIcon->Xid == cairo_dock_get_current_active_window ())
-	{
-		//g_print (" %s est la fenetre active\n", pIcon->cName);
-		cairo_fill (pCairoContext);
-	}
-	else
-	{
-		cairo_stroke (pCairoContext);
-	}
-	
-	if (pIcon->pIconBuffer != NULL)
-	{
-		int iWidth, iHeight;
-		cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
-		double fZoomX = (double) w/g_desktopGeometry.iXScreenWidth[CAIRO_DOCK_HORIZONTAL]*iOneViewportWidth / iWidth;
-		double fZoomY = (double) h/g_desktopGeometry.iXScreenHeight[CAIRO_DOCK_HORIZONTAL]*iOneViewportHeight / iHeight;
-		double fZoom = MIN (fZoomX, fZoomY);  // on garde le ratio.
-		
-		cairo_translate (pCairoContext,
-			(1.*x/g_desktopGeometry.iXScreenWidth[CAIRO_DOCK_HORIZONTAL] - iNumViewportX)*iOneViewportWidth + (fZoomX - fZoom) * iWidth/2,
-			(1.*y/g_desktopGeometry.iXScreenHeight[CAIRO_DOCK_HORIZONTAL] - iNumViewportY)*iOneViewportHeight + (fZoomY - fZoom) * iHeight/2);
-		cairo_scale (pCairoContext,
-			fZoom,
-			fZoom);
-		cairo_set_source_surface (pCairoContext,
-			pIcon->pIconBuffer,
-			0.,
-			0.);
-		cairo_paint (pCairoContext);
-	}
-	
-	cairo_restore (pCairoContext);
-}
-
-
-static int _compare_icons_stack_order (Icon *icon1, Icon *icon2)
-{
-	if (icon1 == NULL)  // les icones nulles vont a la fin.
-		return 1;
-	if (icon2 == NULL)
-		return -1;
-	if (icon1->iStackOrder < icon2->iStackOrder)  // ordre petit => dessus => dessinee en dernier.
-		return -1;
-	else
-		return 1;
-}
-void cd_switcher_draw_main_icon_compact_mode (void)
-{
-	if (myData.switcher.iNbColumns == 0 || myData.switcher.iNbLines == 0)  // may happen in desklet mode with a cube desktop, when the desklet is still 0x0.
-		return;
-	g_return_if_fail (myDrawContext != NULL);
-	//g_print ("%s (%d;%d)\n", __func__, myData.switcher.iCurrentLine, myData.switcher.iCurrentColumn);
-	// On efface l'icone.
-	cairo_dock_erase_cairo_context (myDrawContext);
-	
-	// definition des parametres de dessin.
-	int iWidth, iHeight;
-	CD_APPLET_GET_MY_ICON_EXTENT (&iWidth, &iHeight);
-	
-	myData.switcher.fOneViewportHeight = (double) (iHeight - 2 * myConfig.iLineSize - (myData.switcher.iNbLines - 1) * myConfig.iInLineSize) / myData.switcher.iNbLines; //hauteur d'un bureau/viewport sans compter les lignes exterieures et interieures.
-	myData.switcher.fOneViewportWidth = (double) (iWidth - 2 * myConfig.iLineSize - (myData.switcher.iNbColumns - 1) * myConfig.iInLineSize) / myData.switcher.iNbColumns; //largeur d'un bureau/viewport sans compter les lignes exterieures et interieures.
-	double dx=0, dy=0;
-	double w = iWidth, h = iHeight;
-	if (myConfig.bPreserveScreenRatio)
-	{
-		double r = (double) g_desktopGeometry.iXScreenWidth[CAIRO_DOCK_HORIZONTAL] / g_desktopGeometry.iXScreenHeight[CAIRO_DOCK_HORIZONTAL];
-		double r_ = myData.switcher.fOneViewportWidth / myData.switcher.fOneViewportHeight;
-		if (r_ > r)  // on etire trop en largeur.
-		{
-			myData.switcher.fOneViewportWidth /= r_ / r;
-			dx = (double) iWidth/2 * (1 - r / r_);
-			w /= r_ / r;
-		}
-		else
-		{
-			myData.switcher.fOneViewportHeight /= r / r_;
-			dy = (double) iHeight/2 * (1 - r_ / r);
-			h /= r / r_;
-		}
-	}
-	myData.switcher.fOffsetX = dx;
-	myData.switcher.fOffsetY = dy;
-	
-	cairo_save (myDrawContext);
-	cairo_translate (myDrawContext, dx, dy);
-	
-	cairo_surface_t *pSurface = NULL;
-	double fZoomX, fZoomY;
-	if (myConfig.bMapWallpaper)
-	{
-		pSurface = myData.pDesktopBgMapSurface;
-	}
-	if (pSurface == NULL)
-	{
-		pSurface = myData.pDefaultMapSurface;
-	}
-	fZoomX = (double) myData.switcher.fOneViewportWidth / myData.iSurfaceWidth;  // both surfaces are loaded at the same size.
-	fZoomY= (double) myData.switcher.fOneViewportHeight / myData.iSurfaceHeight;
-	
-	// cadre exterieur.
-	cairo_set_line_width (myDrawContext,myConfig.iLineSize);
-	cairo_set_source_rgba(myDrawContext,myConfig.RGBLineColors[0],myConfig.RGBLineColors[1],myConfig.RGBLineColors[2],myConfig.RGBLineColors[3]);
-	cairo_rectangle(myDrawContext,
-		.5*myConfig.iLineSize,
-		.5*myConfig.iLineSize,
-		w - myConfig.iLineSize,
-		h - myConfig.iLineSize);
-
-	cairo_stroke (myDrawContext);
-	
-	// lignes interieures.
-	cairo_set_line_width (myDrawContext,myConfig.iInLineSize);
-	cairo_set_source_rgba(myDrawContext,myConfig.RGBInLineColors[0],myConfig.RGBInLineColors[1],myConfig.RGBInLineColors[2],myConfig.RGBInLineColors[3]);
-	double xi, yj;
-	int i, j;
-	for (i = 1; i < myData.switcher.iNbColumns; i ++)  // lignes verticales.
-	{
-		xi = myConfig.iLineSize + i * (myData.switcher.fOneViewportWidth + myConfig.iInLineSize) - .5*myConfig.iInLineSize;
-		cairo_move_to (myDrawContext, xi, myConfig.iLineSize);
-		cairo_rel_line_to (myDrawContext, 0, h - 2*myConfig.iLineSize);
-		cairo_stroke (myDrawContext);
-	}
-	for (j = 1; j < myData.switcher.iNbLines; j ++)  // lignes horizontales.
-	{
-		yj = myConfig.iLineSize + j * (myData.switcher.fOneViewportHeight + myConfig.iInLineSize) - .5*myConfig.iInLineSize;
-		cairo_move_to (myDrawContext, myConfig.iLineSize, yj);
-		cairo_rel_line_to (myDrawContext, w - 2*myConfig.iLineSize, 0);
-		cairo_stroke (myDrawContext);
-	}
-	
-	GList *pWindowList = NULL;
-	if (myConfig.bDrawWindows)
-	{
-		pWindowList = cairo_dock_get_current_applis_list ();
-		pWindowList = g_list_sort (pWindowList, (GCompareFunc) _compare_icons_stack_order);
-	}
-	
-	// chaque bureau/viewport.
-	int iNumDesktop=0, iNumViewportX=0, iNumViewportY=0;
-	int k = 0, N = g_desktopGeometry.iNbDesktops * g_desktopGeometry.iNbViewportX * g_desktopGeometry.iNbViewportY;
-	for (j = 0; j < myData.switcher.iNbLines && k < N; j ++)
-	{
-		for (i = 0; i < myData.switcher.iNbColumns && k < N; i ++)
-		{
-			cairo_save (myDrawContext);
-
-			xi = myConfig.iLineSize + i * (myData.switcher.fOneViewportWidth + myConfig.iInLineSize);
-			yj = myConfig.iLineSize + j * (myData.switcher.fOneViewportHeight + myConfig.iInLineSize);
-
-			cairo_translate (myDrawContext,
-				xi,
-				yj);
-
-			cairo_scale (myDrawContext,
-				fZoomX,
-				fZoomY);
-			cairo_set_source_surface (myDrawContext,
-				pSurface,
-				0.,
-				0.);
-			cairo_paint(myDrawContext);
-			
-			cairo_restore (myDrawContext);
-			
-			if (myConfig.iDrawCurrentDesktopMode == SWICTHER_FILL_INVERTED && (i != myData.switcher.iCurrentColumn || j != myData.switcher.iCurrentLine))
-			{
-				cairo_save (myDrawContext);
-				
-				cairo_set_source_rgba (myDrawContext, myConfig.RGBIndColors[0], myConfig.RGBIndColors[1], myConfig.RGBIndColors[2], myConfig.RGBIndColors[3]);
-				cairo_rectangle(myDrawContext,
-					xi - .5*myConfig.iLineSize,
-					yj - .5*myConfig.iLineSize,
-					myData.switcher.fOneViewportWidth + myConfig.iLineSize,
-					myData.switcher.fOneViewportHeight + myConfig.iLineSize);
-				cairo_fill (myDrawContext);
-				
-				cairo_restore (myDrawContext);
-			}
-			
-			if (myConfig.bDrawWindows)
-			{
-				cairo_save (myDrawContext);
-				
-				cairo_translate (myDrawContext,
-					xi,
-					yj);
-				cairo_set_line_width (myDrawContext, 1.);
-				cairo_rectangle (myDrawContext,
-					0.,
-					0.,
-					myData.switcher.fOneViewportWidth,
-					myData.switcher.fOneViewportHeight);
-				cairo_clip (myDrawContext);
-				
-				//g_print (" dessin des fenetres du bureau (%d;%d;%d) ...\n", iNumDesktop, iNumViewportX, iNumViewportY);
-				CDSwitcherDesktop data = {iNumDesktop, iNumViewportX, iNumViewportY, (int) myData.switcher.fOneViewportWidth, (int) myData.switcher.fOneViewportHeight, myDrawContext};
-				g_list_foreach (pWindowList, (GFunc) _cd_switcher_draw_windows_on_viewport, &data);
-				
-				cairo_restore (myDrawContext);
-			}
-			
-			iNumViewportX ++;
-			if (iNumViewportX == g_desktopGeometry.iNbViewportX)
-			{
-				iNumViewportX = 0;
-				iNumViewportY ++;
-				if (iNumViewportY == g_desktopGeometry.iNbViewportY)
-				{
-					iNumViewportY = 0;
-					iNumDesktop ++;
-				}
-			}
-			k ++;
-		}
-	}
-	
-	// dessin de l'indicateur sur le bureau courant (on le fait maintenant car dans le cas ou la ligne interieure est plus petite que la ligne de l'indicateur, les surfaces suivantes recouvreraient en partie la ligne.
-	if (myConfig.iDrawCurrentDesktopMode != SWICTHER_FILL_INVERTED)
-	{
-		i = myData.switcher.iCurrentColumn;
-		j = myData.switcher.iCurrentLine;
-		xi = myConfig.iLineSize + i * (myData.switcher.fOneViewportWidth + myConfig.iInLineSize);
-		yj = myConfig.iLineSize + j * (myData.switcher.fOneViewportHeight + myConfig.iInLineSize);
-		
-		cairo_set_line_width (myDrawContext,myConfig.iLineSize);
-		cairo_set_source_rgba (myDrawContext,myConfig.RGBIndColors[0],myConfig.RGBIndColors[1],myConfig.RGBIndColors[2],myConfig.RGBIndColors[3]);
-		cairo_rectangle(myDrawContext,
-			xi - .5*myConfig.iLineSize,
-			yj - .5*myConfig.iLineSize,
-			myData.switcher.fOneViewportWidth + myConfig.iLineSize,
-			myData.switcher.fOneViewportHeight + myConfig.iLineSize);
-		
-		if (myConfig.iDrawCurrentDesktopMode == SWICTHER_FILL)
-			cairo_fill (myDrawContext);
-		else
-			cairo_stroke(myDrawContext);
-	}
-	
-	cairo_restore (myDrawContext);
-	g_list_free (pWindowList);  // le contenu appartient a la hash table, mais pas la liste.
-	
-	if (CD_APPLET_MY_CONTAINER_IS_OPENGL)
-		cairo_dock_update_icon_texture (myIcon);
-	else
-		CD_APPLET_UPDATE_REFLECT_ON_MY_ICON;
-}
-
-
-void cd_switcher_draw_main_icon_expanded_mode (void)
-{
-	// apply the desktop bg or the user image on the main icon, in dock mode
-	int iWidth, iHeight;
-	
-	if (myDock)
-	{
-		CD_APPLET_GET_MY_ICON_EXTENT (&iWidth, &iHeight);
-		myData.switcher.fOneViewportHeight = (iHeight - 2 * myConfig.iLineSize - (myData.switcher.iNbLines - 1) * myConfig.iInLineSize) / myData.switcher.iNbLines; //hauteur d'un bureau/viewport sans compter les lignes exterieures et interieures.
-		myData.switcher.fOneViewportWidth = (iWidth - 2 * myConfig.iLineSize - (myData.switcher.iNbColumns - 1) * myConfig.iInLineSize) / myData.switcher.iNbColumns; //largeur d'un bureau/viewport sans compter les lignes exterieures et interieures.
-
-		cairo_surface_t *pSurface = NULL;
-		double fZoomX, fZoomY;
-		if (myConfig.bMapWallpaper)
-		{
-			cairo_dock_erase_cairo_context (myDrawContext);
-
-			pSurface = myData.pDesktopBgMapSurface;
-			fZoomX = 1. * iWidth / myData.iSurfaceWidth;
-			fZoomY= 1. * iHeight / myData.iSurfaceHeight;
-			cairo_translate (myDrawContext,
-				0.,
-				0.);
-
-			cairo_save (myDrawContext);
-			cairo_scale (myDrawContext,
-				fZoomX ,
-				fZoomY );
-			cairo_set_source_surface (myDrawContext,
-				pSurface,
-				0.,
-				0.);
-			cairo_paint(myDrawContext);
-			cairo_restore (myDrawContext);
-
-			if (CD_APPLET_MY_CONTAINER_IS_OPENGL)
-				cairo_dock_update_icon_texture (myIcon);
-			else
-				CD_APPLET_UPDATE_REFLECT_ON_MY_ICON;
-		}
-		else
-		{
-			CD_APPLET_SET_IMAGE_ON_MY_ICON (MY_APPLET_SHARE_DATA_DIR"/"MY_APPLET_ICON_FILE);
-		}
-	}
-	
-	if (myConfig.bDrawWindows)
-	{
-		GList *pWindowList = cairo_dock_get_current_applis_list ();
-		pWindowList = g_list_sort (pWindowList, (GCompareFunc) _compare_icons_stack_order);
-		
-		CDSwitcherDesktop data;
-		int iNumDesktop=0, iNumViewportX=0, iNumViewportY=0;
-		cairo_t *pCairoContext;
-		Icon *pIcon;
-		CairoContainer *pContainer = CD_APPLET_MY_ICONS_LIST_CONTAINER;
-		GList *pIconsList = CD_APPLET_MY_ICONS_LIST;
-		GList *ic;
-		for (ic = pIconsList; ic != NULL; ic = ic->next)
-		{
-			pIcon = ic->data;
-			cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
-			pCairoContext = cairo_create (pIcon->pIconBuffer);
-			cairo_set_line_width (pCairoContext, 1.);
-			cairo_set_source_rgba (pCairoContext, myConfig.RGBWLineColors[0], myConfig.RGBWLineColors[1], myConfig.RGBWLineColors[2], myConfig.RGBWLineColors[3]);
-			
-			data.iNumDesktop = iNumDesktop;
-			data.iNumViewportX = iNumViewportX;
-			data.iNumViewportY = iNumViewportY;
-			data.iOneViewportWidth = iWidth;
-			data.iOneViewportHeight = iHeight;
-			data.pCairoContext = pCairoContext;
-			g_list_foreach (pWindowList, (GFunc) _cd_switcher_draw_windows_on_viewport, &data);
-			
-			iNumViewportX ++;
-			if (iNumViewportX == g_desktopGeometry.iNbViewportX)
-			{
-				iNumViewportY ++;
-				if (iNumViewportY == g_desktopGeometry.iNbViewportY)
-					iNumDesktop ++;
-			}
-			cairo_destroy (pCairoContext);
-		}
-		g_list_free (pWindowList);  // le contenu appartient a la hash table, mais pas la liste.
-	}
-}
-
-/*Fonction de base pour toutes les autres*/
-void cd_switcher_draw_main_icon (void)
-{
-	cd_message ("%s (%d)", __func__, myConfig.bCompactView);
-	if (myConfig.bCompactView)
-	{
-		cd_switcher_draw_main_icon_compact_mode ();
-	}
-	else
-	{
-		cd_switcher_draw_main_icon_expanded_mode ();
-	}
-	
-	CD_APPLET_REDRAW_MY_ICON;
-}
-
-
-void cd_switcher_draw_desktops_bounding_box (CairoDesklet *pDesklet)
-{
-	CD_APPLET_ENTER;
-	//g_print ("%s (%.2Fx%.2f)\n", __func__, myData.switcher.fOneViewportWidth, myData.switcher.fOneViewportHeight);
-	double x, y, w, h;
-	glTranslatef (-pDesklet->container.iWidth/2, -pDesklet->container.iHeight/2, 0.);
-	
-	w = myData.switcher.fOneViewportWidth/2;
-	h = myData.switcher.fOneViewportHeight/2;
-	int i, j;
-	int k = 0, N = g_desktopGeometry.iNbDesktops * g_desktopGeometry.iNbViewportX * g_desktopGeometry.iNbViewportY;
-	
-	for (j = 0; j < myData.switcher.iNbLines; j ++)  // lignes horizontales.
-	{
-		y = myConfig.iLineSize + j * (myData.switcher.fOneViewportHeight + myConfig.iInLineSize) - .5*myConfig.iInLineSize;
-		y = pDesklet->container.iHeight - (y + h + myData.switcher.fOffsetY);	
-		
-		for (i = 0; i < myData.switcher.iNbColumns; i ++)  // lignes verticales.
-		{
-			x = myConfig.iLineSize + i * (myData.switcher.fOneViewportWidth + myConfig.iInLineSize) - .5*myConfig.iInLineSize;
-			x += w + myData.switcher.fOffsetX;
-			
-			glLoadName(i * myData.switcher.iNbLines + j + 1);  // +1 pour ne pas avoir 0.
-			
-			glBegin(GL_QUADS);
-			glVertex3f(x-w, y+h, 0.);
-			glVertex3f(x+w, y+h, 0.);
-			glVertex3f(x+w, y-h, 0.);
-			glVertex3f(x-w, y-h, 0.);
-			glEnd();
-			
-			k ++;
-			if (k == N)
-				break;
-		}
-	}
-	CD_APPLET_LEAVE ();
-}
-
-void cd_switcher_extract_viewport_coords_from_picked_object (CairoDesklet *pDesklet, int *iCoordX, int *iCoordY)
-{
-	//g_print ("%s (%d)\n", __func__, pDesklet->iPickedObject);
-	if (pDesklet->iPickedObject != 0)
-	{
-		pDesklet->iPickedObject --;  // cf le +1
-		int i, j;
-		i = pDesklet->iPickedObject / myData.switcher.iNbLines;
-		j = pDesklet->iPickedObject % myData.switcher.iNbLines;
-		//g_print ("bureau (%d;%d)\n", i, j);
-		
-		double x, y, w, h;
-		w = myData.switcher.fOneViewportWidth/2;
-		h = myData.switcher.fOneViewportHeight/2;
-		x = myConfig.iLineSize + i * (myData.switcher.fOneViewportWidth + myConfig.iInLineSize) - .5*myConfig.iInLineSize;
-		x += w + myData.switcher.fOffsetX;
-		y = myConfig.iLineSize + j * (myData.switcher.fOneViewportHeight + myConfig.iInLineSize) - .5*myConfig.iInLineSize;
-		y += h + myData.switcher.fOffsetY;
-		*iCoordX = x;
-		*iCoordY = y;
-	}
-}
-
-
-static void _show_window (GtkMenuItem *menu_item, Icon *pIcon)
-{
-	CD_APPLET_ENTER;
-	cairo_dock_show_xwindow (pIcon->Xid);
-	CD_APPLET_LEAVE ();
-}
-
-static void _show_desktop (GtkMenuItem *menu_item, gpointer data)
-{
-	CD_APPLET_ENTER;
-	int iIndex = GPOINTER_TO_INT (data);
-	int iNumDesktop, iNumViewportX, iNumViewportY;
-	cd_switcher_compute_viewports_from_index (iIndex, &iNumDesktop, &iNumViewportX, &iNumViewportY);
-	if (iNumDesktop != myData.switcher.iCurrentDesktop)
-		cairo_dock_set_current_desktop (iNumDesktop);
-	if (iNumViewportX != myData.switcher.iCurrentViewportX || iNumViewportY != myData.switcher.iCurrentViewportY)
-		cairo_dock_set_current_viewport (iNumViewportX, iNumViewportY);
-	CD_APPLET_LEAVE ();
-}
-static void _cd_switcher_list_window_on_viewport (Icon *pIcon, int iNumDesktop, int iNumViewportX, int iNumViewportY, GtkWidget *pMenu)
-{
-	//g_print (" + %s\n", pIcon->cName);
-	// on recupere la taille de l'icone.
-	int iWidth, iHeight;
-	cairo_dock_get_icon_extent (pIcon, &iWidth, &iHeight);
-	
-	// on cree une copie de la surface de l'icone a la taille du menu.
-	GdkPixbuf *pixbuf = NULL;
-	if (iWidth > 0 && iHeight > 0 && pIcon->pIconBuffer != NULL)
-	{
-		int w = 24, h = w;
-		cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
-			w,
-			h);
-		cairo_t *pCairoContext = cairo_create (surface);
-		cairo_scale (pCairoContext, (double)w/iWidth, (double)h/iHeight);
-		cairo_set_source_surface (pCairoContext, pIcon->pIconBuffer, 0., 0.);
-		cairo_paint (pCairoContext);
-		cairo_destroy (pCairoContext);
-		guchar *d, *data = cairo_image_surface_get_data (surface);
-		int r = cairo_image_surface_get_stride (surface);
-		
-		// on la convertit en un pixbuf.
-		pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
-			TRUE,
-			8,
-			w,
-			h);
-		guchar *p, *pixels = gdk_pixbuf_get_pixels (pixbuf);
-		int iNbChannels = gdk_pixbuf_get_n_channels (pixbuf);
-		int iRowstride = gdk_pixbuf_get_rowstride (pixbuf);
-		
-		int x, y;
-		int red, green, blue;
-		float fAlphaFactor;
-		for (y = 0; y < h; y ++)
-		{
-			for (x = 0; x < w; x ++)
-			{
-				p = pixels + y * iRowstride + x * iNbChannels;
-				d = data + y * r + x * 4;
-				
-				fAlphaFactor = (float) d[3] / 255;
-				if (fAlphaFactor != 0)
-				{
-					red = d[0] / fAlphaFactor;
-					green = d[1] / fAlphaFactor;
-					blue = d[2] / fAlphaFactor;
-				}
-				else
-				{
-					red = blue = green = 0;
-				}
-				p[0] = blue;
-				p[1] = green;
-				p[2] = red;
-				p[3] = d[3];
-			}
-		}
-		
-		cairo_surface_destroy (surface);
-	}
-	
-	// on ajoute une entree au menu avec le pixbuf.
-	GtkWidget *pMenuItem = gtk_image_menu_item_new_with_label (pIcon->cName);
-	if (pixbuf)
-	{
-		GtkWidget *image = gtk_image_new_from_pixbuf (pixbuf);
-#if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
-		gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (pMenuItem), TRUE);
-#endif
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (pMenuItem), image);
-		g_object_unref (pixbuf);
-	}
-	gtk_menu_shell_append  (GTK_MENU_SHELL (pMenu), pMenuItem);
-	g_signal_connect (G_OBJECT (pMenuItem), "activate", G_CALLBACK (_show_window), pIcon);
-}
-void cd_switcher_build_windows_list (GtkWidget *pMenu)
-{
-	GList *pWindowList = NULL;
-	pWindowList = cairo_dock_get_current_applis_list ();
-	pWindowList = g_list_sort (pWindowList, (GCompareFunc) _compare_icons_stack_order);
-	
-	// chaque bureau/viewport.
-	int iNumDesktop=0, iNumViewportX=0, iNumViewportY=0;
-	int k = 0, N = g_desktopGeometry.iNbDesktops * g_desktopGeometry.iNbViewportX * g_desktopGeometry.iNbViewportY;
-	int iIndex = cd_switcher_compute_index (myData.switcher.iCurrentDesktop, myData.switcher.iCurrentViewportX, myData.switcher.iCurrentViewportY);
-	GString *sDesktopName = g_string_new ("");
-	int i, j;
-	for (j = 0; j < myData.switcher.iNbLines; j ++)
-	{
-		for (i = 0; i < myData.switcher.iNbColumns; i ++)
-		{
-			// on ajoute le nom du bureau/viewport dans le menu.
-			GtkWidget *pMenuItem = gtk_separator_menu_item_new ();
-			gtk_menu_shell_append(GTK_MENU_SHELL (pMenu), pMenuItem);
-			g_object_set (pMenuItem, "height-request", 3, NULL);
-			
-			if (k < myConfig.iNbNames)
-			{
-				if (k == iIndex)
-					g_string_printf (sDesktopName, "<b>%s (%s)</b>", myConfig.cDesktopNames[k], D_("Current"));
-				else
-					g_string_printf (sDesktopName, "<b>%s</b>", myConfig.cDesktopNames[k]);
-			}
-			else
-			{
-				if (k == iIndex)
-					g_string_printf (sDesktopName, "<b>%s %d (%s)</b>", D_("Desktop"), k+1, D_("Current"));
-				else
-					g_string_printf (sDesktopName, "<b>%s %d</b>", D_("Desktop"), k+1);
-			}  // les noms des bureaux : _NET_DESKTOP_NAMES, UTF8_STRING
-			pMenuItem = gtk_menu_item_new ();
-			GtkWidget *pLabel = gtk_label_new (sDesktopName->str);
-			gtk_label_set_use_markup (GTK_LABEL (pLabel), TRUE);
-			gtk_misc_set_alignment (GTK_MISC (pLabel), .5, .5);
-			gtk_container_add (GTK_CONTAINER (pMenuItem), pLabel);
-			gtk_menu_shell_append  (GTK_MENU_SHELL (pMenu), pMenuItem);
-			g_signal_connect (G_OBJECT (pMenuItem), "activate", G_CALLBACK (_show_desktop), GINT_TO_POINTER (k));
-			
-			pMenuItem = gtk_separator_menu_item_new ();
-			gtk_menu_shell_append(GTK_MENU_SHELL (pMenu), pMenuItem);
-			g_object_set (pMenuItem, "height-request", 3, NULL);
-			
-			// on ajoute les fenetres du viewport au menu.
-			g_print (" listing des fenetres du bureau (%d;%d;%d) ...\n", iNumDesktop, iNumViewportX, iNumViewportY);
-			cd_switcher_foreach_window_on_viewport (iNumDesktop,
-				iNumViewportX,
-				iNumViewportY,
-				(CDSwitcherActionOnViewportFunc) _cd_switcher_list_window_on_viewport,
-				pMenu);
-			
-			// on passe au viewport suivant.
-			iNumViewportX ++;
-			if (iNumViewportX == g_desktopGeometry.iNbViewportX)
-			{
-				iNumViewportX = 0;
-				iNumViewportY ++;
-				if (iNumViewportY == g_desktopGeometry.iNbViewportY)
-				{
-					iNumViewportY = 0;
-					iNumDesktop ++;
-				}
-			}
-			k ++;
-			if (k == N)
-				break ;
-		}
-	}
-	g_string_free (sDesktopName, TRUE);
-}
-
-
-
-static void _cd_switcher_move_window_to_viewport (Icon *pIcon, int iNumDesktop, int iNumViewportX, int iNumViewportY, gint *data)
-{
-	int iDestNumDesktop = data[0];
-	int iDestNumViewportX = data[1];
-	int iDestNumViewportY = data[2];
-	
-	cairo_dock_move_xwindow_to_nth_desktop (pIcon->Xid,
-		iDestNumDesktop,
-		(iDestNumViewportX - myData.switcher.iCurrentViewportX) * g_desktopGeometry.iXScreenWidth[CAIRO_DOCK_HORIZONTAL],
-		(iDestNumViewportY - myData.switcher.iCurrentViewportY) * g_desktopGeometry.iXScreenHeight[CAIRO_DOCK_HORIZONTAL]);
-}
-void cd_switcher_move_current_desktop_to (int iNumDesktop, int iNumViewportX, int iNumViewportY)
-{
-	gint data[3] = {iNumDesktop, iNumViewportX, iNumViewportY};
-	cd_switcher_foreach_window_on_viewport (myData.switcher.iCurrentDesktop,
-		myData.switcher.iCurrentViewportX,
-		myData.switcher.iCurrentViewportY,
-		(CDSwitcherActionOnViewportFunc) _cd_switcher_move_window_to_viewport,
-		data);
-}

=== removed file '.pc/01-removed-useless-g_print.patch/switcher/src/applet-load-icons.c'
--- .pc/01-removed-useless-g_print.patch/switcher/src/applet-load-icons.c	2011-11-05 21:55:39 +0000
+++ .pc/01-removed-useless-g_print.patch/switcher/src/applet-load-icons.c	1970-01-01 00:00:00 +0000
@@ -1,238 +0,0 @@
-/**
-* This file is a part of the Cairo-Dock project
-*
-* Copyright : (C) see the 'copyright' file.
-* E-mail    : see the 'copyright' file.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 3
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <string.h>
-
-#include "applet-struct.h"
-#include "applet-desktops.h"
-#include "applet-draw.h"
-#include "applet-load-icons.h"
-
-
-static void _load_desktop_icon (Icon *pIcon)
-{
-	int iWidth = pIcon->iImageWidth;
-	int iHeight = pIcon->iImageHeight;
-	
-	pIcon->pIconBuffer = cairo_dock_duplicate_surface (myData.pDesktopBgMapSurface,
-		myData.iSurfaceWidth, myData.iSurfaceHeight,
-		iWidth, iHeight);
-}
-
-static GList * _load_icons (void)
-{
-	GList *pIconList = NULL;
-	int iIndex = cd_switcher_compute_index (myData.switcher.iCurrentDesktop, myData.switcher.iCurrentViewportX, myData.switcher.iCurrentViewportY);
-	Icon *pIcon;
-	int i;
-	for (i = 0; i < myData.switcher.iNbViewportTotal; i ++)
-	{
-		pIcon = cairo_dock_create_dummy_launcher (NULL,
-			(myConfig.bMapWallpaper ? NULL : (myConfig.cDefaultIcon != NULL ? g_strdup (myConfig.cDefaultIcon) : g_strdup (MY_APPLET_SHARE_DATA_DIR"/default.svg"))),
-			NULL,
-			g_strdup_printf ("%d",i+1),
-			i);
-		if (i == iIndex)
-		{
-			pIcon->cName = g_strdup_printf ("%s (%d)", D_("Current"), i+1);
-			pIcon->bHasIndicator = TRUE;
-			pIcon->fAlpha = .7;
-		}
-		else
-		{
-			pIcon->cName = (i < myConfig.iNbNames ? g_strdup (myConfig.cDesktopNames[i]) : g_strdup_printf ("%s %d", D_("Desktop"), i+1));
-			pIcon->bHasIndicator = FALSE;
-			pIcon->fAlpha = 1.;
-		}
-		pIcon->cParentDockName = g_strdup (myIcon->cName);
-		
-		if (myConfig.bMapWallpaper)
-		{
-			pIcon->iface.load_image = _load_desktop_icon;
-		}
-		
-		pIconList = g_list_append (pIconList, pIcon);
-	}
-	
-	return pIconList;
-}
-
-
-
-void cd_switcher_load_icons (void)
-{
-	CD_APPLET_DELETE_MY_ICONS_LIST;
-	cairo_surface_destroy (myData.pDesktopBgMapSurface);
-	myData.pDesktopBgMapSurface = NULL;
-	cairo_surface_destroy (myData.pDefaultMapSurface);
-	myData.pDefaultMapSurface = NULL;
-	
-	if (myConfig.bMapWallpaper)
-	{
-		cd_switcher_load_desktop_bg_map_surface ();
-	}
-	if (myData.pDesktopBgMapSurface == NULL)
-	{
-		cd_switcher_load_default_map_surface ();
-	}
-	
-	if (myConfig.bCompactView)
-	{
-		if (myIcon->pSubDock != NULL)  // si on est passe de expanded a compact, le sous-dock vide reste.
-		{
-			cairo_dock_destroy_dock (myIcon->pSubDock, myIcon->cName);
-			myIcon->pSubDock = NULL;
-		}
-		if (myDesklet)
-		{
-			CD_APPLET_SET_DESKLET_RENDERER ("Simple");
-			myDesklet->render_bounding_box = cd_switcher_draw_desktops_bounding_box;  // pour le picking du bureau clique.
-		}
-	}
-	else
-	{
-		//\_______________________ On cree la liste des icones de prevision.
-		GList *pIconList = _load_icons ();
-		
-		//\_______________________ On charge la nouvelle liste.
-		CD_APPLET_LOAD_MY_ICONS_LIST (pIconList, myConfig.cRenderer, "Slide", NULL);
-		
-		//\_______________________ On peint les icones.
-		///cd_switcher_trigger_paint_icons ();
-	}
-}
-
-/**void cd_switcher_paint_icons (void)
-{
-	//\_______________________ On applique la surface.
-	CairoContainer *pContainer = CD_APPLET_MY_ICONS_LIST_CONTAINER;
-	GList *pIconList = CD_APPLET_MY_ICONS_LIST;
-	if (pIconList == NULL)
-		return ;
-	
-	cairo_surface_t *pSurface = NULL;
-	double fZoomX, fZoomY;
-	Icon *pFirstIcon = pIconList->data;
-	
-	int iWidth, iHeight;
-	cairo_dock_get_icon_extent (pFirstIcon, &iWidth, &iHeight);
-	int _iWidth, _iHeight;
-	CD_APPLET_GET_MY_ICON_EXTENT (&_iWidth, &_iHeight);
-	
-	if (myConfig.bMapWallpaper)
-	{
-		cd_switcher_draw_main_icon();
-		pSurface = myData.pDesktopBgMapSurface;
-		fZoomX = (double)iWidth / _iWidth;
-		fZoomY = (double)iHeight / _iHeight;
-	
-	}
-	if (pSurface == NULL)
-	{
-		pSurface = myData.pDefaultMapSurface;
-		fZoomX = (double)iWidth / _iWidth;
-		fZoomY = (double)iHeight / _iHeight;
-	}
-	
-	cairo_t *pIconContext;
-	GList* ic;
-	Icon *icon;
-	for (ic = pIconList; ic != NULL; ic = ic->next)
-	{
-		icon = ic->data;
-		//g_print (" (%.2f; %.2f) %.2fx%.2f\n", icon->fDrawX, icon->fDrawY, icon->fWidth, icon->fHeight);
-		pIconContext = cairo_create (icon->pIconBuffer);
-		cairo_scale (pIconContext,
-			fZoomX,
-			fZoomY);
-
-		cairo_dock_set_icon_surface_with_reflect (pIconContext, pSurface, icon, pContainer);
-		cairo_destroy (pIconContext);
-	}
-}
-
-static gboolean _paint_icons (gpointer data)
-{
-	CD_APPLET_ENTER;
-	if (! myConfig.bCompactView)
-		cd_switcher_paint_icons ();
-	myData.iSidPainIcons = 0;
-	CD_APPLET_LEAVE (FALSE);
-}
-void cd_switcher_trigger_paint_icons (void)
-{
-	if (myData.iSidPainIcons != 0)  // on la lance en idle, car les icones sont chargees en idle.
-		g_source_remove (myData.iSidPainIcons);
-	myData.iSidPainIcons = g_idle_add ((GSourceFunc)_paint_icons, NULL);
-}*/
-
-
-void cd_switcher_load_desktop_bg_map_surface (void)
-{
-	// get the background surface
-	CairoDockDesktopBackground *db = cairo_dock_get_desktop_background (FALSE);  // FALSE <=> sans texture.
-	cairo_surface_t *pBgSurface = cairo_dock_get_desktop_bg_surface (db);
-	
-	if (myData.pDesktopBgMapSurface != NULL)
-		cairo_surface_destroy (myData.pDesktopBgMapSurface);
-	if (pBgSurface == NULL)
-	{
-		cd_warning ("couldn't get the wallpaper");
-		myData.pDesktopBgMapSurface = NULL;
-		cairo_dock_destroy_desktop_background (db);
-		return ;
-	}
-	
-	// load it at a decent size.
-	if (myDock)
-	{
-		CD_APPLET_GET_MY_ICON_EXTENT (&myData.iSurfaceWidth, &myData.iSurfaceHeight);
-	}
-	else
-	{
-		myData.iSurfaceWidth = myContainer->iWidth / myData.switcher.iNbViewportTotal;
-		myData.iSurfaceHeight = myContainer->iHeight / myData.switcher.iNbViewportTotal;
-	}
-	g_print ("%s (%dx%d)\n", __func__, myData.iSurfaceWidth, myData.iSurfaceHeight);
-	
-	myData.pDesktopBgMapSurface = cairo_dock_duplicate_surface (pBgSurface,
-		g_desktopGeometry.iXScreenWidth[CAIRO_DOCK_HORIZONTAL], g_desktopGeometry.iXScreenHeight[CAIRO_DOCK_HORIZONTAL],
-		myData.iSurfaceWidth, myData.iSurfaceHeight);
-	
-	cairo_dock_destroy_desktop_background (db);
-}
-
-void cd_switcher_load_default_map_surface (void)
-{
-	if (myData.pDefaultMapSurface != NULL)
-		cairo_surface_destroy (myData.pDefaultMapSurface);
-	if (myDock)
-	{
-		CD_APPLET_GET_MY_ICON_EXTENT (&myData.iSurfaceWidth, &myData.iSurfaceHeight);
-	}
-	else
-	{
-		myData.iSurfaceWidth = myContainer->iWidth / myData.switcher.iNbViewportTotal;
-		myData.iSurfaceHeight = myContainer->iHeight / myData.switcher.iNbViewportTotal;
-	}
-	g_print ("%s (%dx%d)\n", __func__, myData.iSurfaceWidth, myData.iSurfaceHeight);
-	myData.pDefaultMapSurface = cairo_dock_create_surface_from_image_simple (myConfig.cDefaultIcon,
-		myData.iSurfaceWidth,
-		myData.iSurfaceHeight);
-}

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2011-11-05 21:55:39 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-01-removed-useless-g_print.patch

=== modified file 'Animated-icons/data/Animated-icons.conf.in' (properties changed: +x to -x)
--- Animated-icons/data/Animated-icons.conf.in	2011-08-09 18:08:08 +0000
+++ Animated-icons/data/Animated-icons.conf.in	2012-02-14 14:04:19 +0000
@@ -28,15 +28,6 @@
 #i+[1;5] Number of times the animation will play:
 nb rounds applis = 1
 
-#F-[when clicking on an applet]
-frame_applet =
-
-#V+[Bounce;Rotate;Blink;Pulse;Wobbly;Wave;Spot] Effects used on applets:
-click applets = 0
-
-#i+[1;5] Number of times the animation will play:
-nb rounds applets = 1
-
 
 #[@animated_iconsdatadir@/icon-rotation.png]
 [Rotation]

=== modified file 'Animated-icons/src/applet-config.c'
--- Animated-icons/src/applet-config.c	2011-04-20 20:46:51 +0000
+++ Animated-icons/src/applet-config.c	2012-02-14 14:04:19 +0000
@@ -49,11 +49,6 @@
 		(int *)myConfig.iEffectsOnClick[CAIRO_DOCK_APPLI]);
 	myConfig.iNbRoundsOnClick[CAIRO_DOCK_APPLI] = CD_CONFIG_GET_INTEGER ("Global", "nb rounds applis");
 	
-	CD_CONFIG_GET_INTEGER_LIST ("Global", "click applets", CD_ANIMATIONS_NB_EFFECTS,
-		(int *)myConfig.iEffectsOnClick[CAIRO_DOCK_APPLET]);
-	myConfig.iNbRoundsOnClick[CAIRO_DOCK_APPLET] = CD_CONFIG_GET_INTEGER ("Global", "nb rounds applets");
-	
-	
 	myConfig.iRotationDuration = CD_CONFIG_GET_INTEGER ("Rotation", "duration");
 	myConfig.bContinueRotation = CD_CONFIG_GET_BOOLEAN ("Rotation", "continue");
 	myConfig.iMeshType = CD_CONFIG_GET_INTEGER ("Rotation", "mesh");

=== modified file 'Animated-icons/src/applet-pulse.c'
--- Animated-icons/src/applet-pulse.c	2010-08-10 00:05:57 +0000
+++ Animated-icons/src/applet-pulse.c	2012-02-14 14:04:19 +0000
@@ -86,7 +86,8 @@
 	else
 		cairo_translate (pCairoContext, pIcon->fHeight * pIcon->fScale * (1 - fScaleFactor) / 2, pIcon->fWidth * pIcon->fScale * (1 - fScaleFactor) / 2);
 	
-	cairo_dock_set_icon_scale_on_context (pCairoContext, pIcon, pDock->container.bIsHorizontal, pDock->container.fRatio * fScaleFactor, pDock->container.bDirectionUp);
+	cairo_dock_set_icon_scale_on_context (pCairoContext, pIcon, pDock->container.bIsHorizontal, 1., pDock->container.bDirectionUp);
+	cairo_scale (pCairoContext, fScaleFactor, fScaleFactor);
 	
 	cairo_set_source_surface (pCairoContext, pIcon->pIconBuffer, 0.0, 0.0);
 	cairo_paint_with_alpha (pCairoContext, pData->fPulseAlpha * pIcon->fAlpha);

=== modified file 'Animated-icons/src/applet-rays.c'
--- Animated-icons/src/applet-rays.c	2009-10-05 19:27:17 +0000
+++ Animated-icons/src/applet-rays.c	2012-02-14 14:04:19 +0000
@@ -28,8 +28,10 @@
 {
 	if (myData.iRaysTexture == 0)
 		myData.iRaysTexture = cd_animations_load_rays_texture ();
-	double fMaxScale = cairo_dock_get_max_scale (CAIRO_CONTAINER (pDock));
-	CairoParticleSystem *pRaysParticleSystem = cairo_dock_create_particle_system (myConfig.iNbRaysParticles, myData.iRaysTexture, pIcon->fWidth, pIcon->fHeight * fMaxScale);
+	CairoParticleSystem *pRaysParticleSystem = cairo_dock_create_particle_system (myConfig.iNbRaysParticles,
+		myData.iRaysTexture,
+		pIcon->fWidth,
+		pDock->container.bIsHorizontal ? pIcon->iImageHeight : pIcon->iImageWidth);
 	pRaysParticleSystem->dt = dt;
 	pRaysParticleSystem->bDirectionUp = (pDock->container.bIsHorizontal ? pDock->container.bDirectionUp : ! pDock->container.bDirectionUp);
 	pRaysParticleSystem->bAddLuminance = TRUE;

=== modified file 'Animated-icons/src/applet-rotation.c'
--- Animated-icons/src/applet-rotation.c	2011-04-20 20:46:51 +0000
+++ Animated-icons/src/applet-rotation.c	2012-02-14 14:04:19 +0000
@@ -261,7 +261,7 @@
 			else
 			{
 				glTranslatef (0., fOffsetY, 0.);
-				//glScalef (pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, myIconsParam.fReflectSize * pDock->container.fRatio, 1.);
+				//glScalef (pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, pDock->iIconSize * myIconsParam.fReflectHeightRatio * pDock->container.fRatio, 1.);
 			}
 			glScalef (1., -1., 1.);
 		}
@@ -270,12 +270,12 @@
 			if (pDock->container.bDirectionUp)
 			{
 				glTranslatef (fOffsetY, 0., 0.);
-				//glScalef (- myIconsParam.fReflectSize * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
+				//glScalef (- pDock->iIconSize * myIconsParam.fReflectHeightRatio * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
 			}
 			else
 			{
 				glTranslatef (- fOffsetY, 0., 0.);
-				//glScalef (myIconsParam.fReflectSize * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
+				//glScalef (pDock->iIconSize * myIconsParam.fReflectHeightRatio * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
 			}
 			glScalef (-1., 1., 1.);
 		}

=== modified file 'Animated-icons/src/applet-spot.c'
--- Animated-icons/src/applet-spot.c	2011-04-20 20:46:51 +0000
+++ Animated-icons/src/applet-spot.c	2012-02-14 14:04:19 +0000
@@ -51,7 +51,7 @@
 		glRotatef (90, 0., 0., 1.);
 	double fY = (- pIcon->fHeight + CD_ANIMATIONS_SPOT_HEIGHT) * pIcon->fScale/2;  // * fRadiusFactor
 	if (pDock->container.bUseReflect)
-		fY -= MIN (myIconsParam.fReflectSize, CD_ANIMATIONS_SPOT_HEIGHT/2);
+		fY -= MIN (pDock->iIconSize * myIconsParam.fReflectHeightRatio, CD_ANIMATIONS_SPOT_HEIGHT/2);
 	if (! pDock->container.bDirectionUp)
 		fY = -fY;
 	glTranslatef (0., fY, 0.);
@@ -81,7 +81,7 @@
 		glRotatef (90, 0., 0., 1.);
 	double fY = CD_ANIMATIONS_SPOT_HEIGHT * (1 + cos (G_PI * fHaloRotationAngle / 180.))/2 - pIcon->fHeight * pIcon->fScale/2;  // * fRadiusFactor
 	if (pDock->container.bUseReflect)
-		fY -= MIN (myIconsParam.fReflectSize, CD_ANIMATIONS_SPOT_HEIGHT/2);
+		fY -= MIN (pDock->iIconSize * myIconsParam.fReflectHeightRatio, CD_ANIMATIONS_SPOT_HEIGHT/2);
 	if (! pDock->container.bDirectionUp)
 		fY = -fY;
 	double fX = .9 * pIcon->fWidth * pIcon->fScale/2;  // * fRadiusFactor
@@ -115,7 +115,7 @@
 		glRotatef (90, 0., 0., 1.);
 	double fY = (- pIcon->fHeight + CD_ANIMATIONS_SPOT_HEIGHT/2 + pIcon->fHeight * fRadiusFactor) * pIcon->fScale/2;  // CD_ANIMATIONS_SPOT_HEIGHT/2 * fRadiusFactor
 	if (pDock->container.bUseReflect)
-		fY -= MIN (myIconsParam.fReflectSize, CD_ANIMATIONS_SPOT_HEIGHT/2);
+		fY -= MIN (pDock->iIconSize * myIconsParam.fReflectHeightRatio, CD_ANIMATIONS_SPOT_HEIGHT/2);
 	if (! pDock->container.bDirectionUp)
 		fY = -fY;
 	glTranslatef (0., fY, 0.);

=== modified file 'Animated-icons/src/applet-unfold.c'
--- Animated-icons/src/applet-unfold.c	2011-09-26 12:56:12 +0000
+++ Animated-icons/src/applet-unfold.c	2012-02-14 14:04:19 +0000
@@ -31,7 +31,7 @@
 	int 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 fMaxScale = (pIcon->fHeight != 0 ? (pDock->container.bIsHorizontal ? pIcon->iImageHeight : pIcon->iImageWidth) / pIcon->fHeight : 1.);
 	double z = pIcon->fScale / fMaxScale * pDock->container.fRatio;
 	
 	//\______________ On dessine la boite derriere.
@@ -55,11 +55,6 @@
 	cairo_scale(pCairoContext,
 		(double) w / g_pBoxBelowBuffer.iWidth,
 		(double) h / g_pBoxBelowBuffer.iHeight);
-	/**cairo_set_source_surface (pCairoContext,
-		g_pBoxBelowBuffer.pSurface,
-		0.,
-		0.);
-	cairo_paint (pCairoContext);*/
 	cairo_dock_draw_surface (pCairoContext,
 		g_pBoxBelowBuffer.pSurface,
 		g_pBoxBelowBuffer.iWidth, g_pBoxBelowBuffer.iHeight,
@@ -80,11 +75,9 @@
 		if (! pDock->container.bDirectionUp)
 			cairo_translate (pCairoContext, .2*h, 0.);
 	}
-	cairo_scale(pCairoContext,
-		.8,
-		.8);
 	int i;
 	double dx, dy;
+	int wi, hi;
 	Icon *icon;
 	GList *ic;
 	for (ic = pIcon->pSubDock->icons, i = 0; ic != NULL && i < 3; ic = ic->next, i++)
@@ -112,11 +105,18 @@
 			else
 				dx = - (.1*i - f*1.5) * h/z;
 		}
+		
+		cairo_dock_get_icon_extent (icon, &wi, &hi);
+		
+		cairo_save (pCairoContext);
+		cairo_translate (pCairoContext, dx, dy);
+		cairo_scale (pCairoContext, .8 * w / wi, .8 * h / hi);
 		cairo_set_source_surface (pCairoContext,
 			icon->pIconBuffer,
-			dx,
-			dy);
+			0,
+			0);
 		cairo_paint_with_alpha (pCairoContext, 1. - f);
+		cairo_restore (pCairoContext);
 	}
 	cairo_restore (pCairoContext);
 	
@@ -125,11 +125,6 @@
 	cairo_scale(pCairoContext,
 		(double) w / g_pBoxAboveBuffer.iWidth,
 		(double) h / g_pBoxAboveBuffer.iHeight);
-	/**cairo_set_source_surface (pCairoContext,
-		g_pBoxAboveBuffer.pSurface,
-		0.,
-		0.);
-	cairo_paint (pCairoContext);*/
 	cairo_dock_draw_surface (pCairoContext,
 		g_pBoxAboveBuffer.pSurface,
 		g_pBoxAboveBuffer.iWidth, g_pBoxAboveBuffer.iHeight,
@@ -139,9 +134,9 @@
 	cairo_restore (pCairoContext);
 	
 	//\_____________________ On dessine son reflet.
-	cairo_dock_draw_icon_reflect_cairo (pIcon, pDock, pCairoContext);
+	cairo_restore (pCairoContext);  // come back to the original context
 	
-	cairo_restore (pCairoContext);
+	cairo_dock_draw_icon_reflect_cairo (pIcon, CAIRO_CONTAINER (pDock), pCairoContext);
 }
 
 
@@ -151,7 +146,7 @@
 	int 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 fMaxScale = (pIcon->fHeight != 0 ? (pDock->container.bIsHorizontal ? pIcon->iImageHeight : pIcon->iImageWidth) / pIcon->fHeight : 1.);
 	double z = pIcon->fScale / fMaxScale * pDock->container.fRatio;
 	
 	//\______________ On dessine la boite derriere.

=== modified file 'Animated-icons/src/applet-wave.c'
--- Animated-icons/src/applet-wave.c	2011-04-20 20:46:51 +0000
+++ Animated-icons/src/applet-wave.c	2012-02-14 14:04:19 +0000
@@ -186,8 +186,8 @@
 	{
 		glPushMatrix ();
 		double x0, y0, x1, y1;
-		double fReflectRatio = myIconsParam.fReflectSize * pDock->container.fRatio / pIcon->fHeight / pIcon->fScale;
-		double fOffsetY = pIcon->fHeight * pIcon->fScale/2 + (myIconsParam.fReflectSize/2 + pIcon->fDeltaYReflection) * pDock->container.fRatio;
+		double fReflectRatio = pDock->iIconSize * myIconsParam.fReflectHeightRatio * pDock->container.fRatio / pIcon->fHeight / pIcon->fScale;
+		double fOffsetY = pIcon->fHeight * pIcon->fScale/2 + (pDock->iIconSize * myIconsParam.fReflectHeightRatio/2 + pIcon->fDeltaYReflection) * pDock->container.fRatio;
 		if (pDock->container.bIsHorizontal)
 		{
 			if (pDock->container.bDirectionUp)
@@ -203,7 +203,7 @@
 			else
 			{
 				glTranslatef (0., fOffsetY, 0.);
-				glScalef (pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, myIconsParam.fReflectSize * pDock->container.fRatio, 1.);
+				glScalef (pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, pDock->iIconSize * myIconsParam.fReflectHeightRatio * pDock->container.fRatio, 1.);
 				x0 = 0.;
 				y0 = fReflectRatio;
 				x1 = 1.;
@@ -215,7 +215,7 @@
 			if (pDock->container.bDirectionUp)
 			{
 				glTranslatef (fOffsetY, 0., 0.);
-				glScalef (- myIconsParam.fReflectSize * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
+				glScalef (- pDock->iIconSize * myIconsParam.fReflectHeightRatio * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
 				x0 = 1. - fReflectRatio;
 				y0 = 0.;
 				x1 = 1.;
@@ -224,7 +224,7 @@
 			else
 			{
 				glTranslatef (- fOffsetY, 0., 0.);
-				glScalef (myIconsParam.fReflectSize * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
+				glScalef (pDock->iIconSize * myIconsParam.fReflectHeightRatio * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
 				x0 = fReflectRatio;
 				y0 = 0.;
 				x1 = 0.;

=== modified file 'Animated-icons/src/applet-wobbly.c'
--- Animated-icons/src/applet-wobbly.c	2011-08-09 18:08:08 +0000
+++ Animated-icons/src/applet-wobbly.c	2012-02-14 14:04:19 +0000
@@ -422,8 +422,8 @@
 	{
 		glPushMatrix ();
 		double x0, y0, x1, y1;
-		double fReflectRatio = myIconsParam.fReflectSize * pDock->container.fRatio / pIcon->fHeight / pIcon->fScale;
-		///double fOffsetY = pIcon->fHeight * pIcon->fScale/2 + (myIconsParam.fReflectSize/2 + pIcon->fDeltaYReflection) * pDock->container.fRatio;
+		double fReflectRatio = pDock->iIconSize * myIconsParam.fReflectHeightRatio * pDock->container.fRatio / pIcon->fHeight / pIcon->fScale;
+		///double fOffsetY = pIcon->fHeight * pIcon->fScale/2 + (pDock->iIconSize * myIconsParam.fReflectHeightRatio/2 + pIcon->fDeltaYReflection) * pDock->container.fRatio;
 		double fOffsetY = pIcon->fHeight * pIcon->fScale + pIcon->fDeltaYReflection;
 		if (pDock->container.bIsHorizontal)
 		{
@@ -498,7 +498,7 @@
 		//	0, 1, 8, 2, &pColorPts[0][0][0]);
 		glMap2f(GL_MAP2_COLOR_4, 0.0, 1.0, 4, 4,
 			0.0, 1.0, 16, 4, &colorPoints[0][0][0]);*/
-		glEvalMesh2(GL_FILL, 0, myConfig.iNbGridNodes, myConfig.iNbGridNodes*0, myConfig.iNbGridNodes*1);
+		glEvalMesh2(GL_FILL, 0, myConfig.iNbGridNodes, 0, myConfig.iNbGridNodes);
 		
 		/**glActiveTextureARB(GL_TEXTURE1_ARB);
 		glDisable(GL_TEXTURE_2D);

=== modified file 'Applets.stable'
--- Applets.stable	2011-09-26 12:56:12 +0000
+++ Applets.stable	2012-02-14 14:04:19 +0000
@@ -61,6 +61,8 @@
 Composite-Manager
 Impulse
 ###All other applets are considered to be either not enough functionnal, buggy/untested, or under heavy development.
+#Sound-Menu
+#Application-Menu
 #Scooby-Do
 #Network-Monitor
 #Disks

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-10-09 00:19:16 +0000
+++ CMakeLists.txt	2012-02-14 14:04:19 +0000
@@ -6,13 +6,14 @@
 include (CheckIncludeFiles)
 include (CheckFunctionExists)
 include (CheckSymbolExists)
+include ("${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/GNUInstallDirs.cmake")
 
 ########### project ###############
 
 project ("cairo-dock-plugins")
-set (VERSION "2.4.0~2")
+set (VERSION "3.0.0.0beta1")
 
-add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) # removed for stable versions: -Wstrict-prototypes #-Wunreachable-code -Wno-unused-parameter -Wall
+add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration -Wstrict-prototypes) # removed for stable versions: -Wstrict-prototypes #-Wunreachable-code -Wno-unused-parameter -Wall
 if (NOT ${CMAKE_BUILD_TYPE})
 	add_definitions (-O3)
 endif()
@@ -48,17 +49,27 @@
 
 # get plug-ins install dir
 execute_process(
-    COMMAND pkg-config gldi --variable=pluginsdir		# /usr/lib/cairo-dock
+    COMMAND pkg-config gldi --variable=pluginsdir  # /usr/lib/cairo-dock # or /usr/lib/x86_64-linux-gnu/cairo-dock
     OUTPUT_VARIABLE pluginsdir)
-STRING (REGEX REPLACE "\n" "" pluginsdir ${pluginsdir})  # la commande rajoute un retour chariot ...
+STRING (REGEX REPLACE "\n" "" pluginsdir ${pluginsdir})  # remove the \n
 # get plug-ins data dir
 execute_process(
-    COMMAND pkg-config gldi --variable=pluginsdatadir	# /usr/share/cairo-dock/plug-ins
+    COMMAND pkg-config gldi --variable=pluginsdatadir  # /usr/share/cairo-dock/plug-ins
     OUTPUT_VARIABLE pluginsdatadir)
 STRING (REGEX REPLACE "\n" "" pluginsdatadir ${pluginsdatadir})
+# get prefix dir
+execute_process(
+    COMMAND pkg-config gldi --variable=prefix  # /usr/share/cairo-dock/plug-ins
+    OUTPUT_VARIABLE prefix)
+STRING (REGEX REPLACE "\n" "" prefix ${prefix})
+# get GTK version (must be the same as the core, as GTK2 and GTK3 can't coexist at runtime)
+execute_process(
+    COMMAND pkg-config gldi --variable=gtkversion  # 2 or 3
+    OUTPUT_VARIABLE gtkversion)
+STRING (REGEX REPLACE "\n" "" gtkversion ${gtkversion})
 # check that version matches with the core
 execute_process(
-    COMMAND pkg-config --modversion gldi			# 2.2.0-3
+    COMMAND pkg-config --modversion gldi  # 2.2.0-3
     OUTPUT_VARIABLE dock_version)
 STRING (REGEX REPLACE "\n" "" dock_version ${dock_version})
 if (NOT "${dock_version}" STREQUAL "${VERSION}")		# Version
@@ -69,18 +80,13 @@
 	endif ()
 endif()
 
-#if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT "${FORCE_LIB64}" STREQUAL "")  # 64bits and force install in lib64
-#	set (libname "lib64")
-#else()
-#	set (libname "lib${LIB_SUFFIX}")
-#endif()
-#set (libdir "${CMAKE_INSTALL_PREFIX}/${libname}/cairo-dock")	# /usr/lib
-
 # check that installation dir matches with the core
-GET_FILENAME_COMPONENT(libdir "${pluginsdir}/.." ABSOLUTE)  # /usr/lib
-GET_FILENAME_COMPONENT(prefix "${pluginsdir}/../.." ABSOLUTE)  # /usr
-if (NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "${prefix}")
-	message (STATUS "It seems that the current CMAKE_INSTALL_PREFIX flag is not the same that you have used with the core.")
+GET_FILENAME_COMPONENT(libdir "${pluginsdir}/.." ABSOLUTE)  # /usr/lib # or /usr/lib/x86_64-linux-gnu
+GET_FILENAME_COMPONENT(datadir "${pluginsdatadir}/../.." ABSOLUTE)  # /usr/share
+if (NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "${prefix}"
+		OR NOT "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" STREQUAL "${libdir}"
+		OR NOT "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}" STREQUAL "${datadir}")
+	message (STATUS "It seems that the current CMAKE_INSTALL_{PREFIX,LIBDIR,DATAROOTDIR} flags are not the same that you have used with the core.")
 	message (STATUS " It will be replaced by this value: ${prefix}")
 	message (WARNING "Plug-ins should be installed in the same directory as the core, that is to say in ${pluginsdir}")
 	set (CMAKE_INSTALL_PREFIX "${prefix}")
@@ -89,8 +95,8 @@
 
 # set internationalisation
 set (GETTEXT_PLUGINS "cairo-dock-plugins")
-set (localedir "${CMAKE_INSTALL_PREFIX}/share/locale")
-set (gaugesdir "${CMAKE_INSTALL_PREFIX}/share/cairo-dock/gauges")
+set (localedir "${prefix}/${CMAKE_INSTALL_LOCALEDIR}")
+set (gaugesdir "${datadir}/cairo-dock/gauges")
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")  # additionnal FindPackage files
 
@@ -102,14 +108,16 @@
 
 message ("")
 message (STATUS "=====================")
-message (STATUS "Check dependancies...")
+message (STATUS "Check dependencies...")
 message (STATUS "=====================")
 message ("")
 
-pkg_check_modules ("PACKAGE" REQUIRED "gtk+-2.0" "gthread-2.0" "cairo" "librsvg-2.0" "dbus-1" "dbus-glib-1" "libxml-2.0" "gtkglext-1.0")
-pkg_check_modules ("GLDI" REQUIRED "gldi")  # we don't want to link with gldi
+pkg_check_modules ("PACKAGE" REQUIRED "cairo" "librsvg-2.0" "dbus-1" "dbus-glib-1" "libxml-2.0")
+#pkg_check_modules ("PACKAGE" REQUIRED "ig")
+pkg_check_modules ("GLDI" REQUIRED "gldi")  # we don't want to link with gldi, so we check it separately.
 set (PACKAGE_INCLUDE_DIRS "${GLDI_INCLUDE_DIRS}")
-#message (STATUS "PACKAGE: ${PACKAGE_INCLUDE_DIRS}")
+
+add_definitions (-DGTK_DISABLE_DEPRECATED="1")
 
 #############    GLIB    #################
 pkg_check_modules (GLIB glib-2.0)
@@ -119,6 +127,127 @@
 	STRING (REGEX REPLACE ".*\\." "" GLIB_NANO "${GLIB_VERSION}") # 2.28.3 => 3
 	STRING (REGEX REPLACE "-.*" "" GLIB_NANO "${GLIB_NANO}")
 
+############# INDICATOR-APPLET #################
+message (STATUS "> Indicator-Applet:")
+# Note: the names of dbusmenu-glib, dbusmenu-gtk and indicator have changed...
+set (DBUSMENU_MODULE dbusmenu-glib-0.4)
+pkg_check_modules (DBUSMENU ${DBUSMENU_MODULE})
+if (NOT "${DBUSMENU_FOUND}")
+	set (DBUSMENU_MODULE dbusmenu-glib)
+	pkg_check_modules (DBUSMENU ${DBUSMENU_MODULE})
+endif()
+
+if ("${gtkversion}" STREQUAL "2")
+	set (DBUSMENU_GTK_MODULE dbusmenu-gtk-0.4)
+else()
+	set (DBUSMENU_GTK_MODULE dbusmenu-gtk3-0.4)
+endif()
+pkg_check_modules (DBUSMENU_GTK ${DBUSMENU_GTK_MODULE})
+if (NOT "${DBUSMENU_GTK_FOUND}")
+	if ("${gtkversion}" STREQUAL "2")
+		set (DBUSMENU_GTK_MODULE dbusmenu-gtk)
+	else()
+		set (DBUSMENU_GTK_MODULE dbusmenu-gtk3)
+	endif()
+	pkg_check_modules (DBUSMENU_GTK ${DBUSMENU_GTK_MODULE})
+endif()
+
+if ("${gtkversion}" STREQUAL "2")
+	set (INDICATOR_APPLET_MODULE indicator-0.4)
+else()
+	set (INDICATOR_APPLET_MODULE indicator3-0.4)
+endif()
+pkg_check_modules (INDICATOR_APPLET ${INDICATOR_APPLET_MODULE})
+if ("${INDICATOR_APPLET_FOUND}" STREQUAL "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
+	set (INDICATOR_NEW_VERSION 1)  # oneiric and newer
+else()
+	if ("${gtkversion}" STREQUAL "2")
+		set (INDICATOR_APPLET_MODULE indicator)
+	else()
+		set (INDICATOR_APPLET_MODULE indicator3)
+	endif()
+	pkg_check_modules (INDICATOR_APPLET ${INDICATOR_APPLET_MODULE})
+	set (INDICATOR_APPLICATIONADDED_HAS_HINT 0)
+endif()
+
+if ("${gtkversion}" STREQUAL "2")
+	set (IDO_MODULE libido-0.1)
+else()
+	set (IDO_MODULE libido3-0.1)
+endif()
+pkg_check_modules (IDO ${IDO_MODULE})
+
+if ("${INDICATOR_APPLET_FOUND}" STREQUAL "1" AND "${DBUSMENU_FOUND}" STREQUAL "1" AND "${DBUSMENU_GTK_FOUND}" STREQUAL "1")
+	STRING (REGEX REPLACE "\\..*" "" DBUSMENU_MAJOR "${DBUSMENU_VERSION}")
+	STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" DBUSMENU_MINOR "${DBUSMENU_VERSION}")  # 0.1.7 => 1.7
+	STRING (REGEX REPLACE "\\.[0-9]*" "" DBUSMENU_MINOR "${DBUSMENU_MINOR}")
+	STRING (REGEX REPLACE ".*\\." "" DBUSMENU_NANO "${DBUSMENU_VERSION}")
+	STRING (REGEX REPLACE "-.*" "" DBUSMENU_NANO "${DBUSMENU_NANO}")
+
+	STRING (REGEX REPLACE "\\..*" "" DBUSMENU_GTK_MAJOR "${DBUSMENU_GTK_VERSION}")
+	STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" DBUSMENU_GTK_MINOR "${DBUSMENU_GTK_VERSION}")  # 0.1.7 => 1.7
+	STRING (REGEX REPLACE "\\.[0-9]*" "" DBUSMENU_GTK_MINOR "${DBUSMENU_GTK_MINOR}")
+	STRING (REGEX REPLACE ".*\\." "" DBUSMENU_GTK_NANO "${DBUSMENU_GTK_VERSION}")
+	STRING (REGEX REPLACE "-.*" "" DBUSMENU_GTK_NANO "${DBUSMENU_GTK_NANO}")
+
+	STRING (REGEX REPLACE "\\..*" "" INDICATOR_MAJOR "${INDICATOR_APPLET_VERSION}")
+	STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" INDICATOR_MINOR "${INDICATOR_APPLET_VERSION}")  # 0.1.7 => 1.7
+	STRING (REGEX REPLACE "\\.[0-9]*" "" INDICATOR_MINOR "${INDICATOR_MINOR}")
+	STRING (REGEX REPLACE ".*\\." "" INDICATOR_NANO "${INDICATOR_APPLET_VERSION}")
+	STRING (REGEX REPLACE "-.*" "" INDICATOR_NANO "${INDICATOR_NANO}")
+
+	if (${DBUSMENU_GTK_MAJOR} GREATER 0 OR ${DBUSMENU_GTK_MINOR} GREATER 5 OR (${DBUSMENU_GTK_MINOR} EQUAL 5 AND ${DBUSMENU_GTK_NANO} GREATER 89))
+		set (DBUSMENU_GTK3_NEW 1)
+	endif()
+
+	if ("${INDICATOR_NEW_VERSION}" STREQUAL "1")  # oneiric and newer
+		if ("${gtkversion}" STREQUAL "2")
+			execute_process(
+				COMMAND pkg-config --variable=iconsdir indicator-0.4
+				OUTPUT_VARIABLE INDICATORICONSDIR)
+		else()
+			execute_process(
+				COMMAND pkg-config --variable=iconsdir indicator3-0.4
+				OUTPUT_VARIABLE INDICATORICONSDIR)
+		endif()
+	else()
+		if ("${gtkversion}" STREQUAL "2")
+			execute_process(
+				COMMAND pkg-config --variable=iconsdir indicator
+				OUTPUT_VARIABLE INDICATORICONSDIR)
+		else()
+			execute_process(
+				COMMAND pkg-config --variable=iconsdir indicator3
+				OUTPUT_VARIABLE INDICATORICONSDIR)
+		endif()
+	endif()
+	STRING (REGEX REPLACE "\n" "" INDICATORICONSDIR ${INDICATORICONSDIR})  # la commande rajoute un retour chariot ...
+	add_subdirectory (Indicator-applet)
+	set (with_indicator "yes")
+else()
+	message (WARNING "These modules are required to compile Indicators applet (MeMenu, Messaging-Menu, Sound-Control, Status-Notifier and Global-Menu): ${INDICATOR_APPLET_MODULE}(-0.4), ${IDO_MODULE}, ${DBUSMENU_MODULE}(-0.4), ${DBUSMENU_GTK_MODULE}(-0.4)")
+	set (MODULES_MISSING "${MODULES_MISSING} ${INDICATOR_APPLET_MODULE}(-0.4) (${IDO_MODULE}) ${DBUSMENU_MODULE}(-0.4) ${DBUSMENU_GTK_MODULE}(-0.4)")
+endif()
+
+############# INDICATOR-NAME #################
+message (STATUS "> Indicator Names:")
+set (INDICATOR_OLD_NAMES 0)
+if ("${force_old_indicator_names}" STREQUAL "yes")
+	set (INDICATOR_OLD_NAMES 1)
+	message (STATUS "  Indicators: use old Ayatana Dbus names (forced)")
+#~ elseif ("${DISTRO_ID}" STREQUAL "Ubuntu")
+	#~ STRING (REGEX REPLACE "\\..*" "" DISTRO_RELEASE_MAJOR ${DISTRO_RELEASE})
+	#~ # message (STATUS "DISTRO_RELEASE_MAJOR: ${DISTRO_RELEASE_MAJOR}")
+	#~ if (${DISTRO_RELEASE_MAJOR} LESS 11)  # from 11.04, new names are used.
+		#~ set (INDICATOR_OLD_NAMES 1)
+		#~ message (STATUS "  Indicators: use old Ayatana Dbus names")
+	#~ endif()
+elseif ("${INDICATOR_APPLET_FOUND}" STREQUAL "1" AND NOT (${INDICATOR_MAJOR} GREATER 0 OR ${INDICATOR_MINOR} GREATER 3 OR (${INDICATOR_MINOR} EQUAL 3 AND ${INDICATOR_NANO} GREATER 20)))
+	set (INDICATOR_OLD_NAMES 1)  # maverick or older
+	message (STATUS "  Indicators: use old Ayatana Dbus names")
+endif()
+
 ############# ALSA_MIXER #################
 message (STATUS "> AlsaMixer:")
 set (with_alsa "no")
@@ -130,11 +259,15 @@
 		set (MODULES_MISSING "${MODULES_MISSING} alsa")
 	else()
 		set (GETTEXT_ALSA_MIXER ${GETTEXT_PLUGINS})
-		set (VERSION_ALSA_MIXER "1.1.1")
+		set (VERSION_ALSA_MIXER "2.0.0")
 		set (PACKAGE_ALSA_MIXER "cd-AlsaMixer")
 		set (with_alsa "yes")
 		set (alsa_mixerdatadir "${pluginsdatadir}/AlsaMixer")
 		configure_file (${CMAKE_CURRENT_SOURCE_DIR}/alsaMixer/data/AlsaMixer.conf.in ${CMAKE_CURRENT_BINARY_DIR}/alsaMixer/data/AlsaMixer.conf)
+		if ("${with_indicator}" STREQUAL "yes" AND "${IDO_FOUND}"
+			AND "${INDICATOR_OLD_NAMES}" STREQUAL "0")
+			set (with_soundmenu "yes")
+		endif()
 		add_subdirectory ("alsaMixer")
 	endif()
 endif()
@@ -151,7 +284,7 @@
 ############# CAIRO_PENGUIN #################
 message (STATUS "> Cairo Penguin:")
 set (GETTEXT_CAIRO_PENGUIN ${GETTEXT_PLUGINS})
-set (VERSION_CAIRO_PENGUIN "1.1.9")
+set (VERSION_CAIRO_PENGUIN "1.1.10")
 set (PACKAGE_CAIRO_PENGUIN "cd-Cairo-Penguin")
 set (cairo_penguinuserdirname "Cairo-Penguin")
 set (cairo_penguindatadir "${pluginsdatadir}/Cairo-Penguin")
@@ -161,7 +294,7 @@
 ############# CLIPPER #################
 message (STATUS "> Clipper:")
 set (GETTEXT_CLIPPER ${GETTEXT_PLUGINS})
-set (VERSION_CLIPPER "1.1.5")
+set (VERSION_CLIPPER "1.1.6")
 set (PACKAGE_CLIPPER "cd-Clipper")
 set (Clipperdatadir "${pluginsdatadir}/Clipper")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Clipper/data/Clipper.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Clipper/data/Clipper.conf)
@@ -178,7 +311,7 @@
 	set (MODULES_MISSING "${MODULES_MISSING} libical")
 endif()
 set (GETTEXT_CLOCK ${GETTEXT_PLUGINS})
-set (VERSION_CLOCK "2.1.4")
+set (VERSION_CLOCK "2.1.5")
 set (PACKAGE_CLOCK "cd-clock")
 set (clockuserdirname "clock")
 set (clockdatadir "${pluginsdatadir}/clock")
@@ -188,7 +321,7 @@
 ############# COMPOSITE_MANAGER #################
 message (STATUS "> Composite Manager:")
 set (GETTEXT_COMPOSITE_MANAGER ${GETTEXT_PLUGINS})
-set (VERSION_COMPOSITE_MANAGER "1.0.0")
+set (VERSION_COMPOSITE_MANAGER "1.0.1")
 set (PACKAGE_COMPOSITE_MANAGER "cd-Composite-Manager")
 set (composite_managerdatadir "${pluginsdatadir}/Composite-Manager")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Composite-Manager/data/Composite-Manager.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Composite-Manager/data/Composite-Manager.conf)
@@ -197,7 +330,10 @@
 ############# DBUS #################
 message (STATUS "> DBus:")
 message (STATUS " * Python:")
-find_program (PYTHON_EXECUTABLE python)
+find_program (PYTHON_EXECUTABLE python2)  # if python v3 is the default python interpreter (e.g. on ArchLinux), python2 program should exist and we have to use it...
+if ("${PYTHON_EXECUTABLE}" STREQUAL "" OR NOT EXISTS ${PYTHON_EXECUTABLE})
+	find_program (PYTHON_EXECUTABLE python)
+endif()
 EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print sys.version" OUTPUT_VARIABLE PYTHON_VERSION)
 if ("${PYTHON_VERSION}" STREQUAL "")
 	message (STATUS "Could not find Python, won't install Python interface.")
@@ -207,6 +343,7 @@
 else()
 	STRING (REGEX REPLACE "\n" "" PYTHON_VERSION ${PYTHON_VERSION})
 	message (STATUS "   Python Version: ${PYTHON_VERSION}")
+	message (STATUS "   Python executable program: ${PYTHON_EXECUTABLE}")
 	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'")
@@ -256,7 +393,7 @@
 endif()
 
 message (STATUS " * Vala:")
-# Valac is only riquired to convert vala files to C files.
+# Valac is only required 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")
@@ -265,10 +402,11 @@
 
 if ("${WITH_VALA}" STREQUAL "no")
 	set (with_vala "no")
-# >= Glib 2.26
+# Glib < 2.26
 elseif (${GLIB_MAJOR} LESS 3 AND ${GLIB_MINOR} LESS 26)
 	set (with_vala "no")
-elseif (NOT "${VALAC_EXE}" STREQUAL "VALAC_EXE-NOTFOUND") # now it works with 0.10 and 0.11 (= next 0.12)
+elseif ( (NOT "${VALAC_EXE}" STREQUAL "VALAC_EXE-NOTFOUND")
+	AND (EXISTS ${VALAC_EXE}) ) # now it works with 0.10 and 0.11 (= next 0.12) # $VALAC_EXE may be the correct path, even if valac is not installed !
 	execute_process(COMMAND ${VALAC_EXE} "--version"
 		OUTPUT_VARIABLE "VALA_VERSION")
 	string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION})
@@ -296,7 +434,7 @@
 	endif()
 else()
 	message (STATUS "Could not find ValaC, won't build Vala interface with the version of your distribution.")
-	message (WARNING "This program is required to compile DBus applet with Python interface: valac (version > 0.10)")
+	message (WARNING "This program is required to compile DBus applet with Vala interface: valac (version > 0.10)")
 	set (PROGRAMS_MISSING "${PROGRAMS_MISSING} valac")
 endif()
 
@@ -331,7 +469,7 @@
 if ("${enable-disks}" STREQUAL "yes")
 	message (STATUS "> Disks:")
 	set (GETTEXT_DISKS ${GETTEXT_PLUGINS})
-	set (VERSION_DISKS "0.0.3")
+	set (VERSION_DISKS "0.0.4")
 	set (PACKAGE_DISKS "cd-disks")
 	set (with_disks "yes")
 	set (disksdatadir "${pluginsdatadir}/Disks")
@@ -342,7 +480,7 @@
 ############# DND2SHARE #################
 message (STATUS "> DND2Share:")
 set (GETTEXT_DND2SHARE ${GETTEXT_PLUGINS})
-set (VERSION_DND2SHARE "1.0.6")
+set (VERSION_DND2SHARE "1.0.7")
 set (PACKAGE_DND2SHARE "cd-dnd2share")
 set (dnd2sharedatadir "${pluginsdatadir}/dnd2share")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/dnd2share/data/dnd2share.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dnd2share/data/dnd2share.conf)
@@ -362,7 +500,7 @@
 if ("${enable-doncky}" STREQUAL "yes")
 	message (STATUS "> Doncky:")
 	set (GETTEXT_DONCKY ${GETTEXT_PLUGINS})
-	set (VERSION_DONCKY "0.0.5")
+	set (VERSION_DONCKY "0.0.6")
 	set (PACKAGE_DONCKY "cd-doncky")
 	set (with_doncky "yes")
 	set (donckydatadir "${pluginsdatadir}/Doncky")
@@ -373,7 +511,7 @@
 ############# DROP INDICATOR #################
 message (STATUS "> Drop Indicator:")
 set (GETTEXT_DROP_INDICATOR ${GETTEXT_PLUGINS})
-set (VERSION_DROP_INDICATOR "1.1.4")
+set (VERSION_DROP_INDICATOR "1.1.5")
 set (PACKAGE_DROP_INDICATOR "cd-drop_indicator")
 set (drop_indicatordatadir "${pluginsdatadir}/drop-indicator")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/drop-indicator/data/drop_indicator.conf.in ${CMAKE_CURRENT_BINARY_DIR}/drop-indicator/data/drop_indicator.conf)
@@ -382,7 +520,7 @@
 ############# DUSTBIN #################
 message (STATUS "> Dustbin:")
 set (GETTEXT_DUSTBIN ${GETTEXT_PLUGINS})
-set (VERSION_DUSTBIN "2.3.2")
+set (VERSION_DUSTBIN "2.3.3")
 set (PACKAGE_DUSTBIN "cd-dustbin")
 set (dustbinuserdirname "dustbin")
 set (dustbindatadir "${pluginsdatadir}/dustbin")
@@ -392,7 +530,7 @@
 ############# FOLDERS #################
 message (STATUS "> Folders:")
 set (GETTEXT_FOLDERS ${GETTEXT_PLUGINS})
-set (VERSION_FOLDERS "0.2.2")
+set (VERSION_FOLDERS "0.2.3")
 set (PACKAGE_FOLDERS "cd-Folders")
 set (foldersdatadir "${pluginsdatadir}/Folders")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Folders/data/Folders.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Folders/data/Folders.conf)
@@ -402,14 +540,20 @@
 message (STATUS "> GMenu:")
 set (with_gmenu "no")
 if (NOT "${enable-gmenu}" STREQUAL "no")
-	pkg_check_modules (GMENU_PACKAGE libgnome-menu)
+	if ("${gtkversion}" STREQUAL "2")
+		set (GMENU_MODULE libgnome-menu)
+	else()
+		set (GMENU_MODULE libgnome-menu)
+		# set (GMENU_MODULE libgnome-menu-3.0) # TODO
+	endif()
+	pkg_check_modules (GMENU_PACKAGE ${GMENU_MODULE})
 	if ("${GMENU_PACKAGE_FOUND}" STREQUAL "")
-		message (STATUS "Could not find libgnome-menu; Cairo-Dock won't be built with GMenu applet.")
-		message (WARNING "This module is required to compile GMenu applet: libgnome-menu")
-		set (MODULES_MISSING "${MODULES_MISSING} libgnome-menu")
+		message (STATUS "Could not find ${GMENU_MODULE}; Cairo-Dock won't be built with GMenu applet.")
+		message (WARNING "This module is required to compile GMenu applet: ${GMENU_MODULE}")
+		set (MODULES_MISSING "${MODULES_MISSING} ${GMENU_MODULE}")
 	else()
 		set (GETTEXT_GMENU ${GETTEXT_PLUGINS})
-		set (VERSION_GMENU "1.1.8")
+		set (VERSION_GMENU "1.1.9")
 		set (PACKAGE_GMENU "cd-GMenu")
 		set (with_gmenu "yes")
 		set (gmenudatadir "${pluginsdatadir}/GMenu")
@@ -472,14 +616,15 @@
 ############# IMPULSE #################
 set (with_impulse "no")
 message (STATUS "> Impulse:")
-pkg_check_modules (IMPULSE_PACKAGES libpulse fftw3)
-if ("${IMPULSE_PACKAGES_FOUND}" STREQUAL "")
+pkg_check_modules (LIBPULSE libpulse)
+pkg_check_modules (FFTW3 fftw3)  # optional, not advised for distributions packages (it's not a small dependence...)
+if ("${LIBPULSE_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")
+	message (WARNING "These modules are required to compile Impulse applet: libpulse (and fftw3 - optional)")
+	set (MODULES_MISSING "${MODULES_MISSING} libpulse")
 else()
 	set (GETTEXT_IMPULSE ${GETTEXT_PLUGINS})
-	set (VERSION_IMPULSE "0.0.3")
+	set (VERSION_IMPULSE "0.0.4")
 	set (PACKAGE_IMPULSE "cd-Impulse")
 	set (with_impulse "yes")
 	set (impulsedatadir "${pluginsdatadir}/Impulse")
@@ -487,61 +632,6 @@
 	add_subdirectory (Impulse)
 endif()
 
-############# INDICATOR-APPLET #################
-message (STATUS "> Indicator-Applet:")
-# Note: the names of dbusmenu-glib, dbusmenu-gtk and indicator have changed...
-pkg_check_modules (DBUSMENU_04 QUIET dbusmenu-glib-0.4)
-pkg_check_modules (DBUSMENU_GTK_04 QUIET dbusmenu-gtk-0.4)
-pkg_check_modules (INDICATOR_04 QUIET indicator-0.4)
-if ("${DBUSMENU_04_FOUND}" STREQUAL "1")
-	pkg_check_modules (DBUSMENU dbusmenu-glib-0.4)
-else()
-	pkg_check_modules (DBUSMENU dbusmenu-glib)
-endif()
-if ("${DBUSMENU_GTK_04_FOUND}" STREQUAL "1")
-	pkg_check_modules (DBUSMENU_GTK dbusmenu-gtk-0.4)
-else()
-	pkg_check_modules (DBUSMENU_GTK dbusmenu-gtk)
-endif()
-if ("${INDICATOR_04_FOUND}" STREQUAL "1")
-	pkg_check_modules (INDICATOR_APPLET indicator-0.4 libido-0.1)
-	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")
-	#message (STATUS "DBUSMENU_VERSION : ${DBUSMENU_VERSION}")
-
-	STRING (REGEX REPLACE "\\..*" "" DBUSMENU_MAJOR "${DBUSMENU_VERSION}")
-	# message (STATUS "DBUSMENU_MAJOR : ${DBUSMENU_MAJOR}")
-
-	STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" DBUSMENU_MINOR "${DBUSMENU_VERSION}")  # 0.1.7 => 1.7
-	STRING (REGEX REPLACE "\\.[0-9]*" "" DBUSMENU_MINOR "${DBUSMENU_MINOR}")
-	# message (STATUS "DBUSMENU_MINOR : ${DBUSMENU_MINOR}")
-
-	STRING (REGEX REPLACE ".*\\." "" DBUSMENU_NANO "${DBUSMENU_VERSION}")
-	STRING (REGEX REPLACE "-.*" "" DBUSMENU_NANO "${DBUSMENU_NANO}")
-	# message (STATUS "DBUSMENU_NANO  : ${DBUSMENU_NANO}")
-
-	if ("${INDICATOR_04_FOUND}" STREQUAL "1")
-		execute_process(
-			COMMAND pkg-config --variable=iconsdir indicator-0.4
-			OUTPUT_VARIABLE INDICATORICONSDIR)
-	else()
-		execute_process(
-			COMMAND pkg-config --variable=iconsdir indicator
-			OUTPUT_VARIABLE INDICATORICONSDIR)
-	endif()
-	STRING (REGEX REPLACE "\n" "" INDICATORICONSDIR ${INDICATORICONSDIR})  # la commande rajoute un retour chariot ...
-	add_subdirectory (Indicator-applet)
-	set (with_indicator "yes")
-else()
-	message (WARNING "These modules are required to compile Indicators applet (MeMenu and Messaging-Menu): indicator(-0.4), libido-0.1, dbusmenu-glib(-0.4), dbusmenu-gtk(-0.4)")
-	set (MODULES_MISSING "${MODULES_MISSING} indicator(-0.4) libido-0.1 dbusmenu-glib(-0.4) dbusmenu-gtk(-0.4)")
-endif()
-
 ############# ILLUSION #################
 message (STATUS "> Illusion:")
 set (GETTEXT_ILLUSION ${GETTEXT_PLUGINS})
@@ -638,7 +728,7 @@
 	set (MODULES_MISSING "${MODULES_MISSING} libxklavier")
 else()
 	set (GETTEXT_KEYBOARD_INDICATOR ${GETTEXT_PLUGINS})
-	set (VERSION_KEYBOARD_INDICATOR "1.1.4")
+	set (VERSION_KEYBOARD_INDICATOR "1.1.5")
 	set (PACKAGE_KEYBOARD_INDICATOR "cd-keyboard-indicator")
 	set (with_keyboard_indicator "yes")
 	set (keyboard_indicatordatadir "${pluginsdatadir}/keyboard-indicator")
@@ -658,7 +748,7 @@
 	set (MODULES_MISSING "${MODULES_MISSING} upower-glib")
 endif()
 set (GETTEXT_LOGOUT ${GETTEXT_PLUGINS})
-set (VERSION_LOGOUT "1.2.11")
+set (VERSION_LOGOUT "2.0.0")
 set (PACKAGE_LOGOUT "cd-logout")
 set (logoutdatadir "${pluginsdatadir}/logout")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/logout/data/logout.conf.in ${CMAKE_CURRENT_BINARY_DIR}/logout/data/logout.conf)
@@ -672,10 +762,13 @@
 execute_process(
 	COMMAND ${LIBETPAN_CONFIG_EXECUTABLE} --cflags
 	OUTPUT_VARIABLE MAIL_PACKAGE_CFLAGS)
-if (NOT "${MAIL_PACKAGE_CFLAGS}" STREQUAL "") # if there is a problem with the previous, we don't want to have a lot of errors
-	STRING (REGEX MATCHALL "-I[^ ]+ " TMP_VARIABLE "${MAIL_PACKAGE_CFLAGS}") # first extract the "-I" options
+if (NOT "${MAIL_PACKAGE_CFLAGS}" STREQUAL "" AND NOT "${MAIL_PACKAGE_CFLAGS}" STREQUAL "\n") # if there is a problem with the previous, we don't want to have a lot of errors
+	STRING (REGEX REPLACE "\n" "" TMP_VARIABLE "${MAIL_PACKAGE_CFLAGS}") # to not skip the last option
+	STRING (REGEX MATCHALL "(^| )-I[^ ]+( |$)" TMP_VARIABLE "${TMP_VARIABLE}") # first extract the "-I" options
 	STRING (REGEX REPLACE ";" "" TMP_VARIABLE "${TMP_VARIABLE}")
 	STRING (REGEX REPLACE " $" "" TMP_VARIABLE "${TMP_VARIABLE}")
+	STRING (REGEX REPLACE "^ " "" TMP_VARIABLE "${TMP_VARIABLE}")
+	STRING (REGEX REPLACE "  " " " TMP_VARIABLE "${TMP_VARIABLE}")
 	STRING (REGEX REPLACE "-I([^ ]+)" "\\1" MAIL_PACKAGE_INCLUDE_DIRS "${TMP_VARIABLE}")  # then remove the "-I" string
 endif()
 # find the link flags
@@ -683,14 +776,19 @@
 	COMMAND ${LIBETPAN_CONFIG_EXECUTABLE} --libs
 	OUTPUT_VARIABLE MAIL_PACKAGE_LIBS)
 if (NOT "${MAIL_PACKAGE_LIBS}" STREQUAL "")
+	STRING (REGEX REPLACE "\n" "" MAIL_PACKAGE_LIBS "${MAIL_PACKAGE_LIBS}")
 	#   find the link libraries
-	STRING (REGEX MATCHALL "-l[^ ]+ " TMP_VARIABLE "${MAIL_PACKAGE_LIBS}") # extract the "-l" options
+	STRING (REGEX MATCHALL "(^| )-l[^ ]+( |$)" TMP_VARIABLE "${MAIL_PACKAGE_LIBS}") # extract the "-l" options (only if it's separated by two blank spaces or the end/beginning of the line => -L/usr/lib/x86_64-linux-gnu)
 	STRING (REGEX REPLACE ";" "" TMP_VARIABLE "${TMP_VARIABLE}")
+	STRING (REGEX REPLACE "^ " "" TMP_VARIABLE "${TMP_VARIABLE}")
+	STRING (REGEX REPLACE "  " " " TMP_VARIABLE "${TMP_VARIABLE}")
 	STRING (REGEX REPLACE " $" "" MAIL_PACKAGE_LIBRARIES "${TMP_VARIABLE}")
 	#   find the link directories
-	STRING (REGEX MATCHALL "-L[^ ]+ " TMP_VARIABLE "${MAIL_PACKAGE_LIBS}") # extract the "-L" options
+	STRING (REGEX MATCHALL "(^| )-L[^ ]+( |$)" TMP_VARIABLE "${MAIL_PACKAGE_LIBS}") # extract the "-L" options
 	STRING (REGEX REPLACE ";" "" TMP_VARIABLE "${TMP_VARIABLE}")
 	STRING (REGEX REPLACE " $" "" TMP_VARIABLE "${TMP_VARIABLE}")
+	STRING (REGEX REPLACE "^ " "" TMP_VARIABLE "${TMP_VARIABLE}")
+	STRING (REGEX REPLACE "  " " " TMP_VARIABLE "${TMP_VARIABLE}")
 	STRING (REGEX REPLACE "-L([^ ]+)" "\\1" MAIL_PACKAGE_LIBRARY_DIRS "${TMP_VARIABLE}")  # then remove the "-L" string
 endif()
 if ("${MAIL_PACKAGE_LIBS}" STREQUAL "")
@@ -703,7 +801,7 @@
 	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 (VERSION_MAIL "1.0.10")
 	set (PACKAGE_MAIL "cd-mail")
 	set (maildatadir "${pluginsdatadir}/mail")
 	set (with_mail "yes")
@@ -754,29 +852,27 @@
 	message (STATUS "  DISTRO_ID: ${DISTRO_ID}, DISTRO_RELEASE: ${DISTRO_RELEASE}")
 endif()
 
-############# INDICATOR_NAME #################
-message (STATUS "> Indicator Names:")
-set (INDICATOR_OLD_NAMES 0)
-if ("${force_old_indicator_names}" STREQUAL "yes")
-	set (INDICATOR_OLD_NAMES 1)
-	message (STATUS "  Indicators: use old Ayatana Dbus names (forced)")
-elseif ("${DISTRO_ID}" STREQUAL "Ubuntu")
-	STRING (REGEX REPLACE "\\..*" "" DISTRO_RELEASE_MAJOR ${DISTRO_RELEASE})
-	# message (STATUS "DISTRO_RELEASE_MAJOR: ${DISTRO_RELEASE_MAJOR}")
-	if (${DISTRO_RELEASE_MAJOR} LESS 11)  # from 11.04, new names are used.
-		set (INDICATOR_OLD_NAMES 1)
-		message (STATUS "  Indicators: use old Ayatana Dbus names")
-	endif()
+############# GLOBAL-MENU #################
+set (with_global_menu "no")
+if ("${enable-global-menu}" STREQUAL "yes" AND "${INDICATOR_OLD_NAMES}" STREQUAL "0" AND "${DBUSMENU_FOUND}" AND "${DBUSMENU_GTK_FOUND}")  # currently only supported with new name of the indicator module and with newer version of dbusmenu
+	message (STATUS "> Global-Menu:")
+	set (GETTEXT_GLOBAL_MENU ${GETTEXT_PLUGINS})
+	set (VERSION_GLOBAL_MENU "0.1.0")
+	set (PACKAGE_GLOBAL_MENU "cd-Global-Menu")
+	set (with_global_menu "yes")
+	set (global_menudatadir "${pluginsdatadir}/Global-Menu")
+	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Global-Menu/data/Global-Menu.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Global-Menu/data/Global-Menu.conf)
+	add_subdirectory (Global-Menu)
 endif()
 
 ############# MEMENU #################
 set (with_me_menu "no")
-if ("${INDICATOR_04_FOUND}" STREQUAL "1")
-	message (STATUS "> MeMenu: this applet has been automatically merged with Messaging-Menu")
-elseif ("${with_indicator}" STREQUAL "yes")
+if ("${INDICATOR_NEW_VERSION}" STREQUAL "1" AND NOT "${enable-memenu}" STREQUAL "yes")
+	message (STATUS "> MeMenu: this applet has been automatically merged with Messaging-Menu")  # oneiric or newer
+elseif ("${with_indicator}" STREQUAL "yes" AND "${IDO_FOUND}")
 	message (STATUS "> MeMenu:")
 	set (GETTEXT_MEMENU ${GETTEXT_PLUGINS})
-	set (VERSION_MEMENU "1.0.2")
+	set (VERSION_MEMENU "1.0.3")
 	set (PACKAGE_MEMENU "cd-MeMenu")
 	set (memenudatadir "${pluginsdatadir}/MeMenu")
 	set (with_me_menu "yes")
@@ -789,7 +885,7 @@
 if ("${with_indicator}" STREQUAL "yes") 
 	message (STATUS "> Messaging-Menu:")
 	set (GETTEXT_MESSAGING_MENU ${GETTEXT_PLUGINS})
-	set (VERSION_MESSAGING_MENU "1.0.2")
+	set (VERSION_MESSAGING_MENU "1.0.3")
 	set (PACKAGE_MESSAGING_MENU "cd-Messaging-Menu")
 	set (with_messaging_menu "yes")
 	set (messaging_menudatadir "${pluginsdatadir}/Messaging-Menu")
@@ -809,7 +905,7 @@
 ############# MUSICPLAYER #################
 message (STATUS "> MusicPlayer:")
 set (GETTEXT_MUSICPLAYER ${GETTEXT_PLUGINS})
-set (VERSION_MUSICPLAYER "1.1.0")
+set (VERSION_MUSICPLAYER "2.0.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)
@@ -818,7 +914,7 @@
 ############# NETSPEED #################
 message (STATUS "> NetSpeed:")
 set (GETTEXT_NETSPEED ${GETTEXT_PLUGINS})
-set (VERSION_NETSPEED "1.2.7")
+set (VERSION_NETSPEED "1.2.8")
 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)
@@ -829,7 +925,7 @@
 if ("${enable-network-monitor}" STREQUAL "yes")
 	message (STATUS "> Network Monitor:")
 	set (GETTEXT_NETWORK_MONITOR ${GETTEXT_PLUGINS})
-	set (VERSION_NETWORK_MONITOR "0.2.5")
+	set (VERSION_NETWORK_MONITOR "0.2.6")
 	set (PACKAGE_NETWORK_MONITOR "cd-network-monitor")
 	set (with_network_monitor "yes")
 	set (network_monitordatadir "${pluginsdatadir}/Network-Monitor")
@@ -840,7 +936,7 @@
 ############# POWERMANAGER #################
 message (STATUS "> PowerManager:")
 set (GETTEXT_POWERMANAGER ${GETTEXT_PLUGINS})
-set (VERSION_POWERMANAGER "1.3.7")
+set (VERSION_POWERMANAGER "1.3.8")
 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)
@@ -849,7 +945,7 @@
 ############# QUICK BROWSER #################
 message (STATUS "> Quick Browser:")
 set (GETTEXT_QUICK_BROWSER ${GETTEXT_PLUGINS})
-set (VERSION_QUICK_BROWSER "1.0.9")
+set (VERSION_QUICK_BROWSER "1.0.10")
 set (PACKAGE_QUICK_BROWSER "cd-quick-browser")
 set (quick_browserdatadir "${pluginsdatadir}/quick_browser")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/quick-browser/data/quick-browser.conf.in ${CMAKE_CURRENT_BINARY_DIR}/quick-browser/data/quick-browser.conf)
@@ -865,7 +961,7 @@
 	set (MODULES_MISSING "${MODULES_MISSING} zeitgeist-1.0")
 else()
 	set (GETTEXT_RECENT_EVENTS ${GETTEXT_PLUGINS})
-	set (VERSION_RECENT_EVENTS "1.0.0")
+	set (VERSION_RECENT_EVENTS "1.0.1")
 	set (PACKAGE_RECENT_EVENTS "cd-Recent-Events")
 	set (with_recent_events "yes")
 	set (recent_eventsdatadir "${pluginsdatadir}/Recent-Events")
@@ -876,7 +972,7 @@
 ############# REMOTE_CONTROL #################
 message (STATUS "> Remote Control:")
 set (GETTEXT_REMOTE_CONTROL ${GETTEXT_PLUGINS})
-set (VERSION_REMOTE_CONTROL "0.0.2")
+set (VERSION_REMOTE_CONTROL "1.0.0")
 set (PACKAGE_REMOTE_CONTROL "cd-Remote-Control")
 set (remote_controldatadir "${pluginsdatadir}/Remote-Control")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Remote-Control/data/Remote-Control.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Remote-Control/data/Remote-Control.conf)
@@ -885,7 +981,7 @@
 ############# RSSREADER #################
 message (STATUS "> RSSreader:")
 set (GETTEXT_RSS_READER ${GETTEXT_PLUGINS})
-set (VERSION_RSS_READER "1.0.4")
+set (VERSION_RSS_READER "1.0.5")
 set (PACKAGE_RSS_READER "cd-rssreader")
 set (rss_readerdatadir "${pluginsdatadir}/RSSreader")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/RSSreader/data/RSSreader.conf.in ${CMAKE_CURRENT_BINARY_DIR}/RSSreader/data/RSSreader.conf)
@@ -904,14 +1000,14 @@
 	add_subdirectory (Scooby-Do)
 endif()
 
-############# SHARED-IMAGES #################
-set (shared_imagesdatadir "${pluginsdatadir}/shared-images")
-add_subdirectory (shared-images)
+############# SHARED-FILES #################
+set (shared_filesdatadir "${pluginsdatadir}/shared-files")
+add_subdirectory (shared-files)
 
 ############# SHORTCUTS #################
 message (STATUS "> Shortcuts:")
 set (GETTEXT_SHORTCUTS ${GETTEXT_PLUGINS})
-set (VERSION_SHORTCUTS "1.3.2")
+set (VERSION_SHORTCUTS "1.3.3")
 set (PACKAGE_SHORTCUTS "cd-shortcuts")
 set (shortcutsdatadir "${pluginsdatadir}/shortcuts")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/shortcuts/data/shortcuts.conf.in ${CMAKE_CURRENT_BINARY_DIR}/shortcuts/data/shortcuts.conf)
@@ -928,7 +1024,7 @@
 	set (with_xrandr "no")
 endif()
 set (GETTEXT_SHOW_DESKTOP ${GETTEXT_PLUGINS})
-set (VERSION_SHOW_DESKTOP "1.2.5")
+set (VERSION_SHOW_DESKTOP "1.2.6")
 set (PACKAGE_SHOW_DESKTOP "cd-showDesktop")
 set (show_desktopdatadir "${pluginsdatadir}/showDesktop")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/showDesktop/data/showDesktop.conf.in ${CMAKE_CURRENT_BINARY_DIR}/showDesktop/data/showDesktop.conf)
@@ -954,7 +1050,7 @@
 	set (with_exif "no")
 endif()
 set (GETTEXT_SLIDER ${GETTEXT_PLUGINS})
-set (VERSION_SLIDER "2.0.10")
+set (VERSION_SLIDER "2.0.11")
 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)
@@ -963,7 +1059,7 @@
 ############# STACK #################
 message (STATUS "> Stack:")
 set (GETTEXT_STACK ${GETTEXT_PLUGINS})
-set (VERSION_STACK "0.3.2")
+set (VERSION_STACK "0.3.3")
 set (PACKAGE_STACK "cd-stack")
 set (stackdatadir "${pluginsdatadir}/stack")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/stack/data/stack.conf.in ${CMAKE_CURRENT_BINARY_DIR}/stack/data/stack.conf)
@@ -973,7 +1069,7 @@
 message (STATUS "> Status Notifier:")
 if ("${DBUSMENU_GTK_FOUND}" STREQUAL "")
 	message (STATUS "Could not find Status-Notifier libs; Cairo-Dock won't be built with Status-Notifier support.")
-	message (WARNING "This module is required to compile Status Notifier applet: dbusmenu-gtk(-0.4)")
+	message (WARNING "This module is required to compile Status Notifier applet: ${DBUSMENU_GTK_MODULE}(-0.4)")
 	# set (MODULES_MISSING "${MODULES_MISSING} dbusmenu-gtk(-0.4)") # it should already be in the list.
 	set (with_status_notifier "no")
 else()
@@ -984,7 +1080,7 @@
 	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 (VERSION_STATUS_NOTIFIER "0.1.5")
 	set (PACKAGE_STATUS_NOTIFIER "cd-status-notifier")
 	set (with_status_notifier "yes")
 	set (status_notifierdatadir "${pluginsdatadir}/Status-Notifier")
@@ -995,7 +1091,7 @@
 ############# SWITCHER #################
 message (STATUS "> Switcher:")
 set (GETTEXT_SWITCHER ${GETTEXT_PLUGINS})
-set (VERSION_SWITCHER "2.1.7")
+set (VERSION_SWITCHER "2.1.8")
 set (PACKAGE_SWITCHER "cd-switcher")
 set (switcherdatadir "${pluginsdatadir}/switcher")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/switcher/data/switcher.conf.in ${CMAKE_CURRENT_BINARY_DIR}/switcher/data/switcher.conf)
@@ -1012,7 +1108,7 @@
 	set (with_sensors "no")
 endif()
 set (GETTEXT_SYSTEM_MONITOR ${GETTEXT_PLUGINS})
-set (VERSION_SYSTEM_MONITOR "1.0.9")
+set (VERSION_SYSTEM_MONITOR "1.0.10")
 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)
@@ -1021,7 +1117,7 @@
 ############# SYSTRAY #################
 message (STATUS "> Systray:")
 set (GETTEXT_SYSTRAY ${GETTEXT_PLUGINS})
-set (VERSION_SYSTRAY "0.2.3")
+set (VERSION_SYSTRAY "0.2.4")
 set (PACKAGE_SYSTRAY "cd-systray")
 set (systraydatadir "${pluginsdatadir}/systray")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/systray/data/systray.conf.in ${CMAKE_CURRENT_BINARY_DIR}/systray/data/systray.conf)
@@ -1029,15 +1125,20 @@
 
 ############# TERMINAL #################
 message (STATUS "> Terminal:")
-pkg_check_modules (TERMINAL_PACKAGE vte)
+if ("${gtkversion}" STREQUAL "2")
+	set (TERMINAL_MODULE vte)
+else()
+	set (TERMINAL_MODULE vte-2.90)
+endif()
+pkg_check_modules (TERMINAL_PACKAGE ${TERMINAL_MODULE})
 if ("${TERMINAL_PACKAGE_FOUND}" STREQUAL "")
-	message (STATUS "Could not find libvte; Cairo-Dock won't be built with terminal applet.")
-	message (WARNING "This module is required to compile Terminal applet: vte")
-	set (MODULES_MISSING "${MODULES_MISSING} vte")
+	message (STATUS "Could not find ${TERMINAL_MODULE}; Cairo-Dock won't be built with terminal applet.")
+	message (WARNING "This module is required to compile Terminal applet: ${TERMINAL_MODULE}")
+	set (MODULES_MISSING "${MODULES_MISSING} ${TERMINAL_MODULE}")
 	set (with_terminal "no")
 else()
 	set (GETTEXT_TERMINAL ${GETTEXT_PLUGINS})
-	set (VERSION_TERMINAL "1.0.11")
+	set (VERSION_TERMINAL "1.0.12")
 	set (PACKAGE_TERMINAL "cd-terminal")
 	set (with_terminal "yes")
 	set (terminaldatadir "${pluginsdatadir}/terminal")
@@ -1048,7 +1149,7 @@
 ############# TOMBOY #################
 message (STATUS "> Tomboy:")
 set (GETTEXT_TOMBOY ${GETTEXT_PLUGINS})
-set (VERSION_TOMBOY "1.3.2")
+set (VERSION_TOMBOY "1.3.3")
 set (PACKAGE_TOMBOY "cd-tomboy")
 set (tomboydatadir "${pluginsdatadir}/tomboy")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/tomboy/data/tomboy.conf.in ${CMAKE_CURRENT_BINARY_DIR}/tomboy/data/tomboy.conf)
@@ -1057,7 +1158,7 @@
 ############# TOONS #################
 message (STATUS "> Toons:")
 set (GETTEXT_TOONS ${GETTEXT_PLUGINS})
-set (VERSION_TOONS "1.0.10")
+set (VERSION_TOONS "1.0.11")
 set (PACKAGE_TOONS "cd-Toons")
 set (toonsdatadir "${pluginsdatadir}/Toons")
 set (toonsuserdirname "Toons")
@@ -1067,7 +1168,7 @@
 ############# WEATHER #################
 message (STATUS "> Weather:")
 set (GETTEXT_WEATHER ${GETTEXT_PLUGINS})
-set (VERSION_WEATHER "1.2.11")
+set (VERSION_WEATHER "1.2.12")
 set (PACKAGE_WEATHER "cd-weather")
 set (weatherdatadir "${pluginsdatadir}/weather")
 set (weatheruserdirname "weather")
@@ -1078,14 +1179,19 @@
 message (STATUS "> Weblets:")
 set (with_weblets "no")
 if (NOT "${enable-weblets}" STREQUAL "no")
-	pkg_check_modules (WEBKIT webkit-1.0)
+	if ("${gtkversion}" STREQUAL "2")
+		set (WEBKIT_MODULE webkit-1.0)
+	else()
+		set (WEBKIT_MODULE webkitgtk-3.0)
+	endif()
+	pkg_check_modules (WEBKIT ${WEBKIT_MODULE})
 	if ("${WEBKIT_FOUND}" STREQUAL "")
-		message (STATUS "Could not find webkit-1.0; Cairo-Dock won't be built with Weblets applet.")
-		message (WARNING "This module is required to compile Weblets applet: webkit-1.0")
-		set (MODULES_MISSING "${MODULES_MISSING} webkit-1.0")
+		message (STATUS "Could not find ${WEBKIT_MODULE}; Cairo-Dock won't be built with Weblets applet.")
+		message (WARNING "This module is required to compile Weblets applet: ${WEBKIT_MODULE}")
+		set (MODULES_MISSING "${MODULES_MISSING} ${WEBKIT_MODULE}")
 	else()
 		set (GETTEXT_WEBLETS ${GETTEXT_PLUGINS})
-		set (VERSION_WEBLETS "0.0.11")
+		set (VERSION_WEBLETS "0.0.12")
 		set (PACKAGE_WEBLETS "cd-weblets")
 		set (webletsdatadir "${pluginsdatadir}/weblets")
 		set (with_weblets "yes")
@@ -1097,7 +1203,7 @@
 ############# WIFI #################
 message (STATUS "> WiFi:")
 set (GETTEXT_WIFI ${GETTEXT_PLUGINS})
-set (VERSION_WIFI "1.2.9")
+set (VERSION_WIFI "1.2.10")
 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)
@@ -1107,7 +1213,7 @@
 message (STATUS "> XFCE-Integration:")
 set (with_xfce_integration "no")
 if (NOT "${enable-xfce-integration}" STREQUAL "no")
-	pkg_check_modules (XFCE_INTEGRATION_THUNAR thunar-vfs-1)
+	pkg_check_modules (XFCE_INTEGRATION_THUNAR QUIET thunar-vfs-1) # thunar-vfs is not used if gvfs (gio) is available
 	pkg_check_modules (XFCE_INTEGRATION_GVFS gio-2.0)
 	if ("${XFCE_INTEGRATION_THUNAR_FOUND}" STREQUAL "" AND "${XFCE_INTEGRATION_GVFS_FOUND}" STREQUAL "")
 		message (STATUS "Could find neither thunar-vfs or libgio-2.0; Cairo-Dock won't be built with XFCE support.")
@@ -1132,7 +1238,7 @@
 	set (with_xgamma "no")
 else()
 	set (GETTEXT_XGAMMA ${GETTEXT_PLUGINS})
-	set (VERSION_XGAMMA "1.2.1")
+	set (VERSION_XGAMMA "1.2.2")
 	set (PACKAGE_XGAMMA "cd-Xgamma")
 	set (with_xgamma "yes")
 	set (xgammadatadir "${pluginsdatadir}/Xgamma")
@@ -1159,29 +1265,33 @@
 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 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}")
+if (NOT "${INDICATOR_NEW_VERSION}" STREQUAL "1" OR "${enable-memenu}" STREQUAL "yes")  # oneiric or newer
+message (STATUS " - with Me-Menu applet applet:     ${with_me_menu}")
 endif()
-message (STATUS " - with Messaging-Menu:            ${with_messaging_menu}")
-message (STATUS " - with Screen Resolution support: ${with_xrandr}")
+message (STATUS " - with Messaging-Menu applet:     ${with_messaging_menu}")
+message (STATUS " - with Recent-Events applet:      ${with_recent_events}")
 message (STATUS " - with Status-Notifier applet:    ${with_status_notifier}")
-message (STATUS " - with Sensors support:           ${with_sensors}")
 message (STATUS " - with Terminal applet:           ${with_terminal}")
 message (STATUS " - with Weblets applet:            ${with_weblets}")
 message (STATUS " - with Xgamma applet:             ${with_xgamma}")
-message (STATUS " - with Recent-Events applet:      ${with_recent_events}")
+message (STATUS "Add On:")
+message (STATUS " - with Sound-Menu support:        ${with_soundmenu}")
+message (STATUS " - with Screen Resolution support: ${with_xrandr}")
+message (STATUS " - with Sensors support:           ${with_sensors}")
 message (STATUS " - with UPower support:            ${with_upower_support}")
+message (STATUS " - with iCal support:              ${with_ical}")
+message (STATUS "Third Party Interfaces:")
 message (STATUS " - with Python interface:          ${with_python}")
 message (STATUS " - with Ruby interface:            ${with_ruby}")
 message (STATUS " - with Mono interface:            ${with_mono}")
 message (STATUS " - with Vala interface:            ${with_vala}")
 message (STATUS " - with Vala Translator (valac):   ${with_valac}")
 message (STATUS "Unstable:")
+message (STATUS " - with Global-Menu applet:        ${with_global_menu}")
 message (STATUS " - with Disks applet:              ${with_disks}")
 message (STATUS " - with Doncky applet:             ${with_doncky}")
 message (STATUS " - with KDE experimental support:  ${with_kde_integration2}")
@@ -1193,13 +1303,13 @@
 if (NOT "${MODULES_MISSING}" STREQUAL "")
 	message ("")
 	message (STATUS "WARNING: It seems that one (or more) module(s) is (are) missing:${MODULES_MISSING}")
-	message (STATUS "It can be interesting to install them (even more if you're a maintainer of Cairo-Dock's packages).")
+	message (STATUS "It can be interesting to install them (especially if you're a maintainer of Cairo-Dock's packages).")
 endif ()
 
 if (NOT "${PROGRAMS_MISSING}" STREQUAL "")
 	message ("")
 	message (STATUS "WARNING: It seems that one (or more) program(s) or package(s) is (are) missing:${PROGRAMS_MISSING}")
-	message (STATUS "It can be interesting to install them (even more if you're a maintainer of Cairo-Dock's packages).")
+	message (STATUS "It can be interesting to install them (especially if you're a maintainer of Cairo-Dock's packages).")
 endif ()
 
 if (NOT "${MODULES_INTEGRATION_MISSING}" STREQUAL "")

=== modified file 'Cairo-Penguin/data/Cairo-Penguin.conf.in' (properties changed: +x to -x)
--- Cairo-Penguin/data/Cairo-Penguin.conf.in	2011-08-09 18:08:08 +0000
+++ Cairo-Penguin/data/Cairo-Penguin.conf.in	2012-02-14 14:04:19 +0000
@@ -9,9 +9,9 @@
 #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:
+#s[Default] Name of the icon as it will appear in its caption in the dock:
 name = 
- #v
+#v
 sep_display=
 
 icon =

=== modified file 'Cairo-Penguin/src/applet-animation.c'
--- Cairo-Penguin/src/applet-animation.c	2011-09-26 12:56:12 +0000
+++ Cairo-Penguin/src/applet-animation.c	2012-02-14 14:04:19 +0000
@@ -37,11 +37,7 @@
 	g_return_if_fail (pAnimation != NULL);
 	int iPreviousPositionX = myData.iCurrentPositionX, iPreviousPositionY = myData.iCurrentPositionY;
 	
-	Icon *pFirstDrawnIcon = NULL;
-	if (myDock->pFirstDrawnElement != NULL)
-		pFirstDrawnIcon = myDock->pFirstDrawnElement->data;
-	if (pFirstDrawnIcon == NULL && myDock->icons != NULL)
-		pFirstDrawnIcon = myDock->icons->data;
+	Icon *pFirstDrawnIcon = cairo_dock_get_first_icon (myDock->icons);
 	int iXMin = (pFirstDrawnIcon != NULL ? pFirstDrawnIcon->fXAtRest : 0);
 	iXMin = 0;
 	int iXMax = iXMin + myDock->fFlatDockWidth;
@@ -246,7 +242,7 @@
 		}
 		
 		//\________________ les reflets.
-		CD_APPLET_UPDATE_REFLECT_ON_MY_ICON;
+		///CD_APPLET_UPDATE_REFLECT_ON_MY_ICON;
 	}
 	
 	CD_APPLET_REDRAW_MY_ICON;
@@ -335,11 +331,11 @@
 			{
 				cairo_dock_erase_cairo_context (myDrawContext);  // CD_APPLET_SET_SURFACE_ON_MY_ICON (NULL)
 				
-				if (myIcon->pReflectionBuffer != NULL)
+				/**if (myIcon->pReflectionBuffer != NULL)
 				{
 					cairo_surface_destroy (myIcon->pReflectionBuffer);
 					myIcon->pReflectionBuffer = NULL;
-				}
+				}*/
 				if (CAIRO_DOCK_CONTAINER_IS_OPENGL (myContainer))
 					cairo_dock_update_icon_texture (myIcon);
 			}
@@ -533,8 +529,8 @@
 	penguin_remove_notfications();
 	if (myConfig.bFree)
 	{
-		cairo_dock_register_notification_on_object (myContainer, NOTIFICATION_UPDATE_DOCK_SLOW, (CairoDockNotificationFunc) penguin_update_container, CAIRO_DOCK_RUN_AFTER, myApplet);
-		cairo_dock_register_notification_on_object (myContainer, NOTIFICATION_RENDER_DOCK, (CairoDockNotificationFunc) penguin_render_on_container, CAIRO_DOCK_RUN_AFTER, myApplet);
+		cairo_dock_register_notification_on_object (myContainer, NOTIFICATION_UPDATE_SLOW, (CairoDockNotificationFunc) penguin_update_container, CAIRO_DOCK_RUN_AFTER, myApplet);
+		cairo_dock_register_notification_on_object (myContainer, NOTIFICATION_RENDER, (CairoDockNotificationFunc) penguin_render_on_container, CAIRO_DOCK_RUN_AFTER, myApplet);
 	}
 	else
 	{
@@ -554,12 +550,11 @@
 		
 		if (myConfig.bFree)  // attention : c'est un hack moyen; il faudrait pouvoir indiquer a cairo-dock de ne pas inserer notre icone...
 		{
-			cairo_dock_detach_icon_from_dock (myIcon, myDock, myIconsParam.iSeparateIcons);
-			cairo_dock_update_dock_size (myDock);
+			cairo_dock_detach_icon_from_dock (myIcon, myDock);
 		}
 		else
 		{
-			cairo_dock_insert_icon_in_dock (myIcon, myDock, CAIRO_DOCK_UPDATE_DOCK_SIZE, ! CAIRO_DOCK_ANIMATE_ICON);
+			cairo_dock_insert_icon_in_dock (myIcon, myDock, ! CAIRO_DOCK_ANIMATE_ICON);
 		}
 		cairo_dock_launch_animation (myContainer);
 	}

=== modified file 'Cairo-Penguin/src/applet-animation.h'
--- Cairo-Penguin/src/applet-animation.h	2011-04-20 20:46:51 +0000
+++ Cairo-Penguin/src/applet-animation.h	2012-02-14 14:04:19 +0000
@@ -30,8 +30,8 @@
 
 #define penguin_remove_notfications() do {\
 	cairo_dock_remove_notification_func_on_object (myIcon, NOTIFICATION_UPDATE_ICON_SLOW, (CairoDockNotificationFunc) penguin_update_icon, myApplet);\
-	cairo_dock_remove_notification_func_on_object (myDock, NOTIFICATION_UPDATE_DOCK_SLOW, (CairoDockNotificationFunc) penguin_update_container, myApplet);\
-	cairo_dock_remove_notification_func_on_object (myDock, NOTIFICATION_RENDER_DOCK, (CairoDockNotificationFunc) penguin_render_on_container, myApplet); } while (0)
+	cairo_dock_remove_notification_func_on_object (myDock, NOTIFICATION_UPDATE_SLOW, (CairoDockNotificationFunc) penguin_update_container, myApplet);\
+	cairo_dock_remove_notification_func_on_object (myDock, NOTIFICATION_RENDER, (CairoDockNotificationFunc) penguin_render_on_container, myApplet); } while (0)
 
 void penguin_move_in_dock (CairoDockModuleInstance *myApplet);
 gboolean penguin_render_on_container (CairoDockModuleInstance *myApplet, CairoContainer *pContainer, cairo_t *pCairoContext);

=== modified file 'Cairo-Penguin/src/applet-init.c'
--- Cairo-Penguin/src/applet-init.c	2011-04-20 20:46:51 +0000
+++ Cairo-Penguin/src/applet-init.c	2012-02-14 14:04:19 +0000
@@ -63,7 +63,7 @@
 		CAIRO_DOCK_RUN_FIRST,
 		myApplet);
 	cairo_dock_register_notification_on_object (myDock,
-		NOTIFICATION_STOP_DOCK,
+		NOTIFICATION_DESTROY,
 		(CairoDockNotificationFunc) cd_on_dock_destroyed,
 		CAIRO_DOCK_RUN_AFTER,
 		myApplet);
@@ -85,7 +85,7 @@
 		(CairoDockNotificationFunc) CD_APPLET_ON_BUILD_MENU_FUNC,
 		myApplet);
 	cairo_dock_remove_notification_func_on_object (myDock,
-		NOTIFICATION_STOP_DOCK,
+		NOTIFICATION_DESTROY,
 		(CairoDockNotificationFunc) cd_on_dock_destroyed,
 		myApplet);
 	penguin_remove_notfications();
@@ -118,8 +118,8 @@
 			area.x = (myDock->container.iWidth - myDock->fFlatDockWidth) / 2 + myData.iCurrentPositionX;
 			area.y = myDock->container.iHeight - myData.iCurrentPositionY - pAnimation->iFrameHeight;
 			area.width = pAnimation->iFrameWidth;
-			area.height = pAnimation->iFrameHeight + myDock->container.bUseReflect * myIconsParam.fReflectSize;
-			gdk_window_invalidate_rect (myContainer->pWidget->window, &area, FALSE);
+			area.height = pAnimation->iFrameHeight + myDock->container.bUseReflect * myDock->iIconSize * myIconsParam.fReflectHeightRatio;
+			cairo_dock_redraw_container_area (myContainer, &area);
 		}
 		
 		//\_______________ On recharge tout de zero (changement de theme).
@@ -130,12 +130,12 @@
 		//\_______________ On libere le pingouin ou au contraire on le cloisonne.
 		if (myConfig.bFree)
 		{
-			cairo_dock_detach_icon_from_dock (myIcon, myDock, myIconsParam.iSeparateIcons);
+			cairo_dock_detach_icon_from_dock (myIcon, myDock);
 			cairo_dock_update_dock_size (myDock);
 		}
 		else
 		{
-			cairo_dock_insert_icon_in_dock (myIcon, myDock, CAIRO_DOCK_UPDATE_DOCK_SIZE, ! CAIRO_DOCK_ANIMATE_ICON);
+			cairo_dock_insert_icon_in_dock (myIcon, myDock, ! CAIRO_DOCK_ANIMATE_ICON);
 		}
 		
 		penguin_start_animating (myApplet);

=== modified file 'Cairo-Penguin/src/applet-notifications.c'
--- Cairo-Penguin/src/applet-notifications.c	2011-04-20 20:46:51 +0000
+++ Cairo-Penguin/src/applet-notifications.c	2012-02-14 14:04:19 +0000
@@ -81,7 +81,7 @@
 		g_source_remove (myData.iSidRestartDelayed);
 		myData.iSidRestartDelayed = 0;
 	}
-	cairo_dock_remove_notification_func_on_object (myContainer, NOTIFICATION_UPDATE_DOCK_SLOW, (CairoDockNotificationFunc) penguin_update_container, myApplet);
+	cairo_dock_remove_notification_func_on_object (myContainer, NOTIFICATION_UPDATE_SLOW, (CairoDockNotificationFunc) penguin_update_container, myApplet);
 	cairo_dock_remove_notification_func_on_object (myIcon, NOTIFICATION_UPDATE_ICON_SLOW, (CairoDockNotificationFunc) penguin_update_icon, myApplet);
 	
 	//\_______________ On met l'animation de repos et on la dessine.
@@ -109,30 +109,21 @@
 	
 	if ((myConfig.bFree && pClickedContainer == myContainer && myDock->container.iMouseX >  (myDock->container.iWidth - myDock->fFlatDockWidth) / 2 + myData.iCurrentPositionX && myDock->container.iMouseX < (myDock->container.iWidth - myDock->fFlatDockWidth) / 2 +  myData.iCurrentPositionX + pAnimation->iFrameWidth && myDock->container.iMouseY > myContainer->iHeight - myData.iCurrentPositionY - pAnimation->iFrameHeight && myDock->container.iMouseY < myContainer->iHeight - myData.iCurrentPositionY) || (! myConfig.bFree && pClickedIcon == myIcon))
 	{
-		if (pClickedIcon != myIcon && ! (CAIRO_DOCK_IS_APPLET (pClickedIcon) && pClickedIcon->pModuleInstance->pModule == myIcon->pModuleInstance->pModule))
-		{
-			cd_debug ("%s\n", myApplet->cConfFilePath);
-			cairo_dock_notify_on_object (myContainer, NOTIFICATION_BUILD_ICON_MENU, myIcon, myContainer, CD_APPLET_MY_MENU);
-			CD_APPLET_LEAVE (CAIRO_DOCK_INTERCEPT_NOTIFICATION);
-		}
-		
 		GtkWidget *pMenuItem, *image;
 		
 		CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU);
 		
-		GtkWidget *pModuleSubMenu = CD_APPLET_CREATE_MY_SUB_MENU ();
 		if (penguin_is_resting (pAnimation))
 		{
-			CD_APPLET_ADD_IN_MENU(D_("Wake up"), _wake_up, pModuleSubMenu);
+			CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Wake up"), MY_APPLET_SHARE_DATA_DIR"/icon.png", _wake_up, CD_APPLET_MY_MENU);
 		}
 		else
 		{
-			CD_APPLET_ADD_IN_MENU(D_("Keep quiet"), _keep_quiet, pModuleSubMenu);
+			CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Keep quiet"), MY_APPLET_SHARE_DATA_DIR"/icon.png",_keep_quiet, CD_APPLET_MY_MENU);
 		}
 		
-		CD_APPLET_ADD_IN_MENU(D_("Start XPenguins"), _start_xpenguins, pModuleSubMenu);
-		CD_APPLET_ADD_IN_MENU(D_("Stop XPenguins"), _stop_xpenguins, pModuleSubMenu);
-		CD_APPLET_ADD_ABOUT_IN_MENU (pModuleSubMenu);
+		CD_APPLET_ADD_IN_MENU(D_("Start XPenguins"), _start_xpenguins, CD_APPLET_MY_MENU);
+		CD_APPLET_ADD_IN_MENU(D_("Stop XPenguins"), _stop_xpenguins, CD_APPLET_MY_MENU);
 CD_APPLET_ON_BUILD_MENU_END
 
 

=== modified file 'Clipper/data/Clipper.conf.in' (properties changed: +x to -x)
--- Clipper/data/Clipper.conf.in	2011-09-26 12:56:12 +0000
+++ Clipper/data/Clipper.conf.in	2012-02-14 14:04:19 +0000
@@ -9,12 +9,12 @@
 #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:
+#s[Default] Name of the icon as it will appear in its caption in the dock:
 name =
- #v
+#v
 sep_display=
 
-#S+ Image filename:
+#S+[Default] Image filename:
 #{Leave empty to use the default one.}
 icon=accessories-text-editor
 
@@ -60,7 +60,6 @@
 #b Is detached from the dock
 initially detached=false
 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
 accessibility=0
 #b Should be visible on all desktops?
 sticky=true

=== modified file 'Clipper/src/applet-clipboard.c'
--- Clipper/src/applet-clipboard.c	2011-09-26 12:56:12 +0000
+++ Clipper/src/applet-clipboard.c	2012-02-14 14:04:19 +0000
@@ -554,7 +554,7 @@
 		CD_APPLET_ADD_IN_MENU_WITH_DATA ((pItem->cDisplayedText != NULL ? pItem->cDisplayedText : pItem->cText), _cd_clipper_activate_item, pMenu, pItem);
 		if (pElement->next != NULL && ((CDClipperItem *)pElement->next->data)->iType != pItem->iType)
 		{
-			CD_APPLET_ADD_SEPARATOR (pMenu);
+			CD_APPLET_ADD_SEPARATOR_IN_MENU (pMenu);
 		}
 	}
 	return pMenu;
@@ -605,7 +605,10 @@
 		pItem = it->data;
 		if ((pItem->iType & iType) == 0)
 			continue;
-		g_string_append_printf (sText, "%s%s", pItem->cText, it->next ? cSeparator : "");
+		g_string_prepend (sText, pItem->cText); // we prepend the string in order to keep the same order
+		if (it->next)
+			g_string_prepend (sText, cSeparator);
+		// g_string_append_printf (sText, "%s%s", pItem->cText, it->next ? cSeparator : "");
 	}
 	gchar *cText = sText->str;
 	g_string_free (sText, FALSE);

=== modified file 'Clipper/src/applet-config.c'
--- Clipper/src/applet-config.c	2010-08-10 00:05:57 +0000
+++ Clipper/src/applet-config.c	2012-02-14 14:04:19 +0000
@@ -25,22 +25,6 @@
 #include "applet-config.h"
 
 
-static void _cd_clipper_on_keybinding_pull (const char *keystring, gpointer user_data)
-{
-	if (myData.pItems == NULL)
-	{
-		gchar *cIconPath = g_strdup_printf ("%s/%s", MY_APPLET_SHARE_DATA_DIR, MY_APPLET_ICON_FILE);
-		cairo_dock_show_temporary_dialog_with_icon (D_("No items yet."), myIcon, myContainer, 2000, cIconPath);
-		g_free (cIconPath);
-	}
-	else
-	{
-		GtkWidget *pMenu = cd_clipper_build_items_menu ();
-		
-		cd_clipper_popup_menu (pMenu);
-	}
-}
-
 //\_________________ 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.iItemType = CD_CONFIG_GET_INTEGER ("Configuration", "item type");
@@ -65,8 +49,7 @@
 	myConfig.bReplayAction = CD_CONFIG_GET_BOOLEAN ("Configuration", "replay action");
 	myConfig.iActionMenuDuration = CD_CONFIG_GET_INTEGER ("Configuration", "action duration");
 	
-	myConfig.cShortCut = CD_CONFIG_GET_STRING ("Configuration", "shortkey");
-	cd_keybinder_bind (myConfig.cShortCut, (CDBindkeyHandler)_cd_clipper_on_keybinding_pull, (gpointer)NULL);
+	myConfig.cShortcut = CD_CONFIG_GET_STRING ("Configuration", "shortkey");
 	
 	gsize length = 0;
 	myConfig.pPersistentItems = CD_CONFIG_GET_STRING_LIST("Configuration", "persistent", &length);
@@ -78,11 +61,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
-	if (myConfig.cShortCut)
-	{
-		cd_keybinder_unbind(myConfig.cShortCut, (CDBindkeyHandler)_cd_clipper_on_keybinding_pull);
-		g_free (myConfig.cShortCut);
-	}
+	g_free (myConfig.cShortcut);
 	g_strfreev (myConfig.pPersistentItems);
 	g_free (myConfig.cRememberedItems);
 CD_APPLET_RESET_CONFIG_END

=== modified file 'Clipper/src/applet-init.c'
--- Clipper/src/applet-init.c	2011-09-26 12:56:12 +0000
+++ Clipper/src/applet-init.c	2012-02-14 14:04:19 +0000
@@ -67,6 +67,12 @@
 		cd_clipper_load_items (myConfig.cRememberedItems);
 	}
 	
+	// shortkey
+	myData.cKeyBinding = CD_APPLET_BIND_KEY (myConfig.cShortcut,
+		D_("Pop-up the items menu"),
+		"Configuration", "shortkey",
+		(CDBindkeyHandler) cd_clipper_on_keybinding_pull);
+	
 	CD_APPLET_REGISTER_FOR_CLICK_EVENT;
 	CD_APPLET_REGISTER_FOR_BUILD_MENU_EVENT;
 	CD_APPLET_REGISTER_FOR_MIDDLE_CLICK_EVENT;
@@ -95,12 +101,14 @@
 	
 	if (myConfig.bRememberItems)  // on se souvient des items courants.
 	{
-		gchar *cRememberedItems = cd_clipper_concat_items_of_type (CD_CLIPPER_CLIPBOARD, CD_ITEMS_DELIMITER);  // on prend que les CTRL+c.
+		gchar *cRememberedItems = cd_clipper_concat_items_of_type (myConfig.bSeparateSelections ? CD_CLIPPER_CLIPBOARD : CD_CLIPPER_BOTH, CD_ITEMS_DELIMITER);  // on prend que les CTRL+c.
 		cairo_dock_update_conf_file (CD_APPLET_MY_CONF_FILE,
 			G_TYPE_STRING, "Configuration", "last items", cRememberedItems,
 			G_TYPE_INVALID);
 		g_free (cRememberedItems);
 	}
+	
+	cd_keybinder_unbind (myData.cKeyBinding);
 CD_APPLET_STOP_END
 
 
@@ -158,6 +166,8 @@
 			}
 		}
 		
+		cd_keybinder_rebind (myData.cKeyBinding, myConfig.cShortcut, NULL);
+		
 		if (myConfig.cRememberedItems != NULL && ! myConfig.bRememberItems)  // on ne veut plus s'en souvenir.
 		{
 			cairo_dock_update_conf_file (CD_APPLET_MY_CONF_FILE,
@@ -173,8 +183,8 @@
 			while (myData.iNbItems[i] > myConfig.iNbItems[i])
 			{
 				GList *pElement = cd_clipper_get_last_item (i);
-				if (pElement == NULL)
-					continue;
+				if (pElement == NULL)  // shouldn't happen
+					break;
 				cd_clipper_free_item (pElement->data);
 				myData.pItems = g_list_delete_link (myData.pItems, pElement);
 				myData.iNbItems[i] --;

=== modified file 'Clipper/src/applet-notifications.c'
--- Clipper/src/applet-notifications.c	2011-04-20 20:46:51 +0000
+++ Clipper/src/applet-notifications.c	2012-02-14 14:04:19 +0000
@@ -30,7 +30,7 @@
 	if (myData.pItems == NULL)
 	{
 		cairo_dock_remove_dialog_if_any (myIcon);
-		cairo_dock_show_temporary_dialog_with_icon (D_("No items yet."), myIcon, myContainer, 2000, "same icon");
+		cairo_dock_show_temporary_dialog_with_icon (D_("The clipboard history is empty."), myIcon, myContainer, 3000, "same icon");
 	}
 	else
 	{
@@ -86,12 +86,9 @@
 	CD_APPLET_LEAVE();
 }
 CD_APPLET_ON_BUILD_MENU_BEGIN
-	// Sub-Menu
-	GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU ();
-		CD_APPLET_ADD_IN_MENU_WITH_STOCK ("Clear clipboard History", GTK_STOCK_CLEAR, _cd_clipper_clear_history, pSubMenu);
-		CD_APPLET_ADD_IN_MENU_WITH_STOCK ("Paste all copied items", GTK_STOCK_PASTE, _cd_clipper_paste_all, pSubMenu);
-		CD_APPLET_ADD_SEPARATOR_IN_MENU (pSubMenu);
-		CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
+	CD_APPLET_ADD_IN_MENU_WITH_STOCK ("Clear clipboard History", GTK_STOCK_CLEAR, _cd_clipper_clear_history, CD_APPLET_MY_MENU);
+	
+	CD_APPLET_ADD_IN_MENU_WITH_STOCK ("Paste all copied items", GTK_STOCK_PASTE, _cd_clipper_paste_all, CD_APPLET_MY_MENU);
 CD_APPLET_ON_BUILD_MENU_END
 
 
@@ -136,3 +133,20 @@
 		g_string_free (pString, TRUE);
 	}
 CD_APPLET_ON_DROP_DATA_END
+
+
+void cd_clipper_on_keybinding_pull (const char *keystring, gpointer user_data)
+{
+	if (myData.pItems == NULL)
+	{
+		gchar *cIconPath = g_strdup_printf ("%s/%s", MY_APPLET_SHARE_DATA_DIR, MY_APPLET_ICON_FILE);
+		cairo_dock_show_temporary_dialog_with_icon (D_("No items yet."), myIcon, myContainer, 2000, cIconPath);
+		g_free (cIconPath);
+	}
+	else
+	{
+		GtkWidget *pMenu = cd_clipper_build_items_menu ();
+		
+		cd_clipper_popup_menu (pMenu);
+	}
+}

=== modified file 'Clipper/src/applet-notifications.h'
--- Clipper/src/applet-notifications.h	2009-08-26 21:07:39 +0000
+++ Clipper/src/applet-notifications.h	2012-02-14 14:04:19 +0000
@@ -17,15 +17,12 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #ifndef __APPLET_NOTIFICATIONS__
 #define  __APPLET_NOTIFICATIONS__
 
-
 #include <cairo-dock.h>
 
 
-
 CD_APPLET_ON_CLICK_H
 
 CD_APPLET_ON_BUILD_MENU_H
@@ -35,4 +32,7 @@
 CD_APPLET_ON_DROP_DATA_H
 
 
+void cd_clipper_on_keybinding_pull (const char *keystring, gpointer user_data);
+
+
 #endif

=== modified file 'Clipper/src/applet-struct.h'
--- Clipper/src/applet-struct.h	2010-08-10 00:05:57 +0000
+++ Clipper/src/applet-struct.h	2012-02-14 14:04:19 +0000
@@ -62,7 +62,7 @@
 	gboolean bSeparateSelections;
 	gboolean bReplayAction;
 	gint iActionMenuDuration;
-	gchar *cShortCut;
+	gchar *cShortcut;
 	gchar **pPersistentItems;
 	gboolean bRememberItems;
 	gchar *cRememberedItems;
@@ -78,6 +78,7 @@
 	gboolean bActionsLoaded;
 	gboolean bActionBlocked;
 	GtkWidget *pActionMenu;
+	CairoKeyBinding *cKeyBinding;
 	} ;
 
 #endif

=== modified file 'Composite-Manager/data/Composite-Manager.conf.in' (properties changed: +x to -x)
--- Composite-Manager/data/Composite-Manager.conf.in	2011-09-26 12:56:12 +0000
+++ Composite-Manager/data/Composite-Manager.conf.in	2012-02-14 14:04:19 +0000
@@ -9,9 +9,9 @@
 #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:
+#s[Default] Name of the icon as it will appear in its caption in the dock:
 name = 
- #v
+#v
 sep_display=
 
 icon = 
@@ -58,7 +58,6 @@
 #b Is detached from the dock
 initially detached=false
 #l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=Utility)}
 accessibility=0
 #b Should be visible on all desktops?
 sticky=true
@@ -104,11 +103,11 @@
 #F[Style;gtk-color-picker]
 frame_style =
 
-#S+ Image when composite is active:
+#S+[Default] Image when composite is active:
 #{Leave empty to use the default one.}
 icon on = 
 
-#S+ Image when composite is inactive:
+#S+[Default] Image when composite is inactive:
 #{Leave empty to use the default one.}
 icon off = 
 

=== modified file 'Composite-Manager/src/applet-config.c'
--- Composite-Manager/src/applet-config.c	2011-08-09 18:08:08 +0000
+++ Composite-Manager/src/applet-config.c	2012-02-14 14:04:19 +0000
@@ -24,11 +24,6 @@
 #include "applet-config.h"
 
 
-static void _cd_on_keybinding_pull (const char *keystring, gpointer user_data)
-{
-	cd_toggle_composite ();
-}
-
 CD_APPLET_GET_CONFIG_BEGIN
 	myConfig.cWmCompositor = CD_CONFIG_GET_STRING ("Configuration", "compositor");
 	myConfig.cWmFallback = CD_CONFIG_GET_STRING ("Configuration", "fallback");
@@ -40,8 +35,7 @@
 	
 	myConfig.iActionOnMiddleClick = CD_CONFIG_GET_INTEGER ("Configuration", "action on click");
 	
-	myConfig.cShortCut = CD_CONFIG_GET_STRING ("Configuration", "shortkey");
-	cd_keybinder_bind (myConfig.cShortCut, (CDBindkeyHandler)_cd_on_keybinding_pull, (gpointer)NULL);
+	myConfig.cShortcut = CD_CONFIG_GET_STRING ("Configuration", "shortkey");
 CD_APPLET_GET_CONFIG_END
 
 
@@ -50,11 +44,7 @@
 	g_free (myConfig.cWmFallback);
 	g_free (myConfig.cIconCompositeON);
 	g_free (myConfig.cIconCompositeOFF);
-	if (myConfig.cShortCut)
-	{
-		cd_keybinder_unbind(myConfig.cShortCut, (CDBindkeyHandler)_cd_on_keybinding_pull);
-		g_free (myConfig.cShortCut);
-	}
+	g_free (myConfig.cShortcut);
 CD_APPLET_RESET_CONFIG_END
 
 

=== modified file 'Composite-Manager/src/applet-init.c'
--- Composite-Manager/src/applet-init.c	2011-08-09 18:08:08 +0000
+++ Composite-Manager/src/applet-init.c	2012-02-14 14:04:19 +0000
@@ -46,6 +46,12 @@
 	CD_APPLET_REGISTER_FOR_CLICK_EVENT;
 	CD_APPLET_REGISTER_FOR_MIDDLE_CLICK_EVENT;
 	CD_APPLET_REGISTER_FOR_BUILD_MENU_EVENT;
+	
+	// keyboard events
+	myData.cKeyBinding = CD_APPLET_BIND_KEY (myConfig.cShortcut,
+		D_("Toggle the composite ON/OFF"),
+		"Configuration", "shortkey",
+		(CDBindkeyHandler) cd_on_keybinding_pull);
 CD_APPLET_INIT_END
 
 
@@ -55,6 +61,9 @@
 	CD_APPLET_UNREGISTER_FOR_CLICK_EVENT;
 	CD_APPLET_UNREGISTER_FOR_MIDDLE_CLICK_EVENT;
 	CD_APPLET_UNREGISTER_FOR_BUILD_MENU_EVENT;
+	
+	// shortkey
+	cd_keybinder_unbind (myData.cKeyBinding);
 CD_APPLET_STOP_END
 
 
@@ -69,5 +78,7 @@
 		cd_define_prefered_wms ();
 		
 		cd_draw_current_state ();
+		
+		cd_keybinder_rebind (myData.cKeyBinding, myConfig.cShortcut, NULL);
 	}
 CD_APPLET_RELOAD_END

=== modified file 'Composite-Manager/src/applet-notifications.c'
--- Composite-Manager/src/applet-notifications.c	2011-08-09 18:08:08 +0000
+++ Composite-Manager/src/applet-notifications.c	2012-02-14 14:04:19 +0000
@@ -135,7 +135,7 @@
 	
 	cLabel = (myConfig.iActionOnMiddleClick == CD_SHOW_DESKTOP ? g_strdup_printf ("%s (%s)", D_("Show desktop"), D_("middle-click")) : g_strdup (D_("Show desktop")));
 	CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel,
-		MY_APPLET_SHARE_DATA_DIR"/../shared-images/show-desktop.svg",
+		MY_APPLET_SHARE_DATA_DIR"/../shared-files/images/show-desktop.svg",
 		_cd_show_desktop,
 		CD_APPLET_MY_MENU);
 	g_free (cLabel);
@@ -144,7 +144,7 @@
 	{
 		cLabel = (myConfig.iActionOnMiddleClick == CD_EXPOSE_DESKTOPS ? g_strdup_printf ("%s (%s)", D_("Expose all the desktops"), D_("middle-click")) : g_strdup (D_("Expose all the desktops")));
 		CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel,
-			MY_APPLET_SHARE_DATA_DIR"/../shared-images/expose-desktops.svg",
+			MY_APPLET_SHARE_DATA_DIR"/../shared-files/images/expose-desktops.svg",
 			_cd_expose_desktops,
 			CD_APPLET_MY_MENU);
 		g_free (cLabel);
@@ -153,7 +153,7 @@
 	{
 		cLabel = (myConfig.iActionOnMiddleClick == CD_EXPOSE_WINDOWS ? g_strdup_printf ("%s (%s)", D_("Expose all the windows"), D_("middle-click")) : g_strdup (D_("Expose all the windows")));
 		CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel,
-			MY_APPLET_SHARE_DATA_DIR"/../shared-images/expose-windows.svg",
+			MY_APPLET_SHARE_DATA_DIR"/../shared-files/images/expose-windows.svg",
 			_cd_expose_windows,
 			CD_APPLET_MY_MENU);
 		g_free (cLabel);
@@ -168,3 +168,9 @@
 		g_free (cLabel);
 	}
 CD_APPLET_ON_BUILD_MENU_END
+
+
+void cd_on_keybinding_pull (const char *keystring, gpointer user_data)
+{
+	cd_toggle_composite ();
+}

=== modified file 'Composite-Manager/src/applet-notifications.h'
--- Composite-Manager/src/applet-notifications.h	2011-08-09 18:08:08 +0000
+++ Composite-Manager/src/applet-notifications.h	2012-02-14 14:04:19 +0000
@@ -17,7 +17,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #ifndef __APPLET_NOTIFICATIONS__
 #define  __APPLET_NOTIFICATIONS__
 
@@ -25,11 +24,14 @@
 #include <cairo-dock.h>
 
 
-
 CD_APPLET_ON_CLICK_H
 
 CD_APPLET_ON_BUILD_MENU_H
 
 CD_APPLET_ON_MIDDLE_CLICK_H
 
+
+void cd_on_keybinding_pull (const char *keystring, gpointer user_data);
+
+
 #endif

=== modified file 'Composite-Manager/src/applet-struct.h'
--- Composite-Manager/src/applet-struct.h	2011-08-09 18:08:08 +0000
+++ Composite-Manager/src/applet-struct.h	2012-02-14 14:04:19 +0000
@@ -62,7 +62,7 @@
 	gchar *cIconCompositeOFF;
 	gboolean bAskBeforeSwitching;
 	CDWMAction iActionOnMiddleClick;
-	gchar *cShortCut;
+	gchar *cShortcut;
 } ;
 
 typedef struct {
@@ -77,6 +77,7 @@
 	gboolean bIsComposited;
 	CDWM *wmc;
 	CDWM *wmfb;
+	CairoKeyBinding *cKeyBinding;
 } ;
 
 

=== modified file 'Dbus/demos/demo_python/demo_python' (properties changed: -x to +x)
=== removed file 'Dbus/interfaces/bash/CDBashApplet.py'
--- Dbus/interfaces/bash/CDBashApplet.py	2011-04-20 20:46:51 +0000
+++ Dbus/interfaces/bash/CDBashApplet.py	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-#!/usr/bin/python
-
-# This is a part of the external applets for Cairo-Dock
-# Copyright : (C) 2010-2011 by Nochka85, Fabounet and Matttbe
-# E-mail : [e-mail]
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# http://www.gnu.org/licenses/licenses.html#GPL
-
-####################
-### dependancies ###
-####################
-import os.path
-from CDApplet import CDApplet
-
-####################
-### Applet class ###
-####################
-class CDBashApplet(CDApplet):
-	def __init__(self):
-		# call high-level init
-		self.app_folder = os.path.abspath(".")
-		CDApplet.__init__(self)
-	
-	##### private methods #####
-	
-	def call(self,action):
-		os.popen("cd " + self.app_folder + " && ./" + self.cAppletName + ".sh " + self.cAppletName + " " + self.cBusPath + " " + self.cConfFile + " " + self.cParentAppName + " " + action).read().rstrip()
-	
-	##### applet definition #####
-	
-	def get_config(self,keyfile):
-		self.call("get_config")
-	
-	def end(self):
-		self.call("end")
-	
-	def begin(self):
-		self.call("begin")
-	
-	def reload(self):
-		self.call("reload")
-	
-	##### callbacks #####
-	
-	def on_click(self,iState):
-		self.call("on_click "+str(iState))
-	
-	def on_middle_click(self):
-		self.call("on_middle_click")
-		
-	def on_build_menu(self):
-		self.call("on_build_menu")
-		
-	def on_menu_select(self,iNumEntry):
-		self.call("on_menu_select "+str(iNumEntry))
-	
-	def on_scroll(self,bScrollUp):
-		self.call("on_scroll "+str(bScrollUp))
-	
-	def on_drop_data(self,cReceivedData):
-		self.call("on_drop_data '"+cReceivedData+"'")
-	
-	def on_answer_dialog(self, button, answer):
-		self.call("on_answer_dialog "+str(button)+" '"+str(answer)+"'")
-	
-	def on_shortkey(self,key):
-		self.call("on_shortkey '"+key+"'")
-	
-	def on_change_focus(self,bIsActive):
-		self.call("on_change_focus '"+str(bIsActive)+"'")
-	
-	def on_click_sub_icon(self, iState, cIconID):
-		self.call("on_click_sub_icon '"+str(iState)+"' '"+cIconID+"'")
-	

=== added file 'Dbus/interfaces/bash/CDBashApplet.py.in'
--- Dbus/interfaces/bash/CDBashApplet.py.in	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/bash/CDBashApplet.py.in	2012-02-14 14:04:19 +0000
@@ -0,0 +1,83 @@
+#!@PYTHON_EXECUTABLE@
+#
+# This is a part of the external applets for Cairo-Dock
+# Copyright : (C) 2010-2011 by Nochka85, Fabounet and Matttbe
+# E-mail : [e-mail]
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 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.
+# http://www.gnu.org/licenses/licenses.html#GPL
+
+####################
+### dependancies ###
+####################
+import os.path
+from CDApplet import CDApplet
+
+####################
+### Applet class ###
+####################
+class CDBashApplet(CDApplet):
+	def __init__(self):
+		# call high-level init
+		self.app_folder = os.path.abspath(".")
+		CDApplet.__init__(self)
+	
+	##### private methods #####
+	
+	def call(self,action):
+		os.popen("cd " + self.app_folder + " && ./" + self.cAppletName + ".sh " + self.cAppletName + " " + self.cBusPath + " " + self.cConfFile + " " + self.cParentAppName + " " + action)
+	
+	##### applet definition #####
+	
+	def get_config(self,keyfile):
+		self.call("get_config")
+	
+	def end(self):
+		self.call("end")
+	
+	def begin(self):
+		self.call("begin")
+	
+	def reload(self):
+		self.call("reload")
+	
+	##### callbacks #####
+	
+	def on_click(self,iState):
+		self.call("on_click "+str(iState))
+	
+	def on_middle_click(self):
+		self.call("on_middle_click")
+		
+	def on_build_menu(self):
+		self.call("on_build_menu")
+		
+	def on_menu_select(self,iNumEntry):
+		self.call("on_menu_select "+str(iNumEntry))
+	
+	def on_scroll(self,bScrollUp):
+		self.call("on_scroll "+str(bScrollUp))
+	
+	def on_drop_data(self,cReceivedData):
+		self.call("on_drop_data '"+cReceivedData+"'")
+	
+	def on_answer_dialog(self, button, answer):
+		self.call("on_answer_dialog "+str(button)+" '"+str(answer)+"'")
+	
+	def on_shortkey(self,key):
+		self.call("on_shortkey '"+key+"'")
+	
+	def on_change_focus(self,bIsActive):
+		self.call("on_change_focus '"+str(bIsActive)+"'")
+	
+	def on_click_sub_icon(self, iState, cIconID):
+		self.call("on_click_sub_icon '"+str(iState)+"' '"+cIconID+"'")
+	

=== modified file 'Dbus/interfaces/bash/CDBashApplet.sh'
--- Dbus/interfaces/bash/CDBashApplet.sh	2011-09-26 12:56:12 +0000
+++ Dbus/interfaces/bash/CDBashApplet.sh	2012-02-14 14:04:19 +0000
@@ -8,7 +8,7 @@
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
+# 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,
@@ -27,8 +27,11 @@
 DBUS_INTERFACE="org.cairodock.CairoDock"
 CONF_FILE="$1"
 shift 1
+ROOT_DATA_DIR="$1"
+shift 1
 PARENT_APP_NAME="$1"
 shift 1
+SHARE_DATA_DIR="$PWD"
 
 BOTTOM=0
 TOP=1

=== modified file 'Dbus/interfaces/bash/CMakeLists.txt'
--- Dbus/interfaces/bash/CMakeLists.txt	2011-04-20 20:46:51 +0000
+++ Dbus/interfaces/bash/CMakeLists.txt	2012-02-14 14:04:19 +0000
@@ -1,10 +1,9 @@
-
-########### install files ###############
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CDBashApplet.py.in ${CMAKE_CURRENT_BINARY_DIR}/CDBashApplet.py)
 
 # the python script goes with other python scripts.
 if (NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 	# copy *.py to current binary dir (cleaner)
-	execute_process(COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" "${CMAKE_CURRENT_SOURCE_DIR}/CDBashApplet.py" ${CMAKE_CURRENT_BINARY_DIR})
+	execute_process(COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" ${CMAKE_CURRENT_BINARY_DIR})
 	exec_program("${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build")
 endif()
 # Run a custom script with 'make install' 
@@ -12,6 +11,8 @@
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BashInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BashInstall.cmake)
 set_target_properties(bash_pyc PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/BashInstall.cmake)
 
+########### install files ###############
+
 # and the bash functions goes into the data dir of the applet (didn't find a better place).
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/CDBashApplet.sh
 	DESTINATION ${dbusdatadir}

=== modified file 'Dbus/interfaces/mono/CDApplet.cs'
--- Dbus/interfaces/mono/CDApplet.cs	2011-09-26 12:56:12 +0000
+++ Dbus/interfaces/mono/CDApplet.cs	2012-02-14 14:04:19 +0000
@@ -40,6 +40,8 @@
 	public string cParentAppName = null;
 	public string cBusPath = null;
 	public string cConfFile = null;
+	public string cShareDataDir = null;
+	public string cRootDataDir = null;
 	public IApplet icon = null;
 	public ISubApplet sub_icons= null;
 	private GLib.MainLoop loop = null;
@@ -89,7 +91,9 @@
 		this.cAppletName = argv[0].Substring(2);
 		this.cBusPath = argv[2];
 		this.cConfFile = argv[3];
-		this.cParentAppName = argv[4];
+		this.cRootDataDir = argv[4];
+		this.cParentAppName = argv[5];
+		//this.cShareDataDir = Environment.CurrentDir();  // not sure of the exact syntax...
 		
 		this._get_config ();
 		this._connect_to_dock ();

=== modified file 'Dbus/interfaces/mono/CMakeLists.txt'
--- Dbus/interfaces/mono/CMakeLists.txt	2011-04-20 20:46:51 +0000
+++ Dbus/interfaces/mono/CMakeLists.txt	2012-02-14 14:04:19 +0000
@@ -7,7 +7,7 @@
 	-out:${CMAKE_CURRENT_BINARY_DIR}/CDApplet.dll
 	${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/ISubApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/IApplet.cs)
 ### find how to register to GAC ...
-set (MONO_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib/cli")
+set (MONO_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib/cli/cairo-dock-plug-ins")
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/CDApplet.dll
 	DESTINATION ${MONO_LIB_DIR})
 

=== removed file 'Dbus/interfaces/python/CDApplet.py'
--- Dbus/interfaces/python/CDApplet.py	2011-09-26 12:56:12 +0000
+++ Dbus/interfaces/python/CDApplet.py	1970-01-01 00:00:00 +0000
@@ -1,272 +0,0 @@
-# This is a part of the external applets for Cairo-Dock
-# Copyright : (C) 2010-2011 by Fabounet
-# E-mail : [e-mail]
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# http://www.gnu.org/licenses/licenses.html#GPL
-
-# Base class for Cairo-Dock's applets.
-# Make your own class derive from a CDApplet, and override the functions you need (the ones which don't start with an underscore).
-
-####################
-### dependancies ###
-####################
-import sys
-import os.path
-import ConfigParser
-import gobject
-import glib
-import gettext
-import dbus
-from dbus.mainloop.glib import DBusGMainLoop
-
-DBusGMainLoop(set_as_default=True)
-
-INSTALL_PREFIX = os.path.abspath("..")  # applets are launched from their install directory, so ".." is the folder containing all applets.
-
-GETTEXT_NAME = 'cairo-dock-plugins-extra'
-LOCALE_DIR = INSTALL_PREFIX + '/locale'  # user version of /usr/share/locale
-gettext.textdomain(GETTEXT_NAME)
-gettext.bind_textdomain_codeset (GETTEXT_NAME, 'UTF-8');
-gettext.bindtextdomain(GETTEXT_NAME, LOCALE_DIR)
-_ = lambda x: gettext.dgettext(GETTEXT_NAME,x)
-
-####################
-### Applet class ###
-####################
-class CDApplet:
-	
-	#############
-	### Enums ###
-	#############
-	# orientation
-	BOTTOM = 0
-	TOP    = 1
-	RIGHT  = 2
-	LEFT   = 3
-	# container type
-	DOCK    = 0
-	DESKLET = 1
-	# emblem position
-	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
-	MENU_SEPARATOR    = 2
-	MENU_CHECKBOX     = 3
-	MENU_RADIO_BUTTON = 4
-	# main menu ID
-	MAIN_MENU_ID = 0
-	# dialog key pressed
-	DIALOG_KEY_ENTER = -1
-	DIALOG_KEY_ESCAPE = -2
-	
-	#####################
-	### INIT AND DBUS ###
-	#####################
-	
-	def __init__(self):
-		""" initialize the applet. Must be called by any class that inheritates from it.
-		It defines the following:
-		 - icon : our main icon
-		 - sub_icons: our sub-icons
-		 - config : a dictionnary where our configuration parameters are stored
-		 - cAppletName : name of our applet (the same as the folder where files are stored)
-		 - cConfFile : path to our config file (you will rarely need it)
-		 """
-		self.icon = None
-		self.sub_icons = None
-		self.config = {}
-		self.loop = None
-		self._bEnded = False
-		self._cMenuIconId = None
-		self.cAppletName = sys.argv[0][2:]  # the command is ./applet_name
-		self.cBusPath = sys.argv[2]
-		self.cConfFile = sys.argv[3]
-		self.cParentAppName = sys.argv[4]
-		self.cShareDataDir = INSTALL_PREFIX + '/' + self.cAppletName
-		
-		self._get_config()
-		self._connect_to_dock()
-	
-	def _connect_to_dock(self):
-		# get our applet on the bus.
-		bus = dbus.SessionBus()
-		try:
-			applet_object = bus.get_object("org.cairodock.CairoDock", self.cBusPath)
-		except:
-			print ">>> object '"+self.cBusPath+"' can't be found on the bus, exit.\nMake sure that Cairo-Dock is running"
-			sys.exit(2)
-		self.icon = dbus.Interface(applet_object, "org.cairodock.CairoDock.applet")  # this object represents our icon inside the dock or a desklet.
-		sub_icons_object = bus.get_object("org.cairodock.CairoDock", self.cBusPath+"/sub_icons")
-		self.sub_icons = dbus.Interface(sub_icons_object, "org.cairodock.CairoDock.subapplet")  # this object represents the list of icons contained in our sub-dock, or in our desklet. We'll add them one by one later, giving them a unique ID, which will be used to identify each of them.
-		# connect to signals.
-		self.icon.connect_to_signal("on_click", self.on_click)  # when the user left-clicks on our icon.
-		self.icon.connect_to_signal("on_middle_click", self.on_middle_click)  # when the user middle-clicks on our icon.
-		self.icon.connect_to_signal("on_build_menu", self._on_build_menu)  # when the user right-clicks on our applet (which builds the menu)
-		self.icon.connect_to_signal("on_menu_select", self._on_menu_select)  # when the user selects an entry of this menu.
-		self.icon.connect_to_signal("on_scroll", self.on_scroll)  # when the user scroll up or down on our icon.
-		self.icon.connect_to_signal("on_drop_data", self.on_drop_data)  # when the user drops something on our icon.
-		self.icon.connect_to_signal("on_answer_dialog", self.on_answer_dialog)  # when the user answer a question.
-		self.icon.connect_to_signal("on_shortkey", self.on_shortkey)  # when the user press the shortkey.
-		self.icon.connect_to_signal("on_change_focus", self.on_change_focus)  # when the window's focus changes.
-		self.icon.connect_to_signal("on_stop_module", self._on_stop)  # when the user deactivate our applet (or the DBus plug-in, or when the Cairo-Dock is stopped).
-		self.icon.connect_to_signal("on_reload_module", self._on_reload)  # when the user changes something in our config, or when the desklet is resized (with no change in the config).
-		self.sub_icons.connect_to_signal("on_click_sub_icon", self.on_click_sub_icon)  # when the user left-clicks on a sub-icon.
-		self.sub_icons.connect_to_signal("on_middle_click_sub_icon", self.on_middle_click_sub_icon)
-		self.sub_icons.connect_to_signal("on_scroll_sub_icon", self.on_scroll_sub_icon)
-		self.sub_icons.connect_to_signal("on_build_menu_sub_icon", self._on_build_menu_sub_icon)
-		self.sub_icons.connect_to_signal("on_drop_data_sub_icon", self.on_drop_data_sub_icon)
-	
-	def run(self):
-		""" start the applet and enter the main loop; we never get out of this function """
-		self.begin()
-		if not self._bEnded:  # _bEnded can be true if the applet runs its own main loop, in which case we stay stuck in the 'begin' function until the end of the applet; in this case, we don't want to run a main loop again!
-			self.loop = gobject.MainLoop()
-			self.loop.run()
-		print ">>> applet '"+self.cAppletName+"' terminated."
-		sys.exit(0)
-	
-	##################################
-	### callbacks on the main icon ###
-	##################################
-	
-	def on_click(self,iState):
-		""" action on click """
-		pass
-	
-	def on_middle_click(self):
-		""" action on middle-click """
-		pass
-	
-	def _on_build_menu(self):
-		self._cMenuIconId = None
-		self.on_build_menu()
-		pass
-		
-	def on_build_menu(self):
-		""" build our menu """
-		pass
-	
-	def _on_menu_select(self,iNumEntry):
-		if self._cMenuIconId == None:
-			self.on_menu_select(iNumEntry)
-		else:
-			self.on_menu_select_sub_icon(iNumEntry,self._cMenuIconId)
-	
-	def on_menu_select(self,iNumEntry):
-		""" action on selecting an entry of our menu """
-		pass
-	
-	def on_scroll(self,bScrollUp):
-		""" action on scroll """
-		pass
-	
-	def on_drop_data(self,cReceivedData):
-		""" action on dropping something on our applet """
-	
-	def on_answer(self,answer):
-		""" action on answering ok to a dialog with ok/cancel buttons (deprecated) """
-		pass
-	
-	def on_answer_dialog(self, button, answer):
-		""" action on answering a dialog """
-		if button == -1 or button == 0:
-			self.on_answer(answer)
-	
-	def on_shortkey(self,cKey):
-		""" action on pressing one of the shortkeys we bound beforehand """
-		pass
-	
-	def on_change_focus(self,bIsActive):
-		""" action when the window controlled by the applet takes or looses the focus """
-		pass
-	
-	##################################
-	### callbacks on the sub-icons ###
-	##################################
-	
-	def on_click_sub_icon(self, iState, cIconID):
-		""" action on click on one of our sub-icons"""
-		pass
-	
-	def on_middle_click_sub_icon(self, cIconID):
-		""" action on middle-click on one of our sub-icons"""
-		pass
-	
-	def on_scroll_sub_icon(self, bScrollUp, cIconID):
-		""" action on scroll on one of our sub-icons"""
-		pass
-	
-	def _on_build_menu_sub_icon(self, cIconID):
-		self._cMenuIconId = cIconID
-		self.on_build_menu_sub_icon(cIconID)
-	
-	def on_build_menu_sub_icon(self, cIconID):
-		""" build our menu on one of our sub-icons"""
-		pass
-	
-	def on_menu_select_sub_icon(self, iNumEntry, cIconID):
-		""" action on selecting an entry of our menu on a sub-icon"""
-		pass
-	
-	def on_drop_data_sub_icon(self, cReceivedData, cIconID):
-		""" action on dropping something on one of our sub-icons"""
-		pass
-	
-	def on_answer_dialog_sub_icon(self, button, answer, cIconID):
-		""" action on answering a dialog about a sub-icon"""
-		pass
-	
-	###############################
-	### callbacks on the applet ###
-	###############################
-	
-	def begin(self):
-		""" action when the applet is started """
-		pass
-	
-	def end(self):
-		""" action when the applet is terminated """
-		pass
-	
-	def _on_stop(self):
-		self._bEnded = True
-		self.end()
-		if self.loop != None:
-			self.loop.quit()
-	
-	def reload(self):
-		""" called when our applet is reloaded (config parameters have changed) """
-		pass
-	
-	def _on_reload(self,bConfigHasChanged):
-		if bConfigHasChanged:
-			self._get_config()
-			self.reload()
-	
-	def get_config(self,keyfile):
-		""" get our parameters from the key-file """
-		pass
-	
-	def _get_config(self):
-		keyfile = ConfigParser.RawConfigParser()
-		keyfile.read(self.cConfFile)
-		self.get_config(keyfile)
-	

=== added file 'Dbus/interfaces/python/CDApplet.py.in'
--- Dbus/interfaces/python/CDApplet.py.in	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/python/CDApplet.py.in	2012-02-14 14:04:19 +0000
@@ -0,0 +1,275 @@
+#!@PYTHON_EXECUTABLE@
+#
+# This is a part of the external applets for Cairo-Dock
+# Copyright : (C) 2010-2011 by Fabounet
+# E-mail : [e-mail]
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 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.
+# http://www.gnu.org/licenses/licenses.html#GPL
+
+# Base class for Cairo-Dock's applets.
+# Make your own class derive from a CDApplet, and override the functions you need (the ones which don't start with an underscore).
+
+####################
+### dependancies ###
+####################
+import sys
+import os.path
+import ConfigParser
+import gobject
+import glib
+import gettext
+import dbus
+from dbus.mainloop.glib import DBusGMainLoop
+
+DBusGMainLoop(set_as_default=True)
+
+INSTALL_PREFIX = os.path.abspath("..")  # applets are launched from their install directory, so ".." is the folder containing all applets.
+
+GETTEXT_NAME = 'cairo-dock-plugins-extra'
+LOCALE_DIR = INSTALL_PREFIX + '/locale'  # user version of /usr/share/locale
+gettext.textdomain(GETTEXT_NAME)
+gettext.bind_textdomain_codeset (GETTEXT_NAME, 'UTF-8');
+gettext.bindtextdomain(GETTEXT_NAME, LOCALE_DIR)
+_ = lambda x: gettext.dgettext(GETTEXT_NAME,x)
+
+####################
+### Applet class ###
+####################
+class CDApplet:
+	
+	#############
+	### Enums ###
+	#############
+	# orientation
+	BOTTOM = 0
+	TOP    = 1
+	RIGHT  = 2
+	LEFT   = 3
+	# container type
+	DOCK    = 0
+	DESKLET = 1
+	# emblem position
+	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
+	MENU_SEPARATOR    = 2
+	MENU_CHECKBOX     = 3
+	MENU_RADIO_BUTTON = 4
+	# main menu ID
+	MAIN_MENU_ID = 0
+	# dialog key pressed
+	DIALOG_KEY_ENTER = -1
+	DIALOG_KEY_ESCAPE = -2
+	
+	#####################
+	### INIT AND DBUS ###
+	#####################
+	
+	def __init__(self):
+		""" initialize the applet. Must be called by any class that inheritates from it.
+		It defines the following:
+		 - icon : our main icon
+		 - sub_icons: our sub-icons
+		 - config : a dictionnary where our configuration parameters are stored
+		 - cAppletName : name of our applet (the same as the folder where files are stored)
+		 - cConfFile : path to our config file (you will rarely need it)
+		 """
+		self.icon = None
+		self.sub_icons = None
+		self.config = {}
+		self.loop = None
+		self._bEnded = False
+		self._cMenuIconId = None
+		self.cAppletName = sys.argv[0][2:]  # the command is ./applet_name
+		self.cBusPath = sys.argv[2]
+		self.cConfFile = sys.argv[3]
+		self.cRootDataDir = sys.argv[4]
+		self.cParentAppName = sys.argv[5]
+		self.cShareDataDir = INSTALL_PREFIX + '/' + self.cAppletName
+		
+		self._get_config()
+		self._connect_to_dock()
+	
+	def _connect_to_dock(self):
+		# get our applet on the bus.
+		bus = dbus.SessionBus()
+		try:
+			applet_object = bus.get_object("org.cairodock.CairoDock", self.cBusPath)
+		except:
+			print ">>> object '"+self.cBusPath+"' can't be found on the bus, exit.\nMake sure that Cairo-Dock is running"
+			sys.exit(2)
+		self.icon = dbus.Interface(applet_object, "org.cairodock.CairoDock.applet")  # this object represents our icon inside the dock or a desklet.
+		sub_icons_object = bus.get_object("org.cairodock.CairoDock", self.cBusPath+"/sub_icons")
+		self.sub_icons = dbus.Interface(sub_icons_object, "org.cairodock.CairoDock.subapplet")  # this object represents the list of icons contained in our sub-dock, or in our desklet. We'll add them one by one later, giving them a unique ID, which will be used to identify each of them.
+		# connect to signals.
+		self.icon.connect_to_signal("on_click", self.on_click)  # when the user left-clicks on our icon.
+		self.icon.connect_to_signal("on_middle_click", self.on_middle_click)  # when the user middle-clicks on our icon.
+		self.icon.connect_to_signal("on_build_menu", self._on_build_menu)  # when the user right-clicks on our applet (which builds the menu)
+		self.icon.connect_to_signal("on_menu_select", self._on_menu_select)  # when the user selects an entry of this menu.
+		self.icon.connect_to_signal("on_scroll", self.on_scroll)  # when the user scroll up or down on our icon.
+		self.icon.connect_to_signal("on_drop_data", self.on_drop_data)  # when the user drops something on our icon.
+		self.icon.connect_to_signal("on_answer_dialog", self.on_answer_dialog)  # when the user answer a question.
+		self.icon.connect_to_signal("on_shortkey", self.on_shortkey)  # when the user press the shortkey.
+		self.icon.connect_to_signal("on_change_focus", self.on_change_focus)  # when the window's focus changes.
+		self.icon.connect_to_signal("on_stop_module", self._on_stop)  # when the user deactivate our applet (or the DBus plug-in, or when the Cairo-Dock is stopped).
+		self.icon.connect_to_signal("on_reload_module", self._on_reload)  # when the user changes something in our config, or when the desklet is resized (with no change in the config).
+		self.sub_icons.connect_to_signal("on_click_sub_icon", self.on_click_sub_icon)  # when the user left-clicks on a sub-icon.
+		self.sub_icons.connect_to_signal("on_middle_click_sub_icon", self.on_middle_click_sub_icon)
+		self.sub_icons.connect_to_signal("on_scroll_sub_icon", self.on_scroll_sub_icon)
+		self.sub_icons.connect_to_signal("on_build_menu_sub_icon", self._on_build_menu_sub_icon)
+		self.sub_icons.connect_to_signal("on_drop_data_sub_icon", self.on_drop_data_sub_icon)
+	
+	def run(self):
+		""" start the applet and enter the main loop; we never get out of this function """
+		self.begin()
+		if not self._bEnded:  # _bEnded can be true if the applet runs its own main loop, in which case we stay stuck in the 'begin' function until the end of the applet; in this case, we don't want to run a main loop again!
+			self.loop = gobject.MainLoop()
+			self.loop.run()
+		print ">>> applet '"+self.cAppletName+"' terminated."
+		sys.exit(0)
+	
+	##################################
+	### callbacks on the main icon ###
+	##################################
+	
+	def on_click(self,iState):
+		""" action on click """
+		pass
+	
+	def on_middle_click(self):
+		""" action on middle-click """
+		pass
+	
+	def _on_build_menu(self):
+		self._cMenuIconId = None
+		self.on_build_menu()
+		pass
+		
+	def on_build_menu(self):
+		""" build our menu """
+		pass
+	
+	def _on_menu_select(self,iNumEntry):
+		if self._cMenuIconId == None:
+			self.on_menu_select(iNumEntry)
+		else:
+			self.on_menu_select_sub_icon(iNumEntry,self._cMenuIconId)
+	
+	def on_menu_select(self,iNumEntry):
+		""" action on selecting an entry of our menu """
+		pass
+	
+	def on_scroll(self,bScrollUp):
+		""" action on scroll """
+		pass
+	
+	def on_drop_data(self,cReceivedData):
+		""" action on dropping something on our applet """
+	
+	def on_answer(self,answer):
+		""" action on answering ok to a dialog with ok/cancel buttons (deprecated) """
+		pass
+	
+	def on_answer_dialog(self, button, answer):
+		""" action on answering a dialog """
+		if button == -1 or button == 0:
+			self.on_answer(answer)
+	
+	def on_shortkey(self,cKey):
+		""" action on pressing one of the shortkeys we bound beforehand """
+		pass
+	
+	def on_change_focus(self,bIsActive):
+		""" action when the window controlled by the applet takes or looses the focus """
+		pass
+	
+	##################################
+	### callbacks on the sub-icons ###
+	##################################
+	
+	def on_click_sub_icon(self, iState, cIconID):
+		""" action on click on one of our sub-icons"""
+		pass
+	
+	def on_middle_click_sub_icon(self, cIconID):
+		""" action on middle-click on one of our sub-icons"""
+		pass
+	
+	def on_scroll_sub_icon(self, bScrollUp, cIconID):
+		""" action on scroll on one of our sub-icons"""
+		pass
+	
+	def _on_build_menu_sub_icon(self, cIconID):
+		self._cMenuIconId = cIconID
+		self.on_build_menu_sub_icon(cIconID)
+	
+	def on_build_menu_sub_icon(self, cIconID):
+		""" build our menu on one of our sub-icons"""
+		pass
+	
+	def on_menu_select_sub_icon(self, iNumEntry, cIconID):
+		""" action on selecting an entry of our menu on a sub-icon"""
+		pass
+	
+	def on_drop_data_sub_icon(self, cReceivedData, cIconID):
+		""" action on dropping something on one of our sub-icons"""
+		pass
+	
+	def on_answer_dialog_sub_icon(self, button, answer, cIconID):
+		""" action on answering a dialog about a sub-icon"""
+		pass
+	
+	###############################
+	### callbacks on the applet ###
+	###############################
+	
+	def begin(self):
+		""" action when the applet is started """
+		pass
+	
+	def end(self):
+		""" action when the applet is terminated """
+		pass
+	
+	def _on_stop(self):
+		self._bEnded = True
+		self.end()
+		if self.loop != None:
+			self.loop.quit()
+	
+	def reload(self):
+		""" called when our applet is reloaded (config parameters have changed) """
+		pass
+	
+	def _on_reload(self,bConfigHasChanged):
+		if bConfigHasChanged:
+			self._get_config()
+			self.reload()
+	
+	def get_config(self,keyfile):
+		""" get our parameters from the key-file """
+		pass
+	
+	def _get_config(self):
+		keyfile = ConfigParser.RawConfigParser()
+		keyfile.read(self.cConfFile)
+		self.get_config(keyfile)
+	

=== modified file 'Dbus/interfaces/python/CMakeLists.txt'
--- Dbus/interfaces/python/CMakeLists.txt	2011-08-09 18:08:08 +0000
+++ Dbus/interfaces/python/CMakeLists.txt	2012-02-14 14:04:19 +0000
@@ -1,11 +1,13 @@
-
-########### install files ###############
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.py.in ${CMAKE_CURRENT_BINARY_DIR}/CDApplet.py)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CairoDock.py.in ${CMAKE_CURRENT_BINARY_DIR}/CairoDock.py)
 
 if (NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 	# copy *.py to current binary dir (cleaner)
-	execute_process(COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" "${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.py" "${CMAKE_CURRENT_SOURCE_DIR}/CairoDock.py" ${CMAKE_CURRENT_BINARY_DIR})
+	execute_process(COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" ${CMAKE_CURRENT_BINARY_DIR})
 	exec_program("${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build")
 endif()
+
+########### install files ###############
 # Run a custom script with 'make install' 
 add_custom_target(python_pyc ALL)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PythonInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PythonInstall.cmake)

=== removed file 'Dbus/interfaces/python/CairoDock.py'
--- Dbus/interfaces/python/CairoDock.py	2011-09-26 12:56:12 +0000
+++ Dbus/interfaces/python/CairoDock.py	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-# This is a part of the Cairo-Dock plug-ins.
-# Copyright : (C) 2010-2011 by Fabounet
-# E-mail : [e-mail]
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# http://www.gnu.org/licenses/licenses.html#GPL
-
-# Base class for Cairo-Dock's main interface.
-
-####################
-### dependancies ###
-####################
-import os.path
-import dbus
-import re
-
-USER_CONFIG_DIR = os.path.abspath("~/.config")
-
-
-##################
-### Main class ###
-##################
-class CairoDock:
-	
-	#############
-	### Enums ###
-	#############
-	# orientation
-	BOTTOM = 0
-	TOP    = 1
-	RIGHT  = 2
-	LEFT   = 3
-	# container type
-	DOCK    = "Dock"
-	DESKLET = "Desklet"
-	# emblem position
-	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
-	CATEGORY_APPLET_FILES     = 2
-	CATEGORY_APPLET_INTERNET  = 3
-	CATEGORY_APPLET_DESKTOP   = 4
-	CATEGORY_APPLET_ACCESSORY = 5
-	CATEGORY_APPLET_SYSTEM    = 6
-	CATEGORY_APPLET_FUN       = 7
-	# module type
-	CAN_DOCK    = 1
-	CAN_DESKLET = 2
-	# icon type
-	TYPE_LAUNCHER        = "Launcher"
-	TYPE_APPLICATION     = "Application"
-	TYPE_APPLET          = "Applet"
-	TYPE_SEPARATOR       = "Separator"
-	TYPE_CONTAINER       = "Container"
-	TYPE_CLASS_CONTAINER = "Class-Container"
-	TYPE_OTHER           = "Other"
-	# toggle dock visibility
-	HIDE_DOCK   = 0
-	SHOW_DOCK   = 1
-	TOGGLE_DOCK = 2
-	
-	#####################
-	### INIT AND DBUS ###
-	#####################
-	
-	def __init__(self, app_name="cairo-dock"):
-		""" Initialize the interface.
-		It defines the following:
-		 - cDataDir: main dir
-		 - cCurrentThemeDir: current theme dir
-		 - cConfFile : path to the global config file
-		 """
-		self.dock = None
-		self.cAppName = app_name
-		self.cDataDir = USER_CONFIG_DIR + '/' + app_name
-		self.cCurrentThemeDir = self.cDataDir + '/current_theme'
-		self.cLaunchersDir = self.cCurrentThemeDir + '/launchers'
-		self.cPluginsDir = self.cCurrentThemeDir + '/plug-ins'
-		self.cConfFile = self.cCurrentThemeDir + '/' + app_name + '.conf'
-		
-		self._connect()
-	
-	def _connect(self):
-		# get gldi on the bus.
-		bus = dbus.SessionBus()
-		
-		name1 = self.cAppName.replace('-','')  # -> cairodock
-		name2 = re.sub('-[a-z]', lambda x: x.group(0).upper(), self.cAppName)
-		name2 = re.sub('^[a-z]', lambda x: x.group(0).upper(), name2)  # -> CairoDock
-		name2 = name2.replace('-','')  # -> CairoDock
-		cBusPath = '/org/'+name1+'/'+name2
-		try:
-			dbus_object = bus.get_object("org.cairodock.CairoDock", cBusPath)
-		except:
-			print ">>> object '"+cBusPath+"' can't be found on the bus, exit.\nMake sure that Cairo-Dock is running"
-			return
-		self.iface = dbus.Interface(dbus_object, "org.cairodock.CairoDock")  # this object represents gldi.
-		

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

=== modified file 'Dbus/interfaces/ruby/CDApplet.rb'
--- Dbus/interfaces/ruby/CDApplet.rb	2011-09-26 12:56:12 +0000
+++ Dbus/interfaces/ruby/CDApplet.rb	2012-02-14 14:04:19 +0000
@@ -57,8 +57,6 @@
 	DIALOG_KEY_ESCAPE = -2
 
 	def initialize
-		#~ self.cAppletName = File.basename(Dir.getwd)
-		#~ self.cConfFile = File.expand_path("~/.config/cairo-dock/current_theme/plug-ins/#{self.cAppletName}/#{self.cAppletName}.conf")
 		self.config = {}
 		self.bus = nil
 		self.icon = nil
@@ -67,7 +65,9 @@
 		self.cAppletName = $0[2,999]
 		self.cBusPath = ARGV[1]
 		self.cConfFile = ARGV[2]
-		self.cParentAppName = ARGV[3]
+		self.cRootDataDir = ARGV[3]
+		self.cParentAppName = ARGV[4]
+		self.cShareDataDir = Dir.getwd
 		
 		self._get_config()
 		self._connect_to_dock()

=== modified file 'Dbus/interfaces/vala/CDApplet.vala'
--- Dbus/interfaces/vala/CDApplet.vala	2011-09-26 12:56:12 +0000
+++ Dbus/interfaces/vala/CDApplet.vala	2012-02-14 14:04:19 +0000
@@ -83,6 +83,8 @@
 	public string cConfFile;
 	public string cParentAppName;
 	public string cBusPath;
+	public string cShareDataDir;
+	public string cRootDataDir;
 	private MainLoop loop;
 	private string _cMenuIconId;
 	
@@ -129,7 +131,9 @@
 		this.cAppletName = argv[0].substring(2,999);
 		this.cBusPath = argv[2];
 		this.cConfFile = argv[3];
-		this.cParentAppName = argv[4];
+		this.cRootDataDir = argv[4];
+		this.cParentAppName = argv[5];
+		//this.cShareDataDir = get_current_dir();  // not sure of the exact syntax...
 		
 		this._get_config();
 		this._connect_to_bus();

=== modified file 'Dbus/interfaces/vala/src/CDApplet.h'
--- Dbus/interfaces/vala/src/CDApplet.h	2011-10-03 15:13:15 +0000
+++ Dbus/interfaces/vala/src/CDApplet.h	2012-02-14 14:04:19 +0000
@@ -1,8 +1,8 @@
 /* CDApplet.h generated by valac 0.10.0, the Vala compiler, do not modify */
 
 
-#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__
+#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__
 
 #include <glib.h>
 #include <glib-object.h>

=== modified file 'Dbus/src/applet-dbus.c'
--- Dbus/src/applet-dbus.c	2011-08-09 18:08:08 +0000
+++ Dbus/src/applet-dbus.c	2012-02-14 14:04:19 +0000
@@ -82,7 +82,7 @@
 
 static void _on_init_module (CairoDockModuleInstance *pModuleInstance, GKeyFile *pKeyFile)
 {
-	cd_debug ("%s (%d)", __func__, (int)pModuleInstance->pModule->fLastLoadingTime);
+	cd_debug ("%s ()", __func__);
 	
 	//\_____________ On initialise l'icone.
 	cd_dbus_action_on_init_module (pModuleInstance);
@@ -105,7 +105,7 @@
 	//\_____________ On (re)lance l'executable de l'applet.
 	cd_dbus_launch_applet_process (pModuleInstance, pDbusApplet);
 }
-static gboolean _cd_dbus_register_new_module (const gchar *cModuleName, const gchar *cDescription, const gchar *cAuthor, const gchar *cVersion, gint iCategory, const gchar *cIconName, const gchar *cShareDataDir, gboolean bMultiInstance)
+static gboolean _cd_dbus_register_new_module (const gchar *cModuleName, const gchar *cDescription, const gchar *cAuthor, const gchar *cVersion, gint iCategory, const gchar *cIconName, const gchar *cShareDataDir, gboolean bMultiInstance, gboolean bActAsLauncher)
 {
 	cd_message ("%s (%s)", __func__, cModuleName);
 	
@@ -147,6 +147,7 @@
 		pVisitCard->cTitle = g_strdup (dgettext (pVisitCard->cGettextDomain, cModuleName));
 		pVisitCard->iContainerType = CAIRO_DOCK_MODULE_CAN_DOCK | CAIRO_DOCK_MODULE_CAN_DESKLET;
 		pVisitCard->bMultiInstance = bMultiInstance;
+		pVisitCard->bActAsLauncher = bActAsLauncher;  // ex.: XChat controls xchat/xchat-gnome, but it does that only after initializing; we need to know if it's a launcher before the taskbar is loaded, hence this parameter.
 		pModule->pInterface = g_new0 (CairoDockModuleInterface, 1);
 		pModule->pInterface->initModule = _on_init_module;
 		pModule->pInterface->stopModule = cd_dbus_emit_on_stop_module;
@@ -213,11 +214,13 @@
 	
 	gboolean bMultiInstance = g_key_file_get_boolean (pKeyFile, "Register", "multi-instance", NULL);  // false if not specified
 	
+	gboolean bActAsLauncher = g_key_file_get_boolean (pKeyFile, "Register", "act as launcher", NULL);  // false if not specified
+	
 	gchar *cShareDataDir = g_strdup_printf ("%s/%s", cThirdPartyPath, cModuleName);
 	
 	g_key_file_free (pKeyFile);
 	
-	gboolean bActivationOk = _cd_dbus_register_new_module (cModuleName, cDescription, cAuthor, cVersion, iCategory, cIconName, cShareDataDir, bMultiInstance);
+	gboolean bActivationOk = _cd_dbus_register_new_module (cModuleName, cDescription, cAuthor, cVersion, iCategory, cIconName, cShareDataDir, bMultiInstance, bActAsLauncher);
 	g_free (cDescription);
 	g_free (cAuthor);
 	g_free (cVersion);
@@ -295,7 +298,7 @@
 		{
 			if (CAIRO_DOCK_IS_DOCK (pContainer))
 			{
-				cairo_dock_detach_icon_from_dock (pIcon, CAIRO_DOCK (pContainer), myIconsParam.iSeparateIcons);
+				cairo_dock_detach_icon_from_dock (pIcon, CAIRO_DOCK (pContainer));
 				cairo_dock_free_icon (pIcon);
 				cairo_dock_update_dock_size (CAIRO_DOCK (pContainer));
 				cairo_dock_redraw_container (pContainer);

=== modified file 'Dbus/src/applet-struct.h'
--- Dbus/src/applet-struct.h	2011-09-26 12:56:12 +0000
+++ Dbus/src/applet-struct.h	2012-02-14 14:04:19 +0000
@@ -105,9 +105,10 @@
 	dbusMainObject *pMainObject;
 	const gchar *cProgName;
 	gchar *cBasePath;
-	GtkWidget *pModuleSubMenu;
+	///GtkWidget *pModuleSubMenu;
 	GtkWidget *pModuleMainMenu;
 	dbusApplet *pCurrentMenuDbusApplet;
+	gint iMenuPosition;
 	Window xActiveWindow;
 	CairoDockTask *pGetListTask;
 	GList *pUpdateTasksList;

=== modified file 'Dbus/src/dbus-applet-spec.h'
--- Dbus/src/dbus-applet-spec.h	2011-04-20 20:46:51 +0000
+++ Dbus/src/dbus-applet-spec.h	2012-02-14 14:04:19 +0000
@@ -55,102 +55,6 @@
 #endif /* !G_ENABLE_DEBUG */
 
 
-/* BOOLEAN:STRING,INT,POINTER */
-extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__STRING_INT_POINTER (GClosure     *closure,
-                                                                          GValue       *return_value,
-                                                                          guint         n_param_values,
-                                                                          const GValue *param_values,
-                                                                          gpointer      invocation_hint,
-                                                                          gpointer      marshal_data);
-void
-dbus_glib_marshal_cd_dbus_applet_BOOLEAN__STRING_INT_POINTER (GClosure     *closure,
-                                                              GValue       *return_value G_GNUC_UNUSED,
-                                                              guint         n_param_values,
-                                                              const GValue *param_values,
-                                                              gpointer      invocation_hint G_GNUC_UNUSED,
-                                                              gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_INT_POINTER) (gpointer     data1,
-                                                                gpointer     arg_1,
-                                                                gint         arg_2,
-                                                                gpointer     arg_3,
-                                                                gpointer     data2);
-  register GMarshalFunc_BOOLEAN__STRING_INT_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 4);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__STRING_INT_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_string (param_values + 1),
-                       g_marshal_value_peek_int (param_values + 2),
-                       g_marshal_value_peek_pointer (param_values + 3),
-                       data2);
-
-  g_value_set_boolean (return_value, v_return);
-}
-
-/* BOOLEAN:BOXED,POINTER */
-extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOXED_POINTER (GClosure     *closure,
-                                                                     GValue       *return_value,
-                                                                     guint         n_param_values,
-                                                                     const GValue *param_values,
-                                                                     gpointer      invocation_hint,
-                                                                     gpointer      marshal_data);
-void
-dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOXED_POINTER (GClosure     *closure,
-                                                         GValue       *return_value G_GNUC_UNUSED,
-                                                         guint         n_param_values,
-                                                         const GValue *param_values,
-                                                         gpointer      invocation_hint G_GNUC_UNUSED,
-                                                         gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_POINTER) (gpointer     data1,
-                                                           gpointer     arg_1,
-                                                           gpointer     arg_2,
-                                                           gpointer     data2);
-  register GMarshalFunc_BOOLEAN__BOXED_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__BOXED_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_boxed (param_values + 1),
-                       g_marshal_value_peek_pointer (param_values + 2),
-                       data2);
-
-  g_value_set_boolean (return_value, v_return);
-}
-
 /* BOOLEAN:BOXED,BOXED,POINTER */
 extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOXED_BOXED_POINTER (GClosure     *closure,
                                                                            GValue       *return_value,
@@ -200,32 +104,33 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:BOOLEAN,POINTER */
-extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOOLEAN_POINTER (GClosure     *closure,
-                                                                       GValue       *return_value,
-                                                                       guint         n_param_values,
-                                                                       const GValue *param_values,
-                                                                       gpointer      invocation_hint,
-                                                                       gpointer      marshal_data);
+/* BOOLEAN:BOOLEAN,STRING,POINTER */
+extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOOLEAN_STRING_POINTER (GClosure     *closure,
+                                                                              GValue       *return_value,
+                                                                              guint         n_param_values,
+                                                                              const GValue *param_values,
+                                                                              gpointer      invocation_hint,
+                                                                              gpointer      marshal_data);
 void
-dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOOLEAN_POINTER (GClosure     *closure,
-                                                           GValue       *return_value G_GNUC_UNUSED,
-                                                           guint         n_param_values,
-                                                           const GValue *param_values,
-                                                           gpointer      invocation_hint G_GNUC_UNUSED,
-                                                           gpointer      marshal_data)
+dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOOLEAN_STRING_POINTER (GClosure     *closure,
+                                                                  GValue       *return_value G_GNUC_UNUSED,
+                                                                  guint         n_param_values,
+                                                                  const GValue *param_values,
+                                                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                                                  gpointer      marshal_data)
 {
-  typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN_POINTER) (gpointer     data1,
-                                                             gboolean     arg_1,
-                                                             gpointer     arg_2,
-                                                             gpointer     data2);
-  register GMarshalFunc_BOOLEAN__BOOLEAN_POINTER callback;
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN_STRING_POINTER) (gpointer     data1,
+                                                                    gboolean     arg_1,
+                                                                    gpointer     arg_2,
+                                                                    gpointer     arg_3,
+                                                                    gpointer     data2);
+  register GMarshalFunc_BOOLEAN__BOOLEAN_STRING_POINTER callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
   gboolean v_return;
 
   g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 3);
+  g_return_if_fail (n_param_values == 4);
 
   if (G_CCLOSURE_SWAP_DATA (closure))
     {
@@ -237,58 +142,10 @@
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_BOOLEAN__BOOLEAN_POINTER) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_BOOLEAN__BOOLEAN_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
 
   v_return = callback (data1,
                        g_marshal_value_peek_boolean (param_values + 1),
-                       g_marshal_value_peek_pointer (param_values + 2),
-                       data2);
-
-  g_value_set_boolean (return_value, v_return);
-}
-
-/* BOOLEAN:STRING,STRING,POINTER */
-extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__STRING_STRING_POINTER (GClosure     *closure,
-                                                                             GValue       *return_value,
-                                                                             guint         n_param_values,
-                                                                             const GValue *param_values,
-                                                                             gpointer      invocation_hint,
-                                                                             gpointer      marshal_data);
-void
-dbus_glib_marshal_cd_dbus_applet_BOOLEAN__STRING_STRING_POINTER (GClosure     *closure,
-                                                                 GValue       *return_value G_GNUC_UNUSED,
-                                                                 guint         n_param_values,
-                                                                 const GValue *param_values,
-                                                                 gpointer      invocation_hint G_GNUC_UNUSED,
-                                                                 gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_STRING_POINTER) (gpointer     data1,
-                                                                   gpointer     arg_1,
-                                                                   gpointer     arg_2,
-                                                                   gpointer     arg_3,
-                                                                   gpointer     data2);
-  register GMarshalFunc_BOOLEAN__STRING_STRING_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 4);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_string (param_values + 1),
                        g_marshal_value_peek_string (param_values + 2),
                        g_marshal_value_peek_pointer (param_values + 3),
                        data2);
@@ -345,6 +202,100 @@
   g_value_set_boolean (return_value, v_return);
 }
 
+/* BOOLEAN:POINTER,POINTER */
+extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__POINTER_POINTER (GClosure     *closure,
+                                                                       GValue       *return_value,
+                                                                       guint         n_param_values,
+                                                                       const GValue *param_values,
+                                                                       gpointer      invocation_hint,
+                                                                       gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_applet_BOOLEAN__POINTER_POINTER (GClosure     *closure,
+                                                           GValue       *return_value G_GNUC_UNUSED,
+                                                           guint         n_param_values,
+                                                           const GValue *param_values,
+                                                           gpointer      invocation_hint G_GNUC_UNUSED,
+                                                           gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer     data1,
+                                                             gpointer     arg_1,
+                                                             gpointer     arg_2,
+                                                             gpointer     data2);
+  register GMarshalFunc_BOOLEAN__POINTER_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__POINTER_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_pointer (param_values + 1),
+                       g_marshal_value_peek_pointer (param_values + 2),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:BOXED,POINTER */
+extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOXED_POINTER (GClosure     *closure,
+                                                                     GValue       *return_value,
+                                                                     guint         n_param_values,
+                                                                     const GValue *param_values,
+                                                                     gpointer      invocation_hint,
+                                                                     gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOXED_POINTER (GClosure     *closure,
+                                                         GValue       *return_value G_GNUC_UNUSED,
+                                                         guint         n_param_values,
+                                                         const GValue *param_values,
+                                                         gpointer      invocation_hint G_GNUC_UNUSED,
+                                                         gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_POINTER) (gpointer     data1,
+                                                           gpointer     arg_1,
+                                                           gpointer     arg_2,
+                                                           gpointer     data2);
+  register GMarshalFunc_BOOLEAN__BOXED_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__BOXED_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_boxed (param_values + 1),
+                       g_marshal_value_peek_pointer (param_values + 2),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
 /* BOOLEAN:STRING,INT,STRING,POINTER */
 extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__STRING_INT_STRING_POINTER (GClosure     *closure,
                                                                                  GValue       *return_value,
@@ -396,27 +347,27 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:BOOLEAN,STRING,POINTER */
-extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOOLEAN_STRING_POINTER (GClosure     *closure,
-                                                                              GValue       *return_value,
-                                                                              guint         n_param_values,
-                                                                              const GValue *param_values,
-                                                                              gpointer      invocation_hint,
-                                                                              gpointer      marshal_data);
+/* BOOLEAN:STRING,INT,POINTER */
+extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__STRING_INT_POINTER (GClosure     *closure,
+                                                                          GValue       *return_value,
+                                                                          guint         n_param_values,
+                                                                          const GValue *param_values,
+                                                                          gpointer      invocation_hint,
+                                                                          gpointer      marshal_data);
 void
-dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOOLEAN_STRING_POINTER (GClosure     *closure,
-                                                                  GValue       *return_value G_GNUC_UNUSED,
-                                                                  guint         n_param_values,
-                                                                  const GValue *param_values,
-                                                                  gpointer      invocation_hint G_GNUC_UNUSED,
-                                                                  gpointer      marshal_data)
+dbus_glib_marshal_cd_dbus_applet_BOOLEAN__STRING_INT_POINTER (GClosure     *closure,
+                                                              GValue       *return_value G_GNUC_UNUSED,
+                                                              guint         n_param_values,
+                                                              const GValue *param_values,
+                                                              gpointer      invocation_hint G_GNUC_UNUSED,
+                                                              gpointer      marshal_data)
 {
-  typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN_STRING_POINTER) (gpointer     data1,
-                                                                    gboolean     arg_1,
-                                                                    gpointer     arg_2,
-                                                                    gpointer     arg_3,
-                                                                    gpointer     data2);
-  register GMarshalFunc_BOOLEAN__BOOLEAN_STRING_POINTER callback;
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_INT_POINTER) (gpointer     data1,
+                                                                gpointer     arg_1,
+                                                                gint         arg_2,
+                                                                gpointer     arg_3,
+                                                                gpointer     data2);
+  register GMarshalFunc_BOOLEAN__STRING_INT_POINTER callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
   gboolean v_return;
@@ -434,11 +385,11 @@
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_BOOLEAN__BOOLEAN_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_BOOLEAN__STRING_INT_POINTER) (marshal_data ? marshal_data : cc->callback);
 
   v_return = callback (data1,
-                       g_marshal_value_peek_boolean (param_values + 1),
-                       g_marshal_value_peek_string (param_values + 2),
+                       g_marshal_value_peek_string (param_values + 1),
+                       g_marshal_value_peek_int (param_values + 2),
                        g_marshal_value_peek_pointer (param_values + 3),
                        data2);
 
@@ -543,26 +494,75 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:POINTER,POINTER */
-extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__POINTER_POINTER (GClosure     *closure,
+/* BOOLEAN:STRING,STRING,POINTER */
+extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__STRING_STRING_POINTER (GClosure     *closure,
+                                                                             GValue       *return_value,
+                                                                             guint         n_param_values,
+                                                                             const GValue *param_values,
+                                                                             gpointer      invocation_hint,
+                                                                             gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_applet_BOOLEAN__STRING_STRING_POINTER (GClosure     *closure,
+                                                                 GValue       *return_value G_GNUC_UNUSED,
+                                                                 guint         n_param_values,
+                                                                 const GValue *param_values,
+                                                                 gpointer      invocation_hint G_GNUC_UNUSED,
+                                                                 gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_STRING_POINTER) (gpointer     data1,
+                                                                   gpointer     arg_1,
+                                                                   gpointer     arg_2,
+                                                                   gpointer     arg_3,
+                                                                   gpointer     data2);
+  register GMarshalFunc_BOOLEAN__STRING_STRING_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_string (param_values + 1),
+                       g_marshal_value_peek_string (param_values + 2),
+                       g_marshal_value_peek_pointer (param_values + 3),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:BOOLEAN,POINTER */
+extern void dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOOLEAN_POINTER (GClosure     *closure,
                                                                        GValue       *return_value,
                                                                        guint         n_param_values,
                                                                        const GValue *param_values,
                                                                        gpointer      invocation_hint,
                                                                        gpointer      marshal_data);
 void
-dbus_glib_marshal_cd_dbus_applet_BOOLEAN__POINTER_POINTER (GClosure     *closure,
+dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOOLEAN_POINTER (GClosure     *closure,
                                                            GValue       *return_value G_GNUC_UNUSED,
                                                            guint         n_param_values,
                                                            const GValue *param_values,
                                                            gpointer      invocation_hint G_GNUC_UNUSED,
                                                            gpointer      marshal_data)
 {
-  typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer     data1,
-                                                             gpointer     arg_1,
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN_POINTER) (gpointer     data1,
+                                                             gboolean     arg_1,
                                                              gpointer     arg_2,
                                                              gpointer     data2);
-  register GMarshalFunc_BOOLEAN__POINTER_POINTER callback;
+  register GMarshalFunc_BOOLEAN__BOOLEAN_POINTER callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
   gboolean v_return;
@@ -580,10 +580,10 @@
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_BOOLEAN__POINTER_POINTER) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_BOOLEAN__BOOLEAN_POINTER) (marshal_data ? marshal_data : cc->callback);
 
   v_return = callback (data1,
-                       g_marshal_value_peek_pointer (param_values + 1),
+                       g_marshal_value_peek_boolean (param_values + 1),
                        g_marshal_value_peek_pointer (param_values + 2),
                        data2);
 
@@ -613,15 +613,16 @@
   { (GCallback) cd_dbus_applet_render_values, dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOXED_POINTER, 992 },
   { (GCallback) cd_dbus_applet_control_appli, dbus_glib_marshal_cd_dbus_applet_BOOLEAN__STRING_POINTER, 1052 },
   { (GCallback) cd_dbus_applet_show_appli, dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOOLEAN_POINTER, 1121 },
-  { (GCallback) cd_dbus_applet_populate_menu, dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOXED_POINTER, 1175 },
-  { (GCallback) cd_dbus_applet_add_menu_items, dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOXED_POINTER, 1235 },
-  { (GCallback) cd_dbus_applet_bind_shortkey, dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOXED_POINTER, 1298 },
+  { (GCallback) cd_dbus_applet_act_on_appli, dbus_glib_marshal_cd_dbus_applet_BOOLEAN__STRING_POINTER, 1175 },
+  { (GCallback) cd_dbus_applet_populate_menu, dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOXED_POINTER, 1232 },
+  { (GCallback) cd_dbus_applet_add_menu_items, dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOXED_POINTER, 1292 },
+  { (GCallback) cd_dbus_applet_bind_shortkey, dbus_glib_marshal_cd_dbus_applet_BOOLEAN__BOXED_POINTER, 1355 },
 };
 
 const DBusGObjectInfo dbus_glib_cd_dbus_applet_object_info = {  1,
   dbus_glib_cd_dbus_applet_methods,
-  20,
-"org.cairodock.CairoDock.applet\0Get\0S\0cProperty\0I\0s\0value\0O\0F\0N\0v\0\0org.cairodock.CairoDock.applet\0GetAll\0S\0hProperties\0O\0F\0N\0a{sv}\0\0org.cairodock.CairoDock.applet\0SetQuickInfo\0S\0cQuickInfo\0I\0s\0\0org.cairodock.CairoDock.applet\0SetLabel\0S\0cLabel\0I\0s\0\0org.cairodock.CairoDock.applet\0SetIcon\0S\0cImage\0I\0s\0\0org.cairodock.CairoDock.applet\0SetEmblem\0S\0cImage\0I\0s\0iPosition\0I\0i\0\0org.cairodock.CairoDock.applet\0Animate\0S\0cAnimation\0I\0s\0iNbRounds\0I\0i\0\0org.cairodock.CairoDock.applet\0DemandsAttention\0S\0bStart\0I\0b\0cAnimation\0I\0s\0\0org.cairodock.CairoDock.applet\0ShowDialog\0S\0cMessage\0I\0s\0iDuration\0I\0i\0\0org.cairodock.CairoDock.applet\0AskQuestion\0S\0cMessage\0I\0s\0\0org.cairodock.CairoDock.applet\0AskValue\0S\0cMessage\0I\0s\0fInitialValue\0I\0d\0fMaxlValue\0I\0d\0\0org.cairodock.CairoDock.applet\0AskText\0S\0cMessage\0I\0s\0cInitialText\0I\0s\0\0org.cairodock.CairoDock.applet\0PopupDialog\0S\0hDialogAttributes\0I\0a{sv}\0hWidgetAttributes\0I\0a{sv}\0\0org.cairodock.CairoDock.applet\0AddDataRenderer\0S\0cType\0I\0s\0iNbValues\0I\0i\0cTheme\0I\0s\0\0org.cairodock.CairoDock.applet\0RenderValues\0S\0pValues\0I\0ad\0\0org.cairodock.CairoDock.applet\0ControlAppli\0S\0cApplicationClass\0I\0s\0\0org.cairodock.CairoDock.applet\0ShowAppli\0S\0bShow\0I\0b\0\0org.cairodock.CairoDock.applet\0PopulateMenu\0S\0pLabels\0I\0as\0\0org.cairodock.CairoDock.applet\0AddMenuItems\0S\0pItems\0I\0aa{sv}\0\0org.cairodock.CairoDock.applet\0BindShortkey\0S\0cShortkeys\0I\0as\0\0\0",
+  21,
+"org.cairodock.CairoDock.applet\0Get\0S\0cProperty\0I\0s\0value\0O\0F\0N\0v\0\0org.cairodock.CairoDock.applet\0GetAll\0S\0hProperties\0O\0F\0N\0a{sv}\0\0org.cairodock.CairoDock.applet\0SetQuickInfo\0S\0cQuickInfo\0I\0s\0\0org.cairodock.CairoDock.applet\0SetLabel\0S\0cLabel\0I\0s\0\0org.cairodock.CairoDock.applet\0SetIcon\0S\0cImage\0I\0s\0\0org.cairodock.CairoDock.applet\0SetEmblem\0S\0cImage\0I\0s\0iPosition\0I\0i\0\0org.cairodock.CairoDock.applet\0Animate\0S\0cAnimation\0I\0s\0iNbRounds\0I\0i\0\0org.cairodock.CairoDock.applet\0DemandsAttention\0S\0bStart\0I\0b\0cAnimation\0I\0s\0\0org.cairodock.CairoDock.applet\0ShowDialog\0S\0cMessage\0I\0s\0iDuration\0I\0i\0\0org.cairodock.CairoDock.applet\0AskQuestion\0S\0cMessage\0I\0s\0\0org.cairodock.CairoDock.applet\0AskValue\0S\0cMessage\0I\0s\0fInitialValue\0I\0d\0fMaxlValue\0I\0d\0\0org.cairodock.CairoDock.applet\0AskText\0S\0cMessage\0I\0s\0cInitialText\0I\0s\0\0org.cairodock.CairoDock.applet\0PopupDialog\0S\0hDialogAttributes\0I\0a{sv}\0hWidgetAttributes\0I\0a{sv}\0\0org.cairodock.CairoDock.applet\0AddDataRenderer\0S\0cType\0I\0s\0iNbValues\0I\0i\0cTheme\0I\0s\0\0org.cairodock.CairoDock.applet\0RenderValues\0S\0pValues\0I\0ad\0\0org.cairodock.CairoDock.applet\0ControlAppli\0S\0cApplicationClass\0I\0s\0\0org.cairodock.CairoDock.applet\0ShowAppli\0S\0bShow\0I\0b\0\0org.cairodock.CairoDock.applet\0ActOnAppli\0S\0cAction\0I\0s\0\0org.cairodock.CairoDock.applet\0PopulateMenu\0S\0pLabels\0I\0as\0\0org.cairodock.CairoDock.applet\0AddMenuItems\0S\0pItems\0I\0aa{sv}\0\0org.cairodock.CairoDock.applet\0BindShortkey\0S\0cShortkeys\0I\0as\0\0\0",
 "org.cairodock.CairoDock.applet\0on_click\0org.cairodock.CairoDock.applet\0on_middle_click\0org.cairodock.CairoDock.applet\0on_scroll\0org.cairodock.CairoDock.applet\0on_build_menu\0org.cairodock.CairoDock.applet\0on_menu_select\0org.cairodock.CairoDock.applet\0on_drop_data\0org.cairodock.CairoDock.applet\0on_change_focus\0org.cairodock.CairoDock.applet\0on_answer\0org.cairodock.CairoDock.applet\0on_answer_dialog\0org.cairodock.CairoDock.applet\0on_shortkey\0org.cairodock.CairoDock.applet\0on_stop_module\0org.cairodock.CairoDock.applet\0on_reload_module\0\0",
 "\0"
 };

=== modified file 'Dbus/src/dbus-main-spec.h'
--- Dbus/src/dbus-main-spec.h	2011-08-09 18:08:08 +0000
+++ Dbus/src/dbus-main-spec.h	2012-02-14 14:04:19 +0000
@@ -102,146 +102,50 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:BOXED,POINTER */
-extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOXED_POINTER (GClosure     *closure,
-                                                                   GValue       *return_value,
-                                                                   guint         n_param_values,
-                                                                   const GValue *param_values,
-                                                                   gpointer      invocation_hint,
-                                                                   gpointer      marshal_data);
-void
-dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOXED_POINTER (GClosure     *closure,
-                                                       GValue       *return_value G_GNUC_UNUSED,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint G_GNUC_UNUSED,
-                                                       gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_POINTER) (gpointer     data1,
-                                                           gpointer     arg_1,
-                                                           gpointer     arg_2,
-                                                           gpointer     data2);
-  register GMarshalFunc_BOOLEAN__BOXED_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__BOXED_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_boxed (param_values + 1),
-                       g_marshal_value_peek_pointer (param_values + 2),
-                       data2);
-
-  g_value_set_boolean (return_value, v_return);
-}
-
-/* BOOLEAN:BOOLEAN,POINTER */
-extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_POINTER (GClosure     *closure,
-                                                                     GValue       *return_value,
-                                                                     guint         n_param_values,
-                                                                     const GValue *param_values,
-                                                                     gpointer      invocation_hint,
-                                                                     gpointer      marshal_data);
-void
-dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_POINTER (GClosure     *closure,
-                                                         GValue       *return_value G_GNUC_UNUSED,
-                                                         guint         n_param_values,
-                                                         const GValue *param_values,
-                                                         gpointer      invocation_hint G_GNUC_UNUSED,
-                                                         gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN_POINTER) (gpointer     data1,
-                                                             gboolean     arg_1,
-                                                             gpointer     arg_2,
-                                                             gpointer     data2);
-  register GMarshalFunc_BOOLEAN__BOOLEAN_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__BOOLEAN_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_boolean (param_values + 1),
-                       g_marshal_value_peek_pointer (param_values + 2),
-                       data2);
-
-  g_value_set_boolean (return_value, v_return);
-}
-
-/* BOOLEAN:BOOLEAN,STRING,STRING,POINTER */
-extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_STRING_STRING_POINTER (GClosure     *closure,
-                                                                                   GValue       *return_value,
-                                                                                   guint         n_param_values,
-                                                                                   const GValue *param_values,
-                                                                                   gpointer      invocation_hint,
-                                                                                   gpointer      marshal_data);
-void
-dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_STRING_STRING_POINTER (GClosure     *closure,
-                                                                       GValue       *return_value G_GNUC_UNUSED,
-                                                                       guint         n_param_values,
-                                                                       const GValue *param_values,
-                                                                       gpointer      invocation_hint G_GNUC_UNUSED,
-                                                                       gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN_STRING_STRING_POINTER) (gpointer     data1,
-                                                                           gboolean     arg_1,
-                                                                           gpointer     arg_2,
-                                                                           gpointer     arg_3,
-                                                                           gpointer     arg_4,
-                                                                           gpointer     data2);
-  register GMarshalFunc_BOOLEAN__BOOLEAN_STRING_STRING_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 5);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__BOOLEAN_STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_boolean (param_values + 1),
-                       g_marshal_value_peek_string (param_values + 2),
-                       g_marshal_value_peek_string (param_values + 3),
-                       g_marshal_value_peek_pointer (param_values + 4),
+/* BOOLEAN:STRING,BOOLEAN,POINTER */
+extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_BOOLEAN_POINTER (GClosure     *closure,
+                                                                            GValue       *return_value,
+                                                                            guint         n_param_values,
+                                                                            const GValue *param_values,
+                                                                            gpointer      invocation_hint,
+                                                                            gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_BOOLEAN_POINTER (GClosure     *closure,
+                                                                GValue       *return_value G_GNUC_UNUSED,
+                                                                guint         n_param_values,
+                                                                const GValue *param_values,
+                                                                gpointer      invocation_hint G_GNUC_UNUSED,
+                                                                gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_BOOLEAN_POINTER) (gpointer     data1,
+                                                                    gpointer     arg_1,
+                                                                    gboolean     arg_2,
+                                                                    gpointer     arg_3,
+                                                                    gpointer     data2);
+  register GMarshalFunc_BOOLEAN__STRING_BOOLEAN_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__STRING_BOOLEAN_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_string (param_values + 1),
+                       g_marshal_value_peek_boolean (param_values + 2),
+                       g_marshal_value_peek_pointer (param_values + 3),
                        data2);
 
   g_value_set_boolean (return_value, v_return);
@@ -292,55 +196,6 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:STRING,STRING,POINTER */
-extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_STRING_POINTER (GClosure     *closure,
-                                                                           GValue       *return_value,
-                                                                           guint         n_param_values,
-                                                                           const GValue *param_values,
-                                                                           gpointer      invocation_hint,
-                                                                           gpointer      marshal_data);
-void
-dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_STRING_POINTER (GClosure     *closure,
-                                                               GValue       *return_value G_GNUC_UNUSED,
-                                                               guint         n_param_values,
-                                                               const GValue *param_values,
-                                                               gpointer      invocation_hint G_GNUC_UNUSED,
-                                                               gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_STRING_POINTER) (gpointer     data1,
-                                                                   gpointer     arg_1,
-                                                                   gpointer     arg_2,
-                                                                   gpointer     arg_3,
-                                                                   gpointer     data2);
-  register GMarshalFunc_BOOLEAN__STRING_STRING_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 4);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_string (param_values + 1),
-                       g_marshal_value_peek_string (param_values + 2),
-                       g_marshal_value_peek_pointer (param_values + 3),
-                       data2);
-
-  g_value_set_boolean (return_value, v_return);
-}
-
 /* BOOLEAN:STRING,POINTER,POINTER */
 extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_POINTER_POINTER (GClosure     *closure,
                                                                             GValue       *return_value,
@@ -390,57 +245,6 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:STRING,INT,STRING,POINTER */
-extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_POINTER (GClosure     *closure,
-                                                                               GValue       *return_value,
-                                                                               guint         n_param_values,
-                                                                               const GValue *param_values,
-                                                                               gpointer      invocation_hint,
-                                                                               gpointer      marshal_data);
-void
-dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_POINTER (GClosure     *closure,
-                                                                   GValue       *return_value G_GNUC_UNUSED,
-                                                                   guint         n_param_values,
-                                                                   const GValue *param_values,
-                                                                   gpointer      invocation_hint G_GNUC_UNUSED,
-                                                                   gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_INT_STRING_POINTER) (gpointer     data1,
-                                                                       gpointer     arg_1,
-                                                                       gint         arg_2,
-                                                                       gpointer     arg_3,
-                                                                       gpointer     arg_4,
-                                                                       gpointer     data2);
-  register GMarshalFunc_BOOLEAN__STRING_INT_STRING_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 5);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__STRING_INT_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_string (param_values + 1),
-                       g_marshal_value_peek_int (param_values + 2),
-                       g_marshal_value_peek_string (param_values + 3),
-                       g_marshal_value_peek_pointer (param_values + 4),
-                       data2);
-
-  g_value_set_boolean (return_value, v_return);
-}
-
 /* BOOLEAN:STRING,DOUBLE,STRING,POINTER,POINTER */
 extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_DOUBLE_STRING_POINTER_POINTER (GClosure     *closure,
                                                                                           GValue       *return_value,
@@ -494,6 +298,204 @@
   g_value_set_boolean (return_value, v_return);
 }
 
+/* BOOLEAN:BOOLEAN,STRING,STRING,POINTER */
+extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_STRING_STRING_POINTER (GClosure     *closure,
+                                                                                   GValue       *return_value,
+                                                                                   guint         n_param_values,
+                                                                                   const GValue *param_values,
+                                                                                   gpointer      invocation_hint,
+                                                                                   gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOOLEAN_STRING_STRING_POINTER (GClosure     *closure,
+                                                                       GValue       *return_value G_GNUC_UNUSED,
+                                                                       guint         n_param_values,
+                                                                       const GValue *param_values,
+                                                                       gpointer      invocation_hint G_GNUC_UNUSED,
+                                                                       gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN_STRING_STRING_POINTER) (gpointer     data1,
+                                                                           gboolean     arg_1,
+                                                                           gpointer     arg_2,
+                                                                           gpointer     arg_3,
+                                                                           gpointer     arg_4,
+                                                                           gpointer     data2);
+  register GMarshalFunc_BOOLEAN__BOOLEAN_STRING_STRING_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 5);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__BOOLEAN_STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_boolean (param_values + 1),
+                       g_marshal_value_peek_string (param_values + 2),
+                       g_marshal_value_peek_string (param_values + 3),
+                       g_marshal_value_peek_pointer (param_values + 4),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:BOXED,POINTER */
+extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOXED_POINTER (GClosure     *closure,
+                                                                   GValue       *return_value,
+                                                                   guint         n_param_values,
+                                                                   const GValue *param_values,
+                                                                   gpointer      invocation_hint,
+                                                                   gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_main_BOOLEAN__BOXED_POINTER (GClosure     *closure,
+                                                       GValue       *return_value G_GNUC_UNUSED,
+                                                       guint         n_param_values,
+                                                       const GValue *param_values,
+                                                       gpointer      invocation_hint G_GNUC_UNUSED,
+                                                       gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_POINTER) (gpointer     data1,
+                                                           gpointer     arg_1,
+                                                           gpointer     arg_2,
+                                                           gpointer     data2);
+  register GMarshalFunc_BOOLEAN__BOXED_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__BOXED_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_boxed (param_values + 1),
+                       g_marshal_value_peek_pointer (param_values + 2),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+/* BOOLEAN:STRING,INT,STRING,POINTER */
+extern void dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_POINTER (GClosure     *closure,
+                                                                               GValue       *return_value,
+                                                                               guint         n_param_values,
+                                                                               const GValue *param_values,
+                                                                               gpointer      invocation_hint,
+                                                                               gpointer      marshal_data);
+void
+dbus_glib_marshal_cd_dbus_main_BOOLEAN__STRING_INT_STRING_POINTER (GClosure     *closure,
+                                                                   GValue       *return_value G_GNUC_UNUSED,
+                                                                   guint         n_param_values,
+                                                                   const GValue *param_values,
+                                                                   gpointer      invocation_hint G_GNUC_UNUSED,
+                                                                   gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_INT_STRING_POINTER) (gpointer     data1,
+                                                                       gpointer     arg_1,
+                                                                       gint         arg_2,
+                                                                       gpointer     arg_3,
+                                                                       gpointer     arg_4,
+                                                                       gpointer     data2);
+  register GMarshalFunc_BOOLEAN__STRING_INT_STRING_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 5);
+