Merge lp:~cairo-dock-team/ubuntu/natty/cairo-dock-plug-ins/2.3.0-0rc1 into lp:ubuntu/natty/cairo-dock-plug-ins

[Matthieu Baerts]

The Cairo-Dock team proposes a Release Candidate for the version 2.3.0.
It's a major version, and it brings several improvements and fixes several bugs.

This version has been proposed on Debian too (on mentors.debian.net).

PS: don't forget to upload Cairo-Dock Core before because it contains the new API (LP: #723994)

(Bug report linked LP: #723995)

REM: it seems that the ubuntu branch (lp:ubuntu/cairo-dock-plug-ins) is not up to date. This bug has already been reported (LP: #704694)

[Micah Gersten (micahg)]

There's no upstream tarball imported here. Please use bzr merge-upstream to import the upstream tarball and then add your debian dir changes on top of that. See https://wiki.ubuntu.com/DistributedDevelopment/Documentation/NewUpstreamVersion for more information. I'll check back in about 9 hours.

review: Needs Fixing

[Matthieu Baerts (matttbe)]

Hello Micah,
Thank you for your support!

About Cairo-Dock I've tried to use 'bzr merge-upstream' but it was strange it didn't work. Even after having added a few tags as said on this wiki page https://wiki.ubuntu.com/DistributedDevelopment/Documentation/NewUpstreamVersion.
This what I did: bzr merge-upstream --version 2.3.0~0rc1 lp:cairo-dock-core -r tag:2.3.0~0rc1 --distribution=natty

But:
* I've added this tag in lp:cairo-dock-core and lp:cairo-dock-plug-ins: 2.3.0~0rc1
* Added two new series: lp:cairo-dock-core/2.3 and lp:cairo-dock-plug-ins/2.3 with this RC release.
* Added two tarballs on launchpad: https://launchpad.net/cairo-dock-core/2.3/2.3.0-0rc1 and https://launchpad.net/cairo-dock-plug-ins/2.3/2.3.0-0rc1
* And updated the debian/watch (uscan detects the new RC)

I hope one of this point can help you to update Cairo-Dock version on Ubuntu :)

(about Cairo-Dock Plug-Ins, it needs the latest version (this 2.3.0~0rc1 version) of Cairo-Dock (Core) to compile because it contains the new API)

Do I have to do something else?
Don't hesitate to contact me!

Best Regards,

Matt

[lp:~cairo-dock-team/ubuntu/natty/cairo-dock-plug-ins/2.3.0-0rc1]

21. By Matthieu Baerts on 2011-03-17

* New Upstream Version (LP: #723995)
* Added debian/source/format: 3.0
* debian/cairo-dock-plug-ins.install:
 - Added new files (interfaces for python, ruby, vala and mono)
* debian/control:
 - Added new dependences for new applets (sensors and zeitgeist)
    and new interfaces (python, valac, ruby and mono)
 - Updated the version of cairo-dock build-dependences
* debian/rules:
 - Added a new CMake flag to install python interface in debian/tmp
* Updated debian/watch

Unmerged revisions

21. By Matthieu Baerts on 2011-03-17

* New Upstream Version (LP: #723995)
* Added debian/source/format: 3.0
* debian/cairo-dock-plug-ins.install:
 - Added new files (interfaces for python, ruby, vala and mono)
* debian/control:
 - Added new dependences for new applets (sensors and zeitgeist)
    and new interfaces (python, valac, ruby and mono)
 - Updated the version of cairo-dock build-dependences
* debian/rules:
 - Added a new CMake flag to install python interface in debian/tmp
* Updated debian/watch

20. By Matthieu Baerts on 2011-01-18

* debian/control:
 - Replaced libwebkit-dev by libwebkitgtk-dev (LP: #704032)
* No change rebuild for libindicator1 > libindicator2 transition
* No change rebuild for libdbusmenu-gtk1 > libdbusmenu-gtk2 transition

19. By Matthieu Baerts on 2010-10-02

* New Upstream Version (LP: #653702)
* Fixed a few bugs:
 - All .mo files aren't installed into the right directory (LP: #653336)
 - Dbus: Fixed a crash when exiting Cairo-Dock
 - Indicator: Some modifications needed for the latest
               version of libindicator
 - RSSreader: Prevented a crash if myDrawContext != NULL
 - Clock: Prevented a crash if myDrawContext != NULL
 - Switcher:
  - Prevented a crash if myDrawContext != NULL
  - Fixed a crash if the plugin is launched much time before the WM
 - musicPlayer:
  - Used the right image set from the config panel
  - MPRIS plugin: fixed a bug with the tracknumber
 - Systray: not drawn outside the screen.
 - tomboy: not popup a dialogue inside the screen
 - xfce-integration: displayed a window when logout applet is launched
* debian/control:
 - Updated the version of cairo-dock-dev and cairo-dock-core

18. By Didier Roche-Tolomelli on 2010-09-22

debian/control: depends on latest libindicator-dev (LP: #637692)

17. By Matthieu Baerts on 2010-09-18

 - Fixed a crash in rainbow view if the subdock is empty
* debian/control
 - Updated the version of cairo-dock-dev and cairo-dock-core

16. By Matthieu Baerts on 2010-09-16

Status-Notifier: Fixed a typo

15. By Matthieu Baerts on 2010-09-16

* New Upstream Version (LP: #638529)
* Fixed a few bugs on LP:
 - Fixed a crash in rainbow view when the cone is completely opened
 - Installed in lib directory by default even in 64bits arch
 - Status-Notifier: fixed few bugs
 - Clock applet:
   - Notify of missed tasks (moved some functions to a new file)
   - Fixed a little memory leak
 - Removed some 'g_print' (LP: #500677: xsession-errors log)
* Updated translations

14. By Matthieu Baerts on 2010-09-07

* New Upstream Version (LP: #632054)
* Fixed a few bugs on LP:
 - LP: #616176 Dust Bin Hang and Incorrect Configuration
 - LP: #604034 Change terminal tab's name lost the color
 - LP: #582452 GMenu does not contain any applications
* Fixed a few bugs on glx-dock forum:
 - Fixed support of GMusicBrowser.
 - AlsaMixer has no emblem.
 - Status-Notifier doesn't be drawed into the dock.
* Updated translations
* debian/control:
 - Added cairo-dock-core as build-depends in order to prevent
   some builds errors.

13. By Didier Roche-Tolomelli on 2010-08-10

fix versionning

12. By Fabounet on 2010-08-09

applied Matttbe's patch on changelog and control files

=== modified file 'Animated-icons/src/applet-config.c'
--- Animated-icons/src/applet-config.c	2009-10-05 19:27:17 +0000
+++ Animated-icons/src/applet-config.c	2011-03-17 14:49:16 +0000
@@ -31,7 +31,7 @@
 	{
 		myConfig.iEffectsOnMouseOver[i] = -1;
 	}
-	for (j = 0; j < CAIRO_DOCK_NB_TYPES; j += 2)
+	for (j = 0; j < CAIRO_DOCK_NB_GROUPS; j += 2)
 	{
 		for (i = 0; i < CD_ANIMATIONS_NB_EFFECTS; i ++)
 		{

=== modified file 'Animated-icons/src/applet-init.c'
--- Animated-icons/src/applet-init.c	2010-08-07 01:43:25 +0000
+++ Animated-icons/src/applet-init.c	2011-03-17 14:49:16 +0000
@@ -44,14 +44,38 @@
 	if (! cairo_dock_reserve_data_slot (myApplet))
 		return;
 	
-	cairo_dock_register_notification (CAIRO_DOCK_ENTER_ICON, (CairoDockNotificationFunc) cd_animations_on_enter, CAIRO_DOCK_RUN_AFTER, NULL);
-	cairo_dock_register_notification (CAIRO_DOCK_CLICK_ICON, (CairoDockNotificationFunc) cd_animations_on_click, CAIRO_DOCK_RUN_FIRST, NULL);
-	cairo_dock_register_notification (CAIRO_DOCK_REQUEST_ICON_ANIMATION, (CairoDockNotificationFunc) cd_animations_on_request, CAIRO_DOCK_RUN_FIRST, NULL);
-	cairo_dock_register_notification (CAIRO_DOCK_UPDATE_ICON, (CairoDockNotificationFunc) cd_animations_update_icon , CAIRO_DOCK_RUN_AFTER, NULL);
-	cairo_dock_register_notification (CAIRO_DOCK_RENDER_ICON, (CairoDockNotificationFunc) cd_animations_render_icon, CAIRO_DOCK_RUN_FIRST, NULL);
-	cairo_dock_register_notification (CAIRO_DOCK_RENDER_ICON, (CairoDockNotificationFunc) cd_animations_post_render_icon, CAIRO_DOCK_RUN_AFTER, NULL);
-	cairo_dock_register_notification (CAIRO_DOCK_STOP_ICON, (CairoDockNotificationFunc) cd_animations_free_data, CAIRO_DOCK_RUN_AFTER, NULL);
-	cairo_dock_register_notification (CAIRO_DOCK_UNFOLD_SUBDOCK, (CairoDockNotificationFunc) cd_animations_unfold_subdock, CAIRO_DOCK_RUN_AFTER, NULL);
+	cairo_dock_register_notification_on_object (&myContainersMgr,
+		NOTIFICATION_ENTER_ICON,
+		(CairoDockNotificationFunc) cd_animations_on_enter,
+		CAIRO_DOCK_RUN_AFTER, NULL);
+	cairo_dock_register_notification_on_object (&myContainersMgr,
+		NOTIFICATION_CLICK_ICON,
+		(CairoDockNotificationFunc) cd_animations_on_click,
+		CAIRO_DOCK_RUN_FIRST, NULL);
+	cairo_dock_register_notification_on_object (&myIconsMgr,
+		NOTIFICATION_REQUEST_ICON_ANIMATION,
+		(CairoDockNotificationFunc) cd_animations_on_request,
+		CAIRO_DOCK_RUN_FIRST, NULL);
+	cairo_dock_register_notification_on_object (&myIconsMgr,
+		NOTIFICATION_UPDATE_ICON,
+		(CairoDockNotificationFunc) cd_animations_update_icon,
+		CAIRO_DOCK_RUN_AFTER, NULL);
+	cairo_dock_register_notification_on_object (&myIconsMgr,
+		NOTIFICATION_RENDER_ICON,
+		(CairoDockNotificationFunc) cd_animations_render_icon,
+		CAIRO_DOCK_RUN_FIRST, NULL);
+	cairo_dock_register_notification_on_object (&myIconsMgr,
+		NOTIFICATION_RENDER_ICON,
+		(CairoDockNotificationFunc) cd_animations_post_render_icon,
+		CAIRO_DOCK_RUN_AFTER, NULL);
+	cairo_dock_register_notification_on_object (&myIconsMgr,
+		NOTIFICATION_STOP_ICON,
+		(CairoDockNotificationFunc) cd_animations_free_data,
+		CAIRO_DOCK_RUN_AFTER, NULL);
+	cairo_dock_register_notification_on_object (&myIconsMgr,
+		NOTIFICATION_UNFOLD_SUBDOCK,
+		(CairoDockNotificationFunc) cd_animations_unfold_subdock,
+		CAIRO_DOCK_RUN_AFTER, NULL);
 	
 	myData.iAnimationID[CD_ANIMATIONS_BOUNCE] = cairo_dock_register_animation ("bounce", D_("Bounce"), FALSE);
 	myData.iAnimationID[CD_ANIMATIONS_ROTATE] = cairo_dock_register_animation ("rotate", D_("Rotate"), FALSE);
@@ -60,9 +84,6 @@
 	myData.iAnimationID[CD_ANIMATIONS_WOBBLY] = cairo_dock_register_animation ("wobbly", D_("Wobbly"), FALSE);
 	myData.iAnimationID[CD_ANIMATIONS_WAVE] = cairo_dock_register_animation ("wave", D_("Wave"), FALSE);
 	myData.iAnimationID[CD_ANIMATIONS_SPOT] = cairo_dock_register_animation ("spot", D_("Spot"), FALSE);
-	
-	if (! cairo_dock_is_loading ())
-		cairo_dock_update_animations_list_for_gui ();
 CD_APPLET_INIT_END
 
 static void _free_data_on_icon (Icon *pIcon, CairoDock *pDock, gpointer data)
@@ -71,14 +92,30 @@
 }
 //\___________ Here is where you stop your applet. myConfig and myData are still valid, but will be reseted to 0 at the end of the function. In the end, your applet will go back to its original state, as if it had never been activated.
 CD_APPLET_STOP_BEGIN
-	cairo_dock_remove_notification_func (CAIRO_DOCK_ENTER_ICON, (CairoDockNotificationFunc) cd_animations_on_enter, NULL);
-	cairo_dock_remove_notification_func (CAIRO_DOCK_CLICK_ICON, (CairoDockNotificationFunc) cd_animations_on_click, NULL);
-	cairo_dock_remove_notification_func (CAIRO_DOCK_REQUEST_ICON_ANIMATION, (CairoDockNotificationFunc) cd_animations_on_request, NULL);
-	cairo_dock_remove_notification_func (CAIRO_DOCK_UPDATE_ICON, (CairoDockNotificationFunc) cd_animations_update_icon, NULL);
-	cairo_dock_remove_notification_func (CAIRO_DOCK_RENDER_ICON, (CairoDockNotificationFunc) cd_animations_render_icon, NULL);
-	cairo_dock_remove_notification_func (CAIRO_DOCK_RENDER_ICON, (CairoDockNotificationFunc) cd_animations_post_render_icon, NULL);
-	cairo_dock_remove_notification_func (CAIRO_DOCK_STOP_ICON, (CairoDockNotificationFunc) cd_animations_free_data, NULL);
-	cairo_dock_remove_notification_func (CAIRO_DOCK_UNFOLD_SUBDOCK, (CairoDockNotificationFunc) cd_animations_unfold_subdock, NULL);
+	cairo_dock_remove_notification_func_on_object (&myContainersMgr,
+		NOTIFICATION_ENTER_ICON,
+		(CairoDockNotificationFunc) cd_animations_on_enter, NULL);
+	cairo_dock_remove_notification_func_on_object (&myContainersMgr,
+		NOTIFICATION_CLICK_ICON,
+		(CairoDockNotificationFunc) cd_animations_on_click, NULL);
+	cairo_dock_remove_notification_func_on_object (&myIconsMgr,
+		NOTIFICATION_REQUEST_ICON_ANIMATION,
+		(CairoDockNotificationFunc) cd_animations_on_request, NULL);
+	cairo_dock_remove_notification_func_on_object (&myIconsMgr,
+		NOTIFICATION_UPDATE_ICON,
+		(CairoDockNotificationFunc) cd_animations_update_icon, NULL);
+	cairo_dock_remove_notification_func_on_object (&myIconsMgr,
+		NOTIFICATION_RENDER_ICON,
+		(CairoDockNotificationFunc) cd_animations_render_icon, NULL);
+	cairo_dock_remove_notification_func_on_object (&myIconsMgr,
+		NOTIFICATION_RENDER_ICON,
+		(CairoDockNotificationFunc) cd_animations_post_render_icon, NULL);
+	cairo_dock_remove_notification_func_on_object (&myIconsMgr,
+		NOTIFICATION_STOP_ICON,
+		(CairoDockNotificationFunc) cd_animations_free_data, NULL);
+	cairo_dock_remove_notification_func_on_object (&myIconsMgr,
+		NOTIFICATION_UNFOLD_SUBDOCK,
+		(CairoDockNotificationFunc) cd_animations_unfold_subdock, NULL);
 	
 	cairo_dock_unregister_animation ("bounce");
 	cairo_dock_unregister_animation ("rotate");
@@ -87,7 +124,6 @@
 	cairo_dock_unregister_animation ("wobbly");
 	cairo_dock_unregister_animation ("wave");
 	cairo_dock_unregister_animation ("spot");
-	cairo_dock_update_animations_list_for_gui ();
 	
 	cairo_dock_foreach_icons ((CairoDockForeachIconFunc) _free_data_on_icon, NULL);
 CD_APPLET_STOP_END

=== modified file 'Animated-icons/src/applet-notifications.c'
--- Animated-icons/src/applet-notifications.c	2010-08-07 01:43:25 +0000
+++ Animated-icons/src/applet-notifications.c	2011-03-17 14:49:16 +0000
@@ -56,7 +56,7 @@
 	_set_new_data (pIcon);
 	
 	gboolean bUseOpenGL = CAIRO_DOCK_CONTAINER_IS_OPENGL (CAIRO_CONTAINER (pDock));
-	double dt = (bUseOpenGL ? mySystem.iGLAnimationDeltaT : mySystem.iCairoAnimationDeltaT);
+	double dt = cairo_dock_get_animation_delta_t (CAIRO_CONTAINER (pDock));
 	
 	int i;
 	for (i = 0; i < CD_ANIMATIONS_NB_EFFECTS; i ++)
@@ -116,7 +116,7 @@
 	if (pIcon->bStatic || ! CAIRO_DOCK_CONTAINER_IS_OPENGL (CAIRO_CONTAINER (pDock)) || pIcon->iAnimationState > CAIRO_DOCK_STATE_MOUSE_HOVERED)
 		return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 	
-	if (pIcon->pSubDock && pIcon->iSubdockViewType == 3 && !myAccessibility.bShowSubDockOnClick)
+	if (pIcon->pSubDock && pIcon->iSubdockViewType == 3 && !myDocksParam.bShowSubDockOnClick)  // icone de sous-dock avec rendu de type "box"-> on n'anime pas.
 	{
 		//cd_animations_free_data (pUserData, pIcon);
 		return CAIRO_DOCK_LET_PASS_NOTIFICATION;
@@ -138,7 +138,7 @@
 	if (! CAIRO_DOCK_IS_DOCK (pDock) || pIcon->iAnimationState > CAIRO_DOCK_STATE_CLICKED)
 		return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 	
-	if (pIcon->pSubDock && pIcon->iSubdockViewType == 3)
+	if (pIcon->pSubDock && pIcon->iSubdockViewType == 3)  // icone de sous-dock avec rendu de type "box" -> on arrete l'animation en cours.
 	{
 		CDAnimationData *pData = CD_APPLET_GET_MY_ICON_DATA (pIcon);
 		if (pData && ! pData->bIsUnfolding)
@@ -146,11 +146,9 @@
 		return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 	}
 	
-	CairoDockIconType iType = cairo_dock_get_icon_type (pIcon);
+	CairoDockIconGroup iType = cairo_dock_get_icon_type (pIcon);
 	if (iType == CAIRO_DOCK_LAUNCHER && CAIRO_DOCK_IS_APPLI (pIcon) && ! (iButtonState & GDK_SHIFT_MASK))
 		iType = CAIRO_DOCK_APPLI;
-	/**if (iType == CAIRO_DOCK_APPLI && CAIRO_DOCK_IS_LAUNCHER (pIcon) && iButtonState & GDK_SHIFT_MASK)
-		iType = CAIRO_DOCK_LAUNCHER;*/
 	
 	gboolean bStartAnimation = FALSE;
 	_cd_animations_start (pUserData, pIcon, pDock, myConfig.iEffectsOnClick[iType], &bStartAnimation);
@@ -171,7 +169,7 @@
 	CDAnimationsEffects anim[2] = {0, -1};
 	if (strcmp (cAnimation, "default") == 0)
 	{
-		CairoDockIconType iType = cairo_dock_get_icon_type (pIcon);
+		CairoDockIconGroup iType = cairo_dock_get_icon_type (pIcon);
 		anim[0] =  myConfig.iEffectsOnClick[iType][0];
 	}
 	else
@@ -362,7 +360,7 @@
 	if (pData == NULL)
 		return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 	gboolean bUseOpenGL = CAIRO_DOCK_CONTAINER_IS_OPENGL (CAIRO_CONTAINER (pDock));
-	double dt = (bUseOpenGL ? mySystem.iGLAnimationDeltaT : mySystem.iCairoAnimationDeltaT);
+        double dt = cairo_dock_get_animation_delta_t (CAIRO_CONTAINER (pDock));
 	
 	if (pData->bIsUnfolding)
 	{
@@ -444,6 +442,7 @@
 		pIcon->fReflectShading = (double) pData->iReflectShadeCount / _REFLECT_FADE_NB_STEP;
 		if (pData->iReflectShadeCount != 0)
 			*bContinueAnimation = TRUE;
+		cairo_dock_redraw_icon (pIcon, CAIRO_CONTAINER (pDock));
 	}
 	
 	if (pData->fRadiusFactor != 0)

=== modified file 'Animated-icons/src/applet-rotation.c'
--- Animated-icons/src/applet-rotation.c	2010-02-14 00:51:22 +0000
+++ Animated-icons/src/applet-rotation.c	2011-03-17 14:49:16 +0000
@@ -248,7 +248,7 @@
 	if (pDock->container.bUseReflect)
 	{
 		glPushMatrix ();
-		_cairo_dock_set_alpha (myIcons.fAlbedo * sqrt (myIcons.fAlbedo) * pIcon->fAlpha);  // transparence du reflet, arrange pour essayer de cacher l'absence de degrade :p
+		_cairo_dock_set_alpha (myIconsParam.fAlbedo * sqrt (myIconsParam.fAlbedo) * pIcon->fAlpha);  // transparence du reflet, arrange pour essayer de cacher l'absence de degrade :p
 		double fOffsetY = pIcon->fHeight * pIcon->fScale + (0 + pIcon->fDeltaYReflection) * pDock->container.fRatio;
 		if (pDock->container.bIsHorizontal)
 		{
@@ -261,7 +261,7 @@
 			else
 			{
 				glTranslatef (0., fOffsetY, 0.);
-				//glScalef (pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, myIcons.fReflectSize * pDock->container.fRatio, 1.);
+				//glScalef (pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, myIconsParam.fReflectSize * pDock->container.fRatio, 1.);
 			}
 			glScalef (1., -1., 1.);
 		}
@@ -270,12 +270,12 @@
 			if (pDock->container.bDirectionUp)
 			{
 				glTranslatef (fOffsetY, 0., 0.);
-				//glScalef (- myIcons.fReflectSize * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
+				//glScalef (- myIconsParam.fReflectSize * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
 			}
 			else
 			{
 				glTranslatef (- fOffsetY, 0., 0.);
-				//glScalef (myIcons.fReflectSize * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
+				//glScalef (myIconsParam.fReflectSize * 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	2010-02-14 00:51:22 +0000
+++ Animated-icons/src/applet-spot.c	2011-03-17 14:49:16 +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 (myIcons.fReflectSize, CD_ANIMATIONS_SPOT_HEIGHT/2);
+		fY -= MIN (myIconsParam.fReflectSize, 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 (myIcons.fReflectSize, CD_ANIMATIONS_SPOT_HEIGHT/2);
+		fY -= MIN (myIconsParam.fReflectSize, 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 (myIcons.fReflectSize, CD_ANIMATIONS_SPOT_HEIGHT/2);
+		fY -= MIN (myIconsParam.fReflectSize, CD_ANIMATIONS_SPOT_HEIGHT/2);
 	if (! pDock->container.bDirectionUp)
 		fY = -fY;
 	glTranslatef (0., fY, 0.);
@@ -151,9 +151,9 @@
 			if (!bWillContinue)
 				pData->bGrowingSpot = FALSE;
 		}
-		pData->fIconOffsetY += 1.*myLabels.iconTextDescription.iSize / myConfig.iSpotDuration * dt;
-		if (pData->fIconOffsetY > myLabels.iconTextDescription.iSize)
-			pData->fIconOffsetY = myLabels.iconTextDescription.iSize;
+		pData->fIconOffsetY += 1.*myIconsParam.iconTextDescription.iSize / myConfig.iSpotDuration * dt;
+		if (pData->fIconOffsetY > myIconsParam.iconTextDescription.iSize)
+			pData->fIconOffsetY = myIconsParam.iconTextDescription.iSize;
 	}
 	else
 	{
@@ -162,7 +162,7 @@
 			pData->fRadiusFactor = 0.;
 		else
 			bContinueAnimation = TRUE;
-		pData->fIconOffsetY -= 1.*myLabels.iconTextDescription.iSize / myConfig.iSpotDuration * dt;
+		pData->fIconOffsetY -= 1.*myIconsParam.iconTextDescription.iSize / myConfig.iSpotDuration * dt;
 		if (pData->fIconOffsetY < 0)
 			pData->fIconOffsetY = 0.;
 		else

=== modified file 'Animated-icons/src/applet-struct.h'
--- Animated-icons/src/applet-struct.h	2010-08-07 01:43:25 +0000
+++ Animated-icons/src/applet-struct.h	2011-03-17 14:49:16 +0000
@@ -95,8 +95,8 @@
 	gboolean bContinueBlink;
 	
 	CDAnimationsEffects iEffectsOnMouseOver[CD_ANIMATIONS_NB_EFFECTS];
-	CDAnimationsEffects iEffectsOnClick[CAIRO_DOCK_NB_TYPES][CD_ANIMATIONS_NB_EFFECTS];
-	gint iNbRoundsOnClick[CAIRO_DOCK_NB_TYPES];
+	CDAnimationsEffects iEffectsOnClick[CAIRO_DOCK_NB_GROUPS][CD_ANIMATIONS_NB_EFFECTS];
+	gint iNbRoundsOnClick[CAIRO_DOCK_NB_GROUPS];
 	} ;
 
 //\___________ structure containing the applet's data, like surfaces, dialogs, results of calculus, etc.

=== modified file 'Animated-icons/src/applet-unfold.c'
--- Animated-icons/src/applet-unfold.c	2010-08-07 01:43:25 +0000
+++ Animated-icons/src/applet-unfold.c	2011-03-17 14:49:16 +0000
@@ -90,7 +90,7 @@
 	for (ic = pIcon->pSubDock->icons, i = 0; ic != NULL && i < 3; ic = ic->next, i++)
 	{
 		icon = ic->data;
-		if (CAIRO_DOCK_IS_SEPARATOR (icon))
+		if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon))
 		{
 			i --;
 			continue;
@@ -139,90 +139,8 @@
 	cairo_restore (pCairoContext);
 	
 	//\_____________________ On dessine son reflet.
-	if (pDock->container.bUseReflect && pIcon->pReflectionBuffer != NULL)  // on dessine les reflets.
-	{
-		cairo_save (pCairoContext);
-		double fRatio = pDock->container.fRatio;
-		if (pDock->container.bIsHorizontal)
-		{
-			if (myIcons.bConstantSeparatorSize && CAIRO_DOCK_IS_SEPARATOR (pIcon))
-				cairo_translate (pCairoContext, 0, (pDock->container.bDirectionUp ? pIcon->fDeltaYReflection + pIcon->fHeight : -pIcon->fDeltaYReflection - myIcons.fReflectSize * fRatio));
-			else
-				cairo_translate (pCairoContext, 0, (pDock->container.bDirectionUp ? pIcon->fDeltaYReflection + pIcon->fHeight * pIcon->fScale : -pIcon->fDeltaYReflection - myIcons.fReflectSize * pIcon->fScale * fRatio));
-		}
-		else
-		{
-			if (myIcons.bConstantSeparatorSize && CAIRO_DOCK_IS_SEPARATOR (pIcon))
-				cairo_translate (pCairoContext, (pDock->container.bDirectionUp ? pIcon->fDeltaYReflection + pIcon->fHeight : -pIcon->fDeltaYReflection - myIcons.fReflectSize * fRatio), 0);
-			else
-				cairo_translate (pCairoContext, (pDock->container.bDirectionUp ? pIcon->fDeltaYReflection + pIcon->fHeight * pIcon->fScale : -pIcon->fDeltaYReflection - myIcons.fReflectSize * pIcon->fScale * fRatio), 0);
-		}
-		cairo_dock_set_icon_scale_on_context (pCairoContext, pIcon, pDock->container.bIsHorizontal, fRatio, pDock->container.bDirectionUp);
-		
-		cairo_set_source_surface (pCairoContext, pIcon->pReflectionBuffer, 0.0, 0.0);
-		
-		if (mySystem.bDynamicReflection && pIcon->fScale > 1)  // on applique la surface avec un degrade en transparence, ou avec une transparence simple.
-		{
-			cairo_pattern_t *pGradationPattern;
-			if (pDock->container.bIsHorizontal)
-			{
-				pGradationPattern = cairo_pattern_create_linear (0.,
-					(pDock->container.bDirectionUp ? 0. : myIcons.fReflectSize / fRatio * (1 + myIcons.fAmplitude)),
-					0.,
-					(pDock->container.bDirectionUp ? myIcons.fReflectSize / fRatio * (1 + myIcons.fAmplitude) / pIcon->fScale : myIcons.fReflectSize / fRatio * (1 + myIcons.fAmplitude) * (1. - 1./ pIcon->fScale)));  // de haut en bas.
-				g_return_if_fail (cairo_pattern_status (pGradationPattern) == CAIRO_STATUS_SUCCESS);
-				
-				cairo_pattern_set_extend (pGradationPattern, CAIRO_EXTEND_NONE);
-				cairo_pattern_add_color_stop_rgba (pGradationPattern,
-					0.,
-					0.,
-					0.,
-					0.,
-					1.);
-				cairo_pattern_add_color_stop_rgba (pGradationPattern,
-					1.,
-					0.,
-					0.,
-					0.,
-					1 - (pIcon->fScale - 1) / myIcons.fAmplitude);  // astuce pour ne pas avoir a re-creer la surface de la reflection.
-			}
-			else
-			{
-				pGradationPattern = cairo_pattern_create_linear ((pDock->container.bDirectionUp ? 0. : myIcons.fReflectSize / fRatio * (1 + myIcons.fAmplitude)),
-					0.,
-					(pDock->container.bDirectionUp ? myIcons.fReflectSize / fRatio * (1 + myIcons.fAmplitude) / pIcon->fScale : myIcons.fReflectSize / fRatio * (1 + myIcons.fAmplitude) * (1. - 1./ pIcon->fScale)),
-					0.);
-				g_return_if_fail (cairo_pattern_status (pGradationPattern) == CAIRO_STATUS_SUCCESS);
-				
-				cairo_pattern_set_extend (pGradationPattern, CAIRO_EXTEND_NONE);
-				cairo_pattern_add_color_stop_rgba (pGradationPattern,
-					0.,
-					0.,
-					0.,
-					0.,
-					1.);
-				cairo_pattern_add_color_stop_rgba (pGradationPattern,
-					1.,
-					0.,
-					0.,
-					0.,
-					1. - (pIcon->fScale - 1) / myIcons.fAmplitude);  // astuce pour ne pas avoir a re-creer la surface de la reflection.
-			}
-			cairo_set_operator (pCairoContext, CAIRO_OPERATOR_OVER);
-			cairo_translate (pCairoContext, 0, 0);
-			cairo_mask (pCairoContext, pGradationPattern);
-
-			cairo_pattern_destroy (pGradationPattern);
-		}
-		else
-		{
-			if (pIcon->fAlpha == 1)
-				cairo_paint (pCairoContext);
-			else
-				cairo_paint_with_alpha (pCairoContext, pIcon->fAlpha);
-		}
-		cairo_restore (pCairoContext);
-	}
+	cairo_dock_draw_icon_reflect_cairo (pIcon, pDock, pCairoContext);
+	
 	cairo_restore (pCairoContext);
 }
 
@@ -283,7 +201,7 @@
 	for (ic = pIcon->pSubDock->icons, i = 0; ic != NULL && i < 3; ic = ic->next, i++)
 	{
 		icon = ic->data;
-		if (CAIRO_DOCK_IS_SEPARATOR (icon))
+		if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon))
 		{
 			i --;
 			continue;
@@ -302,4 +220,9 @@
 	_cairo_dock_set_alpha (1.);
 	_cairo_dock_apply_texture_at_size (g_pBoxAboveBuffer.iTexture, w, h);
 	glPopMatrix ();
+	
+	//\_____________________ On dessine son reflet.
+	cairo_dock_draw_icon_reflect_opengl (pIcon, pDock);
+	
+	_cairo_dock_disable_texture ();
 }

=== modified file 'Animated-icons/src/applet-wave.c'
--- Animated-icons/src/applet-wave.c	2010-08-07 01:43:25 +0000
+++ Animated-icons/src/applet-wave.c	2011-03-17 14:49:16 +0000
@@ -186,8 +186,8 @@
 	{
 		glPushMatrix ();
 		double x0, y0, x1, y1;
-		double fReflectRatio = myIcons.fReflectSize * pDock->container.fRatio / pIcon->fHeight / pIcon->fScale;
-		double fOffsetY = pIcon->fHeight * pIcon->fScale/2 + (myIcons.fReflectSize/2 + pIcon->fDeltaYReflection) * pDock->container.fRatio;
+		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;
 		if (pDock->container.bIsHorizontal)
 		{
 			if (pDock->container.bDirectionUp)
@@ -203,7 +203,7 @@
 			else
 			{
 				glTranslatef (0., fOffsetY, 0.);
-				glScalef (pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, myIcons.fReflectSize * pDock->container.fRatio, 1.);
+				glScalef (pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, myIconsParam.fReflectSize * pDock->container.fRatio, 1.);
 				x0 = 0.;
 				y0 = fReflectRatio;
 				x1 = 1.;
@@ -215,7 +215,7 @@
 			if (pDock->container.bDirectionUp)
 			{
 				glTranslatef (fOffsetY, 0., 0.);
-				glScalef (- myIcons.fReflectSize * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
+				glScalef (- myIconsParam.fReflectSize * 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 (myIcons.fReflectSize * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
+				glScalef (myIconsParam.fReflectSize * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
 				x0 = fReflectRatio;
 				y0 = 0.;
 				x1 = 0.;
@@ -236,7 +236,7 @@
 		glEnable(GL_TEXTURE_2D); // On active le texturing sur cette passe
 		glBindTexture(GL_TEXTURE_2D, pIcon->iIconTexture);
 		
-		glColor4f(1., 1., 1., myIcons.fAlbedo * pIcon->fAlpha);  // transparence du reflet.
+		glColor4f(1., 1., 1., myIconsParam.fAlbedo * pIcon->fAlpha);  // transparence du reflet.
 		glEnable(GL_BLEND);
 		glBlendFunc (1, 0);
 		glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);

=== modified file 'Animated-icons/src/applet-wobbly.c'
--- Animated-icons/src/applet-wobbly.c	2009-10-05 19:27:17 +0000
+++ Animated-icons/src/applet-wobbly.c	2011-03-17 14:49:16 +0000
@@ -422,13 +422,14 @@
 	{
 		glPushMatrix ();
 		double x0, y0, x1, y1;
-		double fReflectRatio = myIcons.fReflectSize * pDock->container.fRatio / pIcon->fHeight / pIcon->fScale;
-		double fOffsetY = pIcon->fHeight * pIcon->fScale/2 + (myIcons.fReflectSize/2 + pIcon->fDeltaYReflection) * pDock->container.fRatio;
+		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 fOffsetY = pIcon->fHeight * pIcon->fScale + pIcon->fDeltaYReflection;
 		if (pDock->container.bIsHorizontal)
 		{
 			if (pDock->container.bDirectionUp)
 			{
-				fOffsetY = pIcon->fHeight * pIcon->fScale + pIcon->fDeltaYReflection;
+				//fOffsetY = pIcon->fHeight * pIcon->fScale + pIcon->fDeltaYReflection;
 				glTranslatef (0., - fOffsetY, 0.);
 				glScalef (pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, - pIcon->fHeight * pIcon->fScale, 1.);  // taille du reflet et on se retourne.
 				x0 = 0.;
@@ -439,7 +440,7 @@
 			else
 			{
 				glTranslatef (0., fOffsetY, 0.);
-				glScalef (pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, myIcons.fReflectSize * pDock->container.fRatio, 1.);
+				glScalef (pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, - pIcon->fHeight * pIcon->fScale, 1.);
 				x0 = 0.;
 				y0 = fReflectRatio;
 				x1 = 1.;
@@ -450,8 +451,9 @@
 		{
 			if (pDock->container.bDirectionUp)
 			{
+				//fOffsetY = pIcon->fHeight * pIcon->fScale + pIcon->fDeltaYReflection;
 				glTranslatef (fOffsetY, 0., 0.);
-				glScalef (- myIcons.fReflectSize * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
+				glScalef (- pIcon->fHeight * pIcon->fScale, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
 				x0 = 1. - fReflectRatio;
 				y0 = 0.;
 				x1 = 1.;
@@ -459,8 +461,9 @@
 			}
 			else
 			{
+				//fOffsetY = pIcon->fHeight * pIcon->fScale + pIcon->fDeltaYReflection;
 				glTranslatef (- fOffsetY, 0., 0.);
-				glScalef (myIcons.fReflectSize * pDock->container.fRatio, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
+				glScalef (- pIcon->fHeight * pIcon->fScale, pIcon->fWidth * pIcon->fWidthFactor * pIcon->fScale, 1.);
 				x0 = fReflectRatio;
 				y0 = 0.;
 				x1 = 0.;
@@ -470,7 +473,7 @@
 		
 		///glActiveTextureARB(GL_TEXTURE0_ARB); // Go pour le multitexturing 1ere passe
 		glBindTexture(GL_TEXTURE_2D, pIcon->iIconTexture);
-		glColor4f(1.0f, 1.0f, 1.0f, myIcons.fAlbedo * pIcon->fAlpha);  // transparence du reflet.
+		glColor4f(1.0f, 1.0f, 1.0f, myIconsParam.fAlbedo * pIcon->fAlpha);  // transparence du reflet.
 		glBlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
 			GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 		glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
@@ -481,7 +484,7 @@
 		/*glActiveTextureARB(GL_TEXTURE1_ARB); // Go pour le texturing 2eme passe
 		glEnable(GL_TEXTURE_2D);
 		glBindTexture(GL_TEXTURE_2D, g_pGradationTexture[pDock->container.bIsHorizontal]);
-		glColor4f(1.0f, 1.0f, 1.0f, myIcons.fAlbedo * pIcon->fAlpha);  // transparence du reflet.  // myIcons.fAlbedo * pIcon->fAlpha
+		glColor4f(1.0f, 1.0f, 1.0f, myIconsParam.fAlbedo * pIcon->fAlpha);  // transparence du reflet.  // myIconsParam.fAlbedo * pIcon->fAlpha
 		glEnable(GL_BLEND);
 		glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 		glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); // Le mode de combinaison des textures

=== modified file 'Applets.stable'
--- Applets.stable	2010-08-07 01:43:25 +0000
+++ Applets.stable	2011-03-17 14:49:16 +0000
@@ -49,6 +49,12 @@
 ###Added in v2.1.3
 RSSReader
 kde-integration
+###Added in v2.2.0
+MeMenu
+Messaging-Menu
 ###All other applets are considered to be either not enough functionnal, buggy/untested, or under heavy development.
 #Scooby-Do
 #Network-Monitor
+#Recent-Events
+#Remote-Control
+#Status-Notifier

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2010-09-07 00:39:20 +0000
+++ CMakeLists.txt	2011-03-17 14:49:16 +0000
@@ -10,7 +10,7 @@
 ########### project ###############
 
 project ("cairo-dock-plugins")
-set (VERSION "2.2.0-0rc1")
+set (VERSION "2.3.0~0rc1")
 
 add_definitions (-std=c99 -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) #-Wunreachable-code -Wno-unused-parameter -Wall
 if (NOT ${CMAKE_BUILD_TYPE})
@@ -23,7 +23,7 @@
 set (CPACK_SOURCE_GENERATOR "TGZ")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
 set (CPACK_SOURCE_IGNORE_FILES 
-	"/build/;/.bzr/;bzrignore$;/misc/;/en_GB.po$;~$;${CPACK_SOURCE_IGNORE_FILES}")
+	"/build/;/.bzr/;bzrignore$;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}")
 include (CPack)
 
 add_custom_target( dist
@@ -45,52 +45,70 @@
 
 set (PACKAGE ${CMAKE_PROJECT_NAME})
 set (GETTEXT_PACKAGE ${PACKAGE})
+
+# get plug-ins install dir
 execute_process(
-    COMMAND pkg-config cairo-dock --variable=pluginsdir
+    COMMAND pkg-config cairo-dock --variable=pluginsdir		# /usr/lib/cairo-dock
     OUTPUT_VARIABLE pluginsdir)
 STRING (REGEX REPLACE "\n" "" pluginsdir ${pluginsdir})  # la commande rajoute un retour chariot ...
+# get plug-ins data dir
 execute_process(
-    COMMAND pkg-config cairo-dock --variable=pluginsdatadir
+    COMMAND pkg-config cairo-dock --variable=pluginsdatadir	# /usr/share/cairo-dock/plug-ins
     OUTPUT_VARIABLE pluginsdatadir)
 STRING (REGEX REPLACE "\n" "" pluginsdatadir ${pluginsdatadir})
+# check that version matches with the core
 execute_process(
-    COMMAND pkg-config --modversion cairo-dock
+    COMMAND pkg-config --modversion cairo-dock			# 2.2.0-3
     OUTPUT_VARIABLE dock_version)
 STRING (REGEX REPLACE "\n" "" dock_version ${dock_version})
-if (NOT "${dock_version}" STREQUAL "${VERSION}")
+if (NOT "${dock_version}" STREQUAL "${VERSION}")		# Version
 	MESSAGE (FATAL_ERROR "warning : version mismatch with the core : " ${VERSION} <> ${dock_version})
 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 "Warning : plug-ins should be installed in the same directory as the core, that is to say in ${pluginsdir}")
+	set (CMAKE_INSTALL_PREFIX "${prefix}")
+	#set (libdir "${CMAKE_INSTALL_PREFIX}/${libname}/cairo-dock")
+endif()
+
+# set internationalisation
 set (GETTEXT_PLUGINS "cairo-dock-plugins")
-
-if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND "${LIB_SUFFIX}" STREQUAL "" AND "${FORCE_NOT_LIB64}" STREQUAL "" )
-	set (libdir lib64/cairo-dock)
-elseif( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT "${FORCE_NOT_LIB64}" STREQUAL "" )
-	set (libdir lib${LIB_SUFFIX}/cairo-dock)
-else()
-	set (libdir lib${LIB_SUFFIX}/cairo-dock)
-endif()
-
-if (NOT "${pluginsdir}" STREQUAL "${CMAKE_INSTALL_PREFIX}/${libdir}")
-	message (STATUS "Warning : plug-ins should be installed in the same place asthe dock, that is to say in ${pluginsdir}")
-	STRING (REGEX REPLACE "/${libdir}" "" CMAKE_INSTALL_PREFIX ${pluginsdir})
-endif()
 set (localedir "${CMAKE_INSTALL_PREFIX}/share/locale")
 set (gaugesdir "${CMAKE_INSTALL_PREFIX}/share/cairo-dock/gauges")
 
-
-########### dependencies ###############
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")  # additionnal FindPackage files
+
+########### dependancies ###############
+
+message ("")
+message (STATUS "=====================")
+message (STATUS "Check dependancies...")
+message (STATUS "=====================")
+message ("")
 
 pkg_check_modules ("PACKAGE" REQUIRED "gtk+-2.0" "gthread-2.0" "cairo" "librsvg-2.0" "dbus-1" "dbus-glib-1" "libxml-2.0" "gtkglext-1.0" "cairo-dock")
 
 ############# ALSA_MIXER #################
-if (NOT "${enable_alsa_mixer}" STREQUAL "no")
+set (with_alsa "no")
+if (NOT "${enable-alsa-mixer}" STREQUAL "no")
 	pkg_check_modules (ALSA_MIXER_PACKAGE alsa)
 	if ("${ALSA_MIXER_PACKAGE_FOUND}" STREQUAL "")
 		message (STATUS "Could not find alsa; Cairo-Dock won't be built with AlsaMixer applet.")
 	else()
 		set (GETTEXT_ALSA_MIXER ${GETTEXT_PLUGINS})
-		set (VERSION_ALSA_MIXER "1.0.11")
+		set (VERSION_ALSA_MIXER "1.0.12")
 		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)
 		add_subdirectory ("alsaMixer")
@@ -99,7 +117,7 @@
 
 ############# ANIMATED ICONS #################
 set (GETTEXT_ANIMATED_ICONS ${GETTEXT_PLUGINS})
-set (VERSION_ANIMATED_ICONS "1.0.8")
+set (VERSION_ANIMATED_ICONS "1.0.9")
 set (PACKAGE_ANIMATED_ICONS "cd-Animated-icons")
 set (animated_iconsdatadir "${pluginsdatadir}/Animated-icons")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Animated-icons/data/Animated-icons.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Animated-icons/data/Animated-icons.conf)
@@ -107,7 +125,7 @@
 
 ############# CAIRO_PENGUIN #################
 set (GETTEXT_CAIRO_PENGUIN ${GETTEXT_PLUGINS})
-set (VERSION_CAIRO_PENGUIN "1.1.7")
+set (VERSION_CAIRO_PENGUIN "1.1.8")
 set (PACKAGE_CAIRO_PENGUIN "cd-Cairo-Penguin")
 set (cairo_penguinuserdirname "Cairo-Penguin")
 set (cairo_penguindatadir "${pluginsdatadir}/Cairo-Penguin")
@@ -116,19 +134,21 @@
 
 ############# CLIPPER #################
 set (GETTEXT_CLIPPER ${GETTEXT_PLUGINS})
-set (VERSION_CLIPPER "1.1.3")
+set (VERSION_CLIPPER "1.1.4")
 set (PACKAGE_CLIPPER "cd-Clipper")
 set (Clipperdatadir "${pluginsdatadir}/Clipper")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Clipper/data/Clipper.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Clipper/data/Clipper.conf)
 add_subdirectory (Clipper)
 
 ############# CLOCK #################
+set (with_ical "yes")
 pkg_check_modules ("LIBICAL_PACKAGE" "libical")
 if ("${LIBICAL_PACKAGE_FOUND}" STREQUAL "")
+	set (with_ical "no")
 	message (STATUS "Could not find libical; Clock plugin won't be built with iCal support.")
 endif()
 set (GETTEXT_CLOCK ${GETTEXT_PLUGINS})
-set (VERSION_CLOCK "2.1.1")
+set (VERSION_CLOCK "2.1.2")
 set (PACKAGE_CLOCK "cd-clock")
 set (clockuserdirname "clock")
 set (clockdatadir "${pluginsdatadir}/clock")
@@ -137,15 +157,98 @@
 
 ############# COMPIZ_ICON #################
 set (GETTEXT_COMPIZ_ICON ${GETTEXT_PLUGINS})
-set (VERSION_COMPIZ_ICON "1.1.5")
+set (VERSION_COMPIZ_ICON "1.1.6")
 set (PACKAGE_COMPIZ_ICON "cd-compiz-icon")
 set (compiz_icondatadir "${pluginsdatadir}/compiz-icon")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/compiz-icon/data/compiz-icon.conf.in ${CMAKE_CURRENT_BINARY_DIR}/compiz-icon/data/compiz-icon.conf)
 add_subdirectory (compiz-icon)
 
 ############# DBUS #################
+find_program (PYTHON_EXECUTABLE python)
+EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print sys.version" OUTPUT_VARIABLE PYTHON_VERSION)
+if ("${PYTHON_VERSION}" STREQUAL "") 
+	message (STATUS "Could not find Python, won't install Python interface.") 
+	set (with_python "no") 
+else() 
+	STRING (REGEX REPLACE "\n" "" PYTHON_VERSION ${PYTHON_VERSION})
+	message (STATUS "Python Version: ${PYTHON_VERSION}") 
+	GET_FILENAME_COMPONENT(DEBIAN_VERSION /etc/debian_version ABSOLUTE) 
+	if (EXISTS ${DEBIAN_VERSION}) 
+		message (STATUS "  will use '--install-layout deb' with 'python setup.py install'") 
+		set (DEBIAN_INSTALL_LAYOUT "--install-layout deb")
+	endif()
+	set (PYTHON_FOUND "TRUE")
+	set (with_python "yes") 
+endif()
+
+# find_package(Ruby) found libs of ruby-dev but we only need a directory where we can install ruby libs.
+find_program (RUBY_EXECUTABLE ruby)
+EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubylibdir']"
+	OUTPUT_VARIABLE RUBY_LIB_DIR)
+message (STATUS "RUBY_LIBRARY: ${RUBY_LIB_DIR}")
+if ("${RUBY_LIB_DIR}" STREQUAL "" OR "${RUBY_LIB_DIR}" STREQUAL "nil")
+	message (STATUS "Could not find ruby libs, won't install Ruby interface.")
+	set (with_ruby "no")
+else()
+	string (REGEX REPLACE "lib/ruby/[0-9].[0-9]" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}")
+	string (REGEX REPLACE "${RUBY_LIB_DIR_INSTALL}" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}")
+	set (RUBY_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${RUBY_LIB_DIR_INSTALL}")
+	message (STATUS "  will be installed in: ${RUBY_LIB_DIR}")
+	set (RUBY_FOUND "TRUE")
+	set (with_ruby "yes")
+endif()
+
+#find_package (Mono)
+find_program (GMCS_EXECUTABLE gmcs)
+if ("${GMCS_EXECUTABLE}" STREQUAL "" OR NOT EXISTS ${GMCS_EXECUTABLE})
+	message (STATUS "Could not find Mono compiler gmcs, won't build Mono interface.")
+	set (with_mono "no")
+else()
+	set (MONO_FOUND "TRUE")
+	pkg_check_modules (MONO_PACKAGE glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0)
+	if ("${MONO_PACKAGE_FOUND}" STREQUAL "")
+		message (STATUS "Could not find glib-sharp-2.0, ndesk-dbus-1.0 or ndesk-dbus-glib-1.0; won't be built Mono interface.")
+		set (with_mono "no")
+	else()
+		set (with_mono "yes")
+	endif()
+endif()
+
+set (with_vala "yes")
+set (with_valac "no")
+find_program (VALA_EXECUTABLE valac)
+if ("${WITH_VALA}" STREQUAL "no")
+	set (with_vala "no")
+elseif ("${WITH_VALA}" STREQUAL "yes" AND NOT "${VALA_EXECUTABLE}" STREQUAL "")
+	execute_process(COMMAND ${VALA_EXECUTABLE} "--version"
+		OUTPUT_VARIABLE "VALA_VERSION")
+	string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION})
+	string(STRIP ${VALA_VERSION} "VALA_VERSION")
+	message (STATUS "VALA_VERSION: ${VALA_VERSION}")
+
+	STRING (REGEX REPLACE "\\..*" "" VALA_MAJOR "${VALA_VERSION}")
+	message (STATUS "VALA_MAJOR : ${VALA_MAJOR}")
+	
+	STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" VALA_MINOR "${VALA_VERSION}")  # 0.1.7 => 1.7
+	STRING (REGEX REPLACE "\\.[0-9]*" "" VALA_MINOR "${VALA_MINOR}")
+	message (STATUS "VALA_MINOR : ${VALA_MINOR}")
+
+	STRING (REGEX REPLACE ".*\\." "" VALA_NANO "${VALA_VERSION}")
+	STRING (REGEX REPLACE "-.*" "" VALA_NANO "${VALA_NANO}")
+	message (STATUS "VALA_NANO  : ${VALA_NANO}")
+
+	if (${VALA_MAJOR} GREATER 0 OR ${VALA_MINOR} GREATER 9)  # vala > 0.10
+		message (STATUS "Vala compiler ok.")
+		set (VALAC_FOUND "TRUE")
+		set (with_valac "yes")
+	else()
+		message (STATUS "Vala compiler too old (0.10 required), won't build Vala interface.")
+	endif()
+endif()
+
+
 set (GETTEXT_DBUS ${GETTEXT_PLUGINS})
-set (VERSION_DBUS "1.0.0")
+set (VERSION_DBUS "1.2.1")
 set (PACKAGE_DBUS "cd-Dbus")
 set (dbusdatadir "${pluginsdatadir}/Dbus")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Dbus/data/Dbus.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Dbus/data/Dbus.conf)
@@ -153,7 +256,7 @@
 
 ############# DESKLET_RENDERING #################
 set (GETTEXT_DESKLET_RENDERING ${GETTEXT_PLUGINS})
-set (VERSION_DESKLET_RENDERING "1.5.5")
+set (VERSION_DESKLET_RENDERING "1.5.6")
 set (PACKAGE_DESKLET_RENDERING "cd-desklet-rendering")
 set (desklet_renderingdatadir "${pluginsdatadir}/desklet-rendering")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/desklet-rendering/data/desklet-rendering.conf.in ${CMAKE_CURRENT_BINARY_DIR}/desklet-rendering/data/desklet-rendering.conf)
@@ -161,15 +264,27 @@
 
 ############# DIALOG_RENDERING #################
 set (GETTEXT_DIALOG_RENDERING ${GETTEXT_PLUGINS})
-set (VERSION_DIALOG_RENDERING "0.4.4")
+set (VERSION_DIALOG_RENDERING "0.5.1")
 set (PACKAGE_DIALOG_RENDERING "cd-dialog-rendering")
 set (dialog_renderingdatadir "${pluginsdatadir}/dialog-rendering")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/dialog-rendering/data/dialog-rendering.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dialog-rendering/data/dialog-rendering.conf)
 add_subdirectory (dialog-rendering)
 
+############# DISKS #################
+set (with_disks "no")
+if ("${enable-disks}" STREQUAL "yes")
+	set (GETTEXT_DISKS ${GETTEXT_PLUGINS})
+	set (VERSION_DISKS "0.0.2")
+	set (PACKAGE_DISKS "cd-disks")
+	set (with_disks "yes")
+	set (disksdatadir "${pluginsdatadir}/Disks")
+	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Disks/data/Disks.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Disks/data/Disks.conf)
+	add_subdirectory ("Disks")
+endif()
+
 ############# DND2SHARE #################
 set (GETTEXT_DND2SHARE ${GETTEXT_PLUGINS})
-set (VERSION_DND2SHARE "1.0.3")
+set (VERSION_DND2SHARE "1.0.5")
 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)
@@ -177,17 +292,19 @@
 
 ############# DOCK RENDERING #################
 set (GETTEXT_RENDERING ${GETTEXT_PLUGINS})
-set (VERSION_RENDERING "1.5.7")
+set (VERSION_RENDERING "1.5.9")
 set (PACKAGE_RENDERING "cd-rendering")
 set (renderingdatadir "${pluginsdatadir}/rendering")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/dock-rendering/data/rendering.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dock-rendering/data/rendering.conf)
 add_subdirectory (dock-rendering)
 
 ############# DONCKY #################
+set (with_doncky "no")
 if ("${enable-doncky}" STREQUAL "yes")
 	set (GETTEXT_DONCKY ${GETTEXT_PLUGINS})
-	set (VERSION_DONCKY "0.0.3")
+	set (VERSION_DONCKY "0.0.4")
 	set (PACKAGE_DONCKY "cd-doncky")
+	set (with_doncky "yes")
 	set (donckydatadir "${pluginsdatadir}/Doncky")
 	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Doncky/data/Doncky.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Doncky/data/Doncky.conf)
 	add_subdirectory (Doncky)
@@ -195,7 +312,7 @@
 
 ############# DROP INDICATOR #################
 set (GETTEXT_DROP_INDICATOR ${GETTEXT_PLUGINS})
-set (VERSION_DROP_INDICATOR "1.1.3")
+set (VERSION_DROP_INDICATOR "1.1.4")
 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)
@@ -203,7 +320,7 @@
 
 ############# DUSTBIN #################
 set (GETTEXT_DUSTBIN ${GETTEXT_PLUGINS})
-set (VERSION_DUSTBIN "2.3.0")
+set (VERSION_DUSTBIN "2.3.1")
 set (PACKAGE_DUSTBIN "cd-dustbin")
 set (dustbinuserdirname "dustbin")
 set (dustbindatadir "${pluginsdatadir}/dustbin")
@@ -212,21 +329,23 @@
 
 ############# FOLDERS #################
 set (GETTEXT_FOLDERS ${GETTEXT_PLUGINS})
-set (VERSION_FOLDERS "0.2.0")
+set (VERSION_FOLDERS "0.2.1")
 set (PACKAGE_FOLDERS "cd-Folders")
 set (foldersdatadir "${pluginsdatadir}/Folders")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Folders/data/Folders.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Folders/data/Folders.conf)
 add_subdirectory (Folders)
 
 ############# GMENU #################
-if (NOT "${enable_gmenu}" STREQUAL "no")
+set (with_gmenu "no")
+if (NOT "${enable-gmenu}" STREQUAL "no")
 	pkg_check_modules (GMENU_PACKAGE libgnome-menu)
 	if ("${GMENU_PACKAGE_FOUND}" STREQUAL "")
 		message (STATUS "Could not find libgnome-menu; Cairo-Dock won't be built with GMenu applet.")
 	else()
 		set (GETTEXT_GMENU ${GETTEXT_PLUGINS})
-		set (VERSION_GMENU "1.1.5")
+		set (VERSION_GMENU "1.1.6")
 		set (PACKAGE_GMENU "cd-GMenu")
+		set (with_gmenu "yes")
 		set (gmenudatadir "${pluginsdatadir}/GMenu")
 		configure_file (${CMAKE_CURRENT_SOURCE_DIR}/GMenu/data/GMenu.conf.in ${CMAKE_CURRENT_BINARY_DIR}/GMenu/data/GMenu.conf)
 		add_subdirectory ("GMenu")
@@ -238,26 +357,30 @@
 add_subdirectory (gvfs-integration)
 
 ############# GNOME-INTEGRATION #################
-if (NOT "${enable_gnome_integration}" STREQUAL "no")
+set (with_gnome_integration "no")
+if (NOT "${enable-gnome-integration}" STREQUAL "no")
 	pkg_check_modules (GNOME_INTEGRATION gio-2.0)
 	if ("${GNOME_INTEGRATION_FOUND}" STREQUAL "")
 		message (STATUS "Could not find gio; Cairo-Dock won't be built with Gnome>=2.22 support.")
 	else()
-		set (VERSION_GNOME_INTEGRATION "1.0.2")
+		set (VERSION_GNOME_INTEGRATION "1.0.3")
 		set (PACKAGE_GNOME_INTEGRATION "cd_gnome-integration")
+		set (with_gnome_integration "yes")
 		set (gnome_integrationdatadir "${pluginsdatadir}/gnome-integration")
 		add_subdirectory ("gnome-integration")
 	endif()
 endif()
 
 ############# GNOME-INTEGRATION-OLD #################
-if ("${enable_old_gnome_integration}" STREQUAL "yes")
+set (with_gnome_integration_old "no")
+if ("${enable-old-gnome-integration}" STREQUAL "yes")
 	pkg_check_modules (OLD_GNOME_INTEGRATION gnome-vfs-2.0 libgnomeui-2.0)
 	if ("${OLD_GNOME_INTEGRATION_FOUND}" STREQUAL "")
 		message (STATUS "Could not find gnome-vfs and/or gnomeui; Cairo-Dock won't be built with Gnome<2.22 support.")
 	else()
-		set (VERSION_GNOME_INTEGRATION_OLD "1.0.3")
+		set (VERSION_GNOME_INTEGRATION_OLD "1.0.4")
 		set (PACKAGE_GNOME_INTEGRATION_OLD "cd_gnome-integration-old")
+		set (with_gnome_integration_old "yes")
 		set (gnome_integration_olddatadir "${pluginsdatadir}/gnome-integration-old")
 		add_subdirectory ("gnome-integration-old")
 	endif()
@@ -265,48 +388,82 @@
 
 ############# ICON EFFECT #################
 set (GETTEXT_ICON_EFFECTS ${GETTEXT_PLUGINS})
-set (VERSION_ICON_EFFECTS "1.2.3")
+set (VERSION_ICON_EFFECTS "1.2.4")
 set (PACKAGE_ICON_EFFECTS "cd-icon-effect")
 set (icon_effectsdatadir "${pluginsdatadir}/icon-effect")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/icon-effect/data/icon-effect.conf.in ${CMAKE_CURRENT_BINARY_DIR}/icon-effect/data/icon-effect.conf)
 add_subdirectory (icon-effect)
 
 ############# INDICATOR-APPLET #################
-pkg_check_modules (DBUSMENU dbusmenu-glib)
-pkg_check_modules (INDICATOR_APPLET indicator libido-0.1 dbusmenu-gtk)
-if (NOT "${INDICATOR_APPLET_FOUND}" STREQUAL "" AND NOT "${DBUSMENU_FOUND}" STREQUAL "")
+# Note: the names of dbusmenu-glib and dbusmenu-gtk have changed...
+pkg_check_modules (DBUSMENU_04 QUIET dbusmenu-glib-0.4)
+pkg_check_modules (DBUSMENU_GTK_04 QUIET dbusmenu-gtk-0.4)
+pkg_check_modules (INDICATOR_APPLET indicator libido-0.1)
+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_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}")
+	
+	execute_process(
+		COMMAND pkg-config --variable=iconsdir indicator
+		OUTPUT_VARIABLE INDICATORICONSDIR)
+	STRING (REGEX REPLACE "\n" "" INDICATORICONSDIR ${INDICATORICONSDIR})  # la commande rajoute un retour chariot ...
 	add_subdirectory (Indicator-applet)
+	set (with_indicator "yes")
 endif()
 
 ############# ILLUSION #################
 set (GETTEXT_ILLUSION ${GETTEXT_PLUGINS})
-set (VERSION_ILLUSION "1.0.6")
+set (VERSION_ILLUSION "1.0.7")
 set (PACKAGE_ILLUSION "cd-illusion")
 set (illusiondatadir "${pluginsdatadir}/illusion")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/illusion/data/illusion.conf.in ${CMAKE_CURRENT_BINARY_DIR}/illusion/data/illusion.conf)
 add_subdirectory (illusion)
 
 ############# KDE-INTEGRATION #################
-if (NOT "${enable_kde_integration}" STREQUAL "no")
+set (with_kde_integration "no")
+if (NOT "${enable-kde-integration}" STREQUAL "no")
 	pkg_check_modules (KDE_INTEGRATION gio-2.0)
 	if ("${KDE_INTEGRATION_FOUND}" STREQUAL "")
 		message (STATUS "Could not find kde libs; Cairo-Dock won't be built with KDE support.")
 	else()
-		set (VERSION_KDE_INTEGRATION "0.0.1")
+		set (VERSION_KDE_INTEGRATION "0.0.2")
 		set (PACKAGE_KDE_INTEGRATION "cd_kde-integration")
+		set (with_kde_integration "yes")
 		set (kde_integrationdatadir "${pluginsdatadir}/kde-integration")
 		add_subdirectory ("kde-integration")
 	endif()
 endif()
 
 ############# KEYBOARD_INDICATOR #################
+set (with_keyboard_indicator "no")
 pkg_check_modules (KEYBOARD_INDICATOR_PACKAGE libxklavier)
 if ("${KEYBOARD_INDICATOR_PACKAGE_FOUND}" STREQUAL "")
 	message (STATUS "Could not find libxklavier; Cairo-Dock won't be built with keyboard-indicator applet.")
 else()
 	set (GETTEXT_KEYBOARD_INDICATOR ${GETTEXT_PLUGINS})
-	set (VERSION_KEYBOARD_INDICATOR "1.1.2")
+	set (VERSION_KEYBOARD_INDICATOR "1.1.3")
 	set (PACKAGE_KEYBOARD_INDICATOR "cd-keyboard-indicator")
+	set (with_keyboard_indicator "yes")
 	set (keyboard_indicatordatadir "${pluginsdatadir}/keyboard-indicator")
 	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/keyboard-indicator/data/keyboard-indicator.conf.in ${CMAKE_CURRENT_BINARY_DIR}/keyboard-indicator/data/keyboard-indicator.conf)
 	add_subdirectory ("keyboard-indicator")
@@ -314,13 +471,14 @@
 
 ############# LOGOUT #################
 set (GETTEXT_LOGOUT ${GETTEXT_PLUGINS})
-set (VERSION_LOGOUT "1.2.9")
+set (VERSION_LOGOUT "1.2.10")
 set (PACKAGE_LOGOUT "cd-logout")
 set (logoutdatadir "${pluginsdatadir}/logout")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/logout/data/logout.conf.in ${CMAKE_CURRENT_BINARY_DIR}/logout/data/logout.conf)
 add_subdirectory (logout)
 
 ############# MAIL #################
+set (with_mail "no")
 # find the compilation flags
 execute_process(
 	COMMAND libetpan-config --cflags
@@ -351,41 +509,33 @@
 	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.6")
+	set (VERSION_MAIL "1.0.8")
 	set (PACKAGE_MAIL "cd-mail")
 	set (maildatadir "${pluginsdatadir}/mail")
+	set (with_mail "yes")
 	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/mail/data/mail.conf.in ${CMAKE_CURRENT_BINARY_DIR}/mail/data/mail.conf)
 	add_subdirectory ("mail")
 endif()
 
 ############# MEMENU #################
-if (NOT "${INDICATOR_APPLET_FOUND}" STREQUAL "" AND NOT "${DBUSMENU_FOUND}" STREQUAL "")
-	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}")
-	
+set (with_me_menu "no")
+if ("${with_indicator}" STREQUAL "yes")
 	set (GETTEXT_MEMENU ${GETTEXT_PLUGINS})
-	set (VERSION_MEMENU "1.0.0")
+	set (VERSION_MEMENU "1.0.1")
 	set (PACKAGE_MEMENU "cd-MeMenu")
 	set (memenudatadir "${pluginsdatadir}/MeMenu")
+	set (with_me_menu "yes")
 	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/MeMenu/data/MeMenu.conf.in ${CMAKE_CURRENT_BINARY_DIR}/MeMenu/data/MeMenu.conf)
 	add_subdirectory (MeMenu)
 endif()
 
 ############# MESSAGING_MENU #################
-if (NOT "${INDICATOR_APPLET_FOUND}" STREQUAL "" AND NOT "${DBUSMENU_FOUND}" STREQUAL "")
+set (with_messaging_menu "no")
+if ("${with_indicator}" STREQUAL "yes")
 	set (GETTEXT_MESSAGING_MENU ${GETTEXT_PLUGINS})
-	set (VERSION_MESSAGING_MENU "0.0.1")
+	set (VERSION_MESSAGING_MENU "1.0.1")
 	set (PACKAGE_MESSAGING_MENU "cd-Messaging-Menu")
+	set (with_messaging_menu "yes")
 	set (messaging_menudatadir "${pluginsdatadir}/Messaging-Menu")
 	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Messaging-Menu/data/Messaging-Menu.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Messaging-Menu/data/Messaging-Menu.conf)
 	add_subdirectory (Messaging-Menu)
@@ -393,7 +543,7 @@
 
 ############# MOTION BLUR #################
 set (GETTEXT_MOTION_BLUR ${GETTEXT_PLUGINS})
-set (VERSION_MOTION_BLUR "1.0.3")
+set (VERSION_MOTION_BLUR "1.0.4")
 set (PACKAGE_MOTION_BLUR "cd-motion_blur")
 set (motion_blurdatadir "${pluginsdatadir}/motion-blur")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/motion-blur/data/motion_blur.conf.in ${CMAKE_CURRENT_BINARY_DIR}/motion-blur/data/motion_blur.conf)
@@ -401,7 +551,7 @@
 
 ############# MUSICPLAYER #################
 set (GETTEXT_MUSICPLAYER ${GETTEXT_PLUGINS})
-set (VERSION_MUSICPLAYER "1.0.6")
+set (VERSION_MUSICPLAYER "1.0.7")
 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)
@@ -409,17 +559,19 @@
 
 ############# NETSPEED #################
 set (GETTEXT_NETSPEED ${GETTEXT_PLUGINS})
-set (VERSION_NETSPEED "1.2.4")
+set (VERSION_NETSPEED "1.2.5")
 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)
 add_subdirectory (netspeed)
 
 ############# NETWORK_MONITOR #################
+set (with_network_monitor "no")
 if ("${enable-network-monitor}" STREQUAL "yes")
 	set (GETTEXT_NETWORK_MONITOR ${GETTEXT_PLUGINS})
-	set (VERSION_NETWORK_MONITOR "0.2.2")
+	set (VERSION_NETWORK_MONITOR "0.2.3")
 	set (PACKAGE_NETWORK_MONITOR "cd-network-monitor")
+	set (with_network_monitor "yes")
 	set (network_monitordatadir "${pluginsdatadir}/Network-Monitor")
 	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Network-Monitor/data/Network-Monitor.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Network-Monitor/data/Network-Monitor.conf)
 	add_subdirectory (Network-Monitor)
@@ -427,7 +579,7 @@
 
 ############# POWERMANAGER #################
 set (GETTEXT_POWERMANAGER ${GETTEXT_PLUGINS})
-set (VERSION_POWERMANAGER "1.3.3")
+set (VERSION_POWERMANAGER "1.3.4")
 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)
@@ -435,25 +587,50 @@
 
 ############# QUICK BROWSER #################
 set (GETTEXT_QUICK_BROWSER ${GETTEXT_PLUGINS})
-set (VERSION_QUICK_BROWSER "1.0.7")
+set (VERSION_QUICK_BROWSER "1.0.8")
 set (PACKAGE_QUICK_BROWSER "cd-quick-browser")
 set (quick_browserdatadir "${pluginsdatadir}/quick_browser")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/quick-browser/data/quick-browser.conf.in ${CMAKE_CURRENT_BINARY_DIR}/quick-browser/data/quick-browser.conf)
 add_subdirectory (quick-browser)
 
+############# RECENT-EVENTS #################
+set (with_recent_events "no")
+pkg_check_modules (RECENT_EVENTS zeitgeist-1.0)
+if ("${RECENT_EVENTS_FOUND}" STREQUAL "")
+	message (STATUS "Could not find libzeitgeist; Cairo-Dock won't be built with Zeitgeist support.")
+else()
+	set (GETTEXT_RECENT_EVENTS ${GETTEXT_PLUGINS})
+	set (VERSION_RECENT_EVENTS "0.0.2")
+	set (PACKAGE_RECENT_EVENTS "cd-Recent-Events")
+	set (with_recent_events "yes")
+	set (recent_eventsdatadir "${pluginsdatadir}/Recent-Events")
+	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Recent-Events/data/Recent-Events.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Recent-Events/data/Recent-Events.conf)
+	add_subdirectory ("Recent-Events")
+endif()
+
+############# REMOTE_CONTROL #################
+set (GETTEXT_REMOTE_CONTROL ${GETTEXT_PLUGINS})
+set (VERSION_REMOTE_CONTROL "0.0.2")
+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)
+add_subdirectory (Remote-Control)
+
 ############# RSSREADER #################
 set (GETTEXT_RSS_READER ${GETTEXT_PLUGINS})
-set (VERSION_RSS_READER "1.0.2")
+set (VERSION_RSS_READER "1.0.3")
 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)
 add_subdirectory (RSSreader)
 
 ############# SCOOBY_DO #################
+set (with_scooby_do "no")
 if ("${enable-scooby-do}" STREQUAL "yes")
 	set (GETTEXT_SCOOBY_DO ${GETTEXT_PLUGINS})
-	set (VERSION_SCOOBY_DO "0.1.0")
+	set (VERSION_SCOOBY_DO "0.1.1")
 	set (PACKAGE_SCOOBY_DO "cd-scooby-do")
+	set (with_scooby_do "yes")
 	set (scooby_dodatadir "${pluginsdatadir}/Scooby-Do")
 	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Scooby-Do/data/Scooby-Do.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Scooby-Do/data/Scooby-Do.conf)
 	add_subdirectory (Scooby-Do)
@@ -461,19 +638,21 @@
 
 ############# SHORTCUTS #################
 set (GETTEXT_SHORTCUTS ${GETTEXT_PLUGINS})
-set (VERSION_SHORTCUTS "1.3.0")
+set (VERSION_SHORTCUTS "1.3.1")
 set (PACKAGE_SHORTCUTS "cd-shortcuts")
 set (shortcutsdatadir "${pluginsdatadir}/shortcuts")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/shortcuts/data/shortcuts.conf.in ${CMAKE_CURRENT_BINARY_DIR}/shortcuts/data/shortcuts.conf)
 add_subdirectory (shortcuts)
 
 ############# SHOW DESKTOP #################
+set (with_xrandr "yes")
 pkg_check_modules (SHOW_DESKTOP_XRANDR xrandr)
 if ("${SHOW_DESKTOP_XRANDR_FOUND}" STREQUAL "")
 	message (STATUS "Could not find xrandr; ShowDesktop won't be built with screen resolution abilities.")
+	set (with_xrandr "no")
 endif()
 set (GETTEXT_SHOW_DESKTOP ${GETTEXT_PLUGINS})
-set (VERSION_SHOW_DESKTOP "1.2.2")
+set (VERSION_SHOW_DESKTOP "1.2.3")
 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)
@@ -481,19 +660,21 @@
 
 ############# SHOW MOUSE #################
 set (GETTEXT_SHOW_MOUSE ${GETTEXT_PLUGINS})
-set (VERSION_SHOW_MOUSE "1.0.3")
+set (VERSION_SHOW_MOUSE "1.0.4")
 set (PACKAGE_SHOW_MOUSE "cd-show_mouse")
 set (show_mousedatadir "${pluginsdatadir}/show_mouse")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/show-mouse/data/show_mouse.conf.in ${CMAKE_CURRENT_BINARY_DIR}/show-mouse/data/show_mouse.conf)
 add_subdirectory (show-mouse)
 
 ############# SLIDER #################
+set (with_exif "yes")
 pkg_check_modules (EXIF libexif)
 if ("${EXIF_FOUND}" STREQUAL "")
 	message (STATUS "Could not find libexif; Slider won't be able to rotate the images accordingly to their exif data.")
+	set (with_exif "no")
 endif()
 set (GETTEXT_SLIDER ${GETTEXT_PLUGINS})
-set (VERSION_SLIDER "2.0.6")
+set (VERSION_SLIDER "2.0.8")
 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)
@@ -501,21 +682,22 @@
 
 ############# STACK #################
 set (GETTEXT_STACK ${GETTEXT_PLUGINS})
-set (VERSION_STACK "0.3.0")
+set (VERSION_STACK "0.3.1")
 set (PACKAGE_STACK "cd-stack")
 set (stackdatadir "${pluginsdatadir}/stack")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/stack/data/stack.conf.in ${CMAKE_CURRENT_BINARY_DIR}/stack/data/stack.conf)
 add_subdirectory (stack)
 
 ############# STATUS NOTIFIER #################
+set (with_status_notifier "no")
 if ("${enable-status-notifier}" STREQUAL "yes")
-	pkg_check_modules (STATUS_NOTIFIER dbusmenu-gtk)
-	if ("${STATUS_NOTIFIER_FOUND}" STREQUAL "")
+	if ("${DBUSMENU_GTK_FOUND}" STREQUAL "")
 		message (STATUS "Could not find Status-Notifier libs; Cairo-Dock won't be built with Status-Notifier support.")
 	else()
 		set (GETTEXT_STATUS_NOTIFIER ${GETTEXT_PLUGINS})
-		set (VERSION_STATUS_NOTIFIER "0.1.0")
+		set (VERSION_STATUS_NOTIFIER "0.1.1")
 		set (PACKAGE_STATUS_NOTIFIER "cd-status-notifier")
+		set (with_status_notifier "yes")
 		set (status_notifierdatadir "${pluginsdatadir}/Status-Notifier")
 		configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Status-Notifier/data/Status-Notifier.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Status-Notifier/data/Status-Notifier.conf)
 		add_subdirectory (Status-Notifier)
@@ -524,15 +706,21 @@
 
 ############# SWITCHER #################
 set (GETTEXT_SWITCHER ${GETTEXT_PLUGINS})
-set (VERSION_SWITCHER "2.1.4")
+set (VERSION_SWITCHER "2.1.5")
 set (PACKAGE_SWITCHER "cd-switcher")
 set (switcherdatadir "${pluginsdatadir}/switcher")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/switcher/data/switcher.conf.in ${CMAKE_CURRENT_BINARY_DIR}/switcher/data/switcher.conf)
 add_subdirectory (switcher)
 
 ############# SYSTEM MONITOR #################
+set (with_sensors "yes")
+find_package (Sensors)
+if (NOT "${SENSORS_FOUND}" STREQUAL "TRUE")
+	message (STATUS "Could not find libsensors; System-Monitor won't be able to monitor fan speed and CPU temperature.")
+	set (with_sensors "no")
+endif()
 set (GETTEXT_SYSTEM_MONITOR ${GETTEXT_PLUGINS})
-set (VERSION_SYSTEM_MONITOR "1.0.5")
+set (VERSION_SYSTEM_MONITOR "1.0.6")
 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)
@@ -540,7 +728,7 @@
 
 ############# SYSTRAY #################
 set (GETTEXT_SYSTRAY ${GETTEXT_PLUGINS})
-set (VERSION_SYSTRAY "0.2.1")
+set (VERSION_SYSTRAY "0.2.2")
 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)
@@ -550,18 +738,20 @@
 pkg_check_modules (TERMINAL_PACKAGE vte)
 if ("${TERMINAL_PACKAGE_FOUND}" STREQUAL "")
 	message (STATUS "Could not find libvte; Cairo-Dock won't be built with terminal applet.")
+	set (with_terminal "no")
 else()
 	set (GETTEXT_TERMINAL ${GETTEXT_PLUGINS})
-	set (VERSION_TERMINAL "1.0.9")
+	set (VERSION_TERMINAL "1.0.10")
 	set (PACKAGE_TERMINAL "cd-terminal")
+	set (with_terminal "yes")
 	set (terminaldatadir "${pluginsdatadir}/terminal")
 	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/terminal/data/terminal.conf.in ${CMAKE_CURRENT_BINARY_DIR}/terminal/data/terminal.conf)
 	add_subdirectory (terminal)
 endif()
 
-############# OY #################
+############# TOMBOY #################
 set (GETTEXT_TOMBOY ${GETTEXT_PLUGINS})
-set (VERSION_TOMBOY "1.3.0")
+set (VERSION_TOMBOY "1.3.1")
 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)
@@ -569,7 +759,7 @@
 
 ############# TOONS #################
 set (GETTEXT_TOONS ${GETTEXT_PLUGINS})
-set (VERSION_TOONS "1.0.7")
+set (VERSION_TOONS "1.0.8")
 set (PACKAGE_TOONS "cd-Toons")
 set (toonsdatadir "${pluginsdatadir}/Toons")
 set (toonsuserdirname "Toons")
@@ -578,7 +768,7 @@
 
 ############# WEATHER #################
 set (GETTEXT_WEATHER ${GETTEXT_PLUGINS})
-set (VERSION_WEATHER "1.2.9")
+set (VERSION_WEATHER "1.2.10")
 set (PACKAGE_WEATHER "cd-weather")
 set (weatherdatadir "${pluginsdatadir}/weather")
 set (weatheruserdirname "weather")
@@ -586,15 +776,17 @@
 add_subdirectory (weather)
 
 ############# WEBLETS #################
-pkg_check_modules (WEBKIT webkit-1.0)
-if (NOT "${enable_weblets}" STREQUAL "no")
+set (with_weblets "no")
+if (NOT "${enable-weblets}" STREQUAL "no")
+	pkg_check_modules (WEBKIT webkit-1.0)
 	if ("${WEBKIT_FOUND}" STREQUAL "")
 		message (STATUS "Could not find webkit-1.0; Cairo-Dock won't be built with Weblets applet.")
 	else()
 		set (GETTEXT_WEBLETS ${GETTEXT_PLUGINS})
-		set (VERSION_WEBLETS "0.0.9")
+		set (VERSION_WEBLETS "0.0.10")
 		set (PACKAGE_WEBLETS "cd-weblets")
 		set (webletsdatadir "${pluginsdatadir}/weblets")
+		set (with_weblets "yes")
 		configure_file (${CMAKE_CURRENT_SOURCE_DIR}/weblets/data/weblets.conf.in ${CMAKE_CURRENT_BINARY_DIR}/weblets/data/weblets.conf)
 		add_subdirectory ("weblets")
 	endif()
@@ -602,21 +794,23 @@
 
 ############# WIFI #################
 set (GETTEXT_WIFI ${GETTEXT_PLUGINS})
-set (VERSION_WIFI "1.2.5")
+set (VERSION_WIFI "1.2.6")
 set (PACKAGE_WIFI "cd-wifi")
 set (wifidatadir "${pluginsdatadir}/wifi")
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/wifi/data/wifi.conf.in ${CMAKE_CURRENT_BINARY_DIR}/wifi/data/wifi.conf)
 add_subdirectory (wifi)
 
 ############# XFCE-INTEGRATION #################
-if (NOT "${enable_xfce_integration}" STREQUAL "no")
+set (with_xfce_integration "no")
+if (NOT "${enable-xfce-integration}" STREQUAL "no")
 	pkg_check_modules (XFCE_INTEGRATION_THUNAR thunar-vfs-1)
 	pkg_check_modules (XFCE_INTEGRATION_GVFS gio-2.0)
 	if ("${XFCE_INTEGRATION_THUNAR_FOUND}" STREQUAL "" AND "${XFCE_INTEGRATION_GVFS_FOUND}" STREQUAL "")
 		message (STATUS "Could find neither thunar-vfs or libgio-2.0; Cairo-Dock won't be built with XFCE support.")
 	else()
-		set (VERSION_XFCE_INTEGRATION "1.0.2")
+		set (VERSION_XFCE_INTEGRATION "1.0.3")
 		set (PACKAGE_XFCE_INTEGRATION "cd_xfce-integration")
+		set (with_xfce_integration "yes")
 		set (xfce_integrationdatadir "${pluginsdatadir}/xfce-integration")
 		add_subdirectory ("xfce-integration")
 	endif()
@@ -626,23 +820,53 @@
 pkg_check_modules (XGAMMA_PACKAGE x11 xxf86vm)
 if ("${XGAMMA_PACKAGE_FOUND}" STREQUAL "")
 	message (STATUS "Could not find xxf86vm; Cairo-Dock won't be built with Xgamma applet.")
+	set (with_xgamma "no")
 else()
 	set (GETTEXT_XGAMMA ${GETTEXT_PLUGINS})
-	set (VERSION_XGAMMA "1.1.5")
+	set (VERSION_XGAMMA "1.2.0")
 	set (PACKAGE_XGAMMA "cd-Xgamma")
+	set (with_xgamma "yes")
 	set (xgammadatadir "${pluginsdatadir}/Xgamma")
 	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Xgamma/data/Xgamma.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Xgamma/data/Xgamma.conf)
 	add_subdirectory ("Xgamma")
 endif()
 
+message ("")
+message (STATUS "===============")
+message (STATUS "Language build:")
+message (STATUS "===============")
+message ("")
 add_subdirectory (po)
 
-############# REMOTE_CONTROL #################
-if ("${enable_remote_control}" STREQUAL "yes")
-	set (GETTEXT_REMOTE_CONTROL ${GETTEXT_PLUGINS})
-	set (VERSION_REMOTE_CONTROL "0.0.1")
-	set (PACKAGE_REMOTE_CONTROL "cd-Remote-Control")
-	set (remote_controldatadir "${pluginsdatadir}/Remote-Control")
-	configure_file (Remote-Control/data/Remote-Control.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/Remote-Control/data/Remote-Control.conf)
-	add_subdirectory (Remote-Control)
-endif()
+message ("")
+message (STATUS "===============")
+message (STATUS "Plug-ins build:")
+message (STATUS "===============")
+message ("")
+message (STATUS " - with Alsa-Mixer applet:         ${with_alsa}")
+message (STATUS " - with iCal support:              ${with_ical}")
+message (STATUS " - with Disks applet:              ${with_disks}")
+message (STATUS " - with Doncky applet:             ${with_doncky}")
+message (STATUS " - with GMenu applet:              ${with_gmenu}")
+message (STATUS " - with Gnome support:             ${with_gnome_integration}")
+message (STATUS " - with old Gnome support:         ${with_gnome_integration_old}")
+message (STATUS " - with KDE support:               ${with_kde_integration}")
+message (STATUS " - with XFCE support:              ${with_xfce_integration}")
+message (STATUS " - with Keyboard-indicator applet: ${with_keyboard_indicator}")
+message (STATUS " - with Mail applet:               ${with_mail}")
+message (STATUS " - with Me-Menu applet:            ${with_me_menu}")
+message (STATUS " - with Messaging-Menu:            ${with_messaging_menu}")
+message (STATUS " - with Network-Monitor applet:    ${with_network_monitor}")
+message (STATUS " - with Scooby-Do applet:          ${with_scooby_do}")
+message (STATUS " - with Screen Resolution support: ${with_xrandr}")
+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 " - 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}")

=== modified file 'Cairo-Penguin/data/Cairo-Penguin.conf.in'
--- Cairo-Penguin/data/Cairo-Penguin.conf.in	2010-09-07 00:39:20 +0000
+++ Cairo-Penguin/data/Cairo-Penguin.conf.in	2011-03-17 14:49:16 +0000
@@ -2,16 +2,25 @@
 
 #[gtk-about]
 [Icon]
+
+#F[Applet]
+frame_maininfo=
+
+#d Name of the dock it belongs to:
+dock name = 
+
+#s Name of the icon as it will appear in its caption in the dock:
+name = 
+
+#F[Display]
+frame_display=
+
+icon =
+
 #j+[0;128] Icon size for busy penguin:
 #{Set to 0 to use the default applet size}
 icon size = 0;0
 
-#s Icon name for busy penguin:
-name = 
-
-#d Name of the dock it belongs to:
-dock name = 
-
 order = 
 
 #F[Applet's Handbook]
@@ -25,7 +34,7 @@
 #h+[@cairo_penguindatadir@/themes;@cairo_penguinuserdirname@;Cairo-Penguin] Choose one of the available themes:/
 theme = Classic
 
-#i Delay between animation changes :
+#i[4;30] Delay between animation changes :
 #{in seconds.}
 change delay = 8
 

=== modified file 'Cairo-Penguin/src/applet-animation.c'
--- Cairo-Penguin/src/applet-animation.c	2010-08-07 01:43:25 +0000
+++ Cairo-Penguin/src/applet-animation.c	2011-03-17 14:49:16 +0000
@@ -201,7 +201,7 @@
 		cairo_dock_get_icon_extent (myIcon, myContainer, &iIconWidth, &iIconHeight);
 		
 		g_return_if_fail (pAnimation->iTexture != 0);
-		double f = (1 + g_fAmplitude) / fScale;
+		double f = (1 + myIconsParam.fAmplitude) / fScale;
 		double x, y;  // centre du pingouin, en coordonnées absolues.
 		x = myData.iCurrentPositionX - iXMin - iIconWidth/2 + pAnimation->iFrameWidth/2*f;
 		y = myData.iCurrentPositionY + pAnimation->iFrameHeight/2*f;
@@ -235,7 +235,7 @@
 		if (pSurface != NULL)
 		{
 			cairo_save (myDrawContext);
-			cairo_scale (myDrawContext, (1 + g_fAmplitude) / fScale, (1 + g_fAmplitude) / fScale);
+			cairo_scale (myDrawContext, (1 + myIconsParam.fAmplitude) / fScale, (1 + myIconsParam.fAmplitude) / fScale);
 			cairo_set_source_surface (
 				myDrawContext,
 				pSurface,
@@ -308,9 +308,9 @@
 		}
 	}
 	
-	if (myData.iCurrentPositionY < (myConfig.bFree ? myBackground.iDockLineWidth + myConfig.iGroundOffset : 0))
+	if (myData.iCurrentPositionY < (myConfig.bFree ? myDocksParam.iDockLineWidth + myConfig.iGroundOffset : 0))
 	{
-		myData.iCurrentPositionY = (myConfig.bFree ? myBackground.iDockLineWidth + myConfig.iGroundOffset : 0);
+		myData.iCurrentPositionY = (myConfig.bFree ? myDocksParam.iDockLineWidth + myConfig.iGroundOffset : 0);
 	}
 	else if (myData.iCurrentPositionY + pAnimation->iFrameHeight > iHeight)
 	{
@@ -340,7 +340,7 @@
 					cairo_surface_destroy (myIcon->pReflectionBuffer);
 					myIcon->pReflectionBuffer = NULL;
 				}
-					if (CAIRO_DOCK_CONTAINER_IS_OPENGL (myContainer))
+				if (CAIRO_DOCK_CONTAINER_IS_OPENGL (myContainer))
 					cairo_dock_update_icon_texture (myIcon);
 			}
 			else  // on reste sur la derniere image de l'animation de fin.
@@ -484,7 +484,7 @@
 			myData.iCurrentDirection = g_random_int_range (0, 2);  // [a;b[
 		else
 			myData.iCurrentDirection = 0;
-		myData.iCurrentPositionY = (myConfig.bFree ? myBackground.iDockLineWidth + myConfig.iGroundOffset : 0);
+		myData.iCurrentPositionY = (myConfig.bFree ? myDocksParam.iDockLineWidth + myConfig.iGroundOffset : 0);
 	}
 	else  // la direction reste la meme.
 	{
@@ -533,12 +533,12 @@
 	penguin_remove_notfications();
 	if (myConfig.bFree)
 	{
-		cairo_dock_register_notification_on_container (myContainer, CAIRO_DOCK_UPDATE_DOCK_SLOW, (CairoDockNotificationFunc) penguin_update_container, CAIRO_DOCK_RUN_AFTER, myApplet);
-		cairo_dock_register_notification_on_container (myContainer, CAIRO_DOCK_RENDER_DOCK, (CairoDockNotificationFunc) penguin_render_on_container, CAIRO_DOCK_RUN_AFTER, myApplet);
+		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);
 	}
 	else
 	{
-		cairo_dock_register_notification_on_icon (myIcon, CAIRO_DOCK_UPDATE_ICON_SLOW, (CairoDockNotificationFunc) penguin_update_icon, CAIRO_DOCK_RUN_AFTER, myApplet);
+		cairo_dock_register_notification_on_object (myIcon, NOTIFICATION_UPDATE_ICON_SLOW, (CairoDockNotificationFunc) penguin_update_icon, CAIRO_DOCK_RUN_AFTER, myApplet);
 	}
 }
 
@@ -554,7 +554,7 @@
 		
 		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, myIcons.iSeparateIcons);
+			cairo_dock_detach_icon_from_dock (myIcon, myDock, myIconsParam.iSeparateIcons);
 			cairo_dock_update_dock_size (myDock);
 		}
 		else

=== modified file 'Cairo-Penguin/src/applet-animation.h'
--- Cairo-Penguin/src/applet-animation.h	2009-10-05 19:27:17 +0000
+++ Cairo-Penguin/src/applet-animation.h	2011-03-17 14:49:16 +0000
@@ -29,9 +29,9 @@
 #define penguin_is_resting(pAnimation) ((pAnimation) == NULL || (pAnimation)->iNbFrames <= 1 && (pAnimation)->iSpeed == 0)
 
 #define penguin_remove_notfications() do {\
-	cairo_dock_remove_notification_func_on_icon (myIcon, CAIRO_DOCK_UPDATE_ICON_SLOW, (CairoDockNotificationFunc) penguin_update_icon, myApplet);\
-	cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (g_pMainDock), CAIRO_DOCK_UPDATE_DOCK_SLOW, (CairoDockNotificationFunc) penguin_update_container, myApplet);\
-	cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (g_pMainDock), CAIRO_DOCK_RENDER_DOCK, (CairoDockNotificationFunc) penguin_render_on_container, myApplet); } while (0)
+	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)
 
 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	2010-08-07 01:43:25 +0000
+++ Cairo-Penguin/src/applet-init.c	2011-03-17 14:49:16 +0000
@@ -47,23 +47,47 @@
 	
 	penguin_start_animating_with_delay (myApplet);
 	
-	cairo_dock_register_notification (CAIRO_DOCK_CLICK_ICON,
+	cairo_dock_register_notification_on_object (myContainer,
+		NOTIFICATION_CLICK_ICON,
 		(CairoDockNotificationFunc) CD_APPLET_ON_CLICK_FUNC,
 		CAIRO_DOCK_RUN_FIRST,
 		myApplet);
-	cairo_dock_register_notification (CAIRO_DOCK_MIDDLE_CLICK_ICON,
+	cairo_dock_register_notification_on_object (myContainer,
+		NOTIFICATION_MIDDLE_CLICK_ICON,
 		(CairoDockNotificationFunc) CD_APPLET_ON_MIDDLE_CLICK_FUNC,
 		CAIRO_DOCK_RUN_FIRST,
 		myApplet);
-	CD_APPLET_REGISTER_FOR_BUILD_MENU_EVENT;
+	cairo_dock_register_notification_on_object (myContainer,
+		NOTIFICATION_BUILD_ICON_MENU,
+		(CairoDockNotificationFunc) CD_APPLET_ON_BUILD_MENU_FUNC,
+		CAIRO_DOCK_RUN_FIRST,
+		myApplet);
+	cairo_dock_register_notification_on_object (myDock,
+		NOTIFICATION_STOP_DOCK,
+		(CairoDockNotificationFunc) cd_on_dock_destroyed,
+		CAIRO_DOCK_RUN_AFTER,
+		myApplet);
 CD_APPLET_INIT_END
 
 
 CD_APPLET_STOP_BEGIN
 	//\_______________ On se desabonne de nos notifications.
-	CD_APPLET_UNREGISTER_FOR_CLICK_EVENT;
-	CD_APPLET_UNREGISTER_FOR_MIDDLE_CLICK_EVENT;
-	CD_APPLET_UNREGISTER_FOR_BUILD_MENU_EVENT;
+	cairo_dock_remove_notification_func_on_object (myContainer,
+		NOTIFICATION_CLICK_ICON,
+		(CairoDockNotificationFunc) CD_APPLET_ON_CLICK_FUNC,
+		myApplet);
+	cairo_dock_remove_notification_func_on_object (myContainer,
+		NOTIFICATION_MIDDLE_CLICK_ICON,
+		(CairoDockNotificationFunc) CD_APPLET_ON_MIDDLE_CLICK_FUNC,
+		myApplet);
+	cairo_dock_remove_notification_func_on_object (myContainer,
+		NOTIFICATION_BUILD_ICON_MENU,
+		(CairoDockNotificationFunc) CD_APPLET_ON_BUILD_MENU_FUNC,
+		myApplet);
+	cairo_dock_remove_notification_func_on_object (myDock,
+		NOTIFICATION_STOP_DOCK,
+		(CairoDockNotificationFunc) cd_on_dock_destroyed,
+		myApplet);
 	penguin_remove_notfications();
 	
 	if (myData.iSidRestartDelayed != 0)
@@ -94,7 +118,7 @@
 			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 * g_fReflectSize;
+			area.height = pAnimation->iFrameHeight + myDock->container.bUseReflect * myIconsParam.fReflectSize;
 			gdk_window_invalidate_rect (myContainer->pWidget->window, &area, FALSE);
 		}
 		
@@ -106,7 +130,7 @@
 		//\_______________ On libere le pingouin ou au contraire on le cloisonne.
 		if (myConfig.bFree)
 		{
-			cairo_dock_detach_icon_from_dock (myIcon, myDock, myIcons.iSeparateIcons);
+			cairo_dock_detach_icon_from_dock (myIcon, myDock, myIconsParam.iSeparateIcons);
 			cairo_dock_update_dock_size (myDock);
 		}
 		else

=== modified file 'Cairo-Penguin/src/applet-notifications.c'
--- Cairo-Penguin/src/applet-notifications.c	2010-09-07 00:39:20 +0000
+++ Cairo-Penguin/src/applet-notifications.c	2011-03-17 14:49:16 +0000
@@ -49,7 +49,7 @@
 	
 	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))
 	{
-		myData.iCurrentPositionY = (myConfig.bFree ? g_iDockLineWidth : 0);
+		myData.iCurrentPositionY = (myConfig.bFree ? myDocksParam.iDockLineWidth : 0);
 		PenguinAnimation *pAnimation = penguin_get_current_animation ();
 		int iNewAnimation;
 		int iRandom = g_random_int_range (0, 4);
@@ -81,13 +81,13 @@
 		g_source_remove (myData.iSidRestartDelayed);
 		myData.iSidRestartDelayed = 0;
 	}
-	cairo_dock_remove_notification_func_on_container (myContainer, CAIRO_DOCK_UPDATE_DOCK_SLOW, (CairoDockNotificationFunc) penguin_update_container, myApplet);
-	cairo_dock_remove_notification_func_on_icon (myIcon, CAIRO_DOCK_UPDATE_ICON_SLOW, (CairoDockNotificationFunc) penguin_update_icon, myApplet);
+	cairo_dock_remove_notification_func_on_object (myContainer, NOTIFICATION_UPDATE_DOCK_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.
 	int iNewAnimation = penguin_choose_resting_animation (myApplet);
 	penguin_set_new_animation (myApplet, iNewAnimation);
-	myData.iCurrentPositionY = (myConfig.bFree ? g_iDockLineWidth : 0);
+	myData.iCurrentPositionY = (myConfig.bFree ? myDocksParam.iDockLineWidth : 0);
 	if (myConfig.bFree)
 	{
 		penguin_move_in_dock (myApplet);
@@ -112,7 +112,7 @@
 		if (pClickedIcon != myIcon && ! (CAIRO_DOCK_IS_APPLET (pClickedIcon) && pClickedIcon->pModuleInstance->pModule == myIcon->pModuleInstance->pModule))
 		{
 			cd_debug ("%s\n", myApplet->cConfFilePath);
-			cairo_dock_notify (CAIRO_DOCK_BUILD_ICON_MENU, myIcon, myContainer, CD_APPLET_MY_MENU);
+			cairo_dock_notify_on_object (myContainer, NOTIFICATION_BUILD_ICON_MENU, myIcon, myContainer, CD_APPLET_MY_MENU);
 			CD_APPLET_LEAVE (CAIRO_DOCK_INTERCEPT_NOTIFICATION);
 		}
 		
@@ -184,3 +184,10 @@
 			}
 		}
 CD_APPLET_ON_MIDDLE_CLICK_END
+
+
+gboolean cd_on_dock_destroyed (CairoDockModuleInstance *myApplet, CairoDock *pDock)
+{
+	cairo_dock_deactivate_module_and_unload (myApplet->pModule->pVisitCard->cModuleName);
+	return CAIRO_DOCK_LET_PASS_NOTIFICATION;
+}

=== modified file 'Cairo-Penguin/src/applet-notifications.h'
--- Cairo-Penguin/src/applet-notifications.h	2009-08-26 21:07:39 +0000
+++ Cairo-Penguin/src/applet-notifications.h	2011-03-17 14:49:16 +0000
@@ -17,7 +17,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #ifndef __APPLET_NOTIFICATIONS__
 #define  __APPLET_NOTIFICATIONS__
 
@@ -25,12 +24,13 @@
 #include <cairo-dock.h>
 
 
-
 CD_APPLET_ON_CLICK_H
 
 CD_APPLET_ON_BUILD_MENU_H
 
 CD_APPLET_ON_MIDDLE_CLICK_H
 
+gboolean cd_on_dock_destroyed (CairoDockModuleInstance *myApplet, CairoDock *pDock);
+
 
 #endif

=== modified file 'Clipper/data/Clipper.conf.in'
--- Clipper/data/Clipper.conf.in	2010-09-07 00:39:20 +0000
+++ Clipper/data/Clipper.conf.in	2011-03-17 14:49:16 +0000
@@ -2,19 +2,26 @@
 
 #[gtk-about]
 [Icon]
-#j+[0;128] Desired icon size for this applet
-#{Set to 0 to use the default applet size}
-icon size = 0;0
+
+#F[Applet]
+frame_maininfo=
+
+#d Name of the dock it belongs to:
+dock name = 
 
 #s Name of the icon as it will appear in its caption in the dock:
-name = Clipper
+name = Clipboard
+
+#F[Display]
+frame_display=
 
 #S+ Image filename:
 #{Leave empty to use the default one.}
 icon = 
 
-#d Name of the dock it belongs to:
-dock name = 
+#j+[0;128] Desired icon size for this applet
+#{Set to 0 to use the default applet size}
+icon size = 0;0
 
 order=
 
@@ -136,7 +143,7 @@
 #F[Actions;gtk-execute]
 frame_act =
 
-#b Enable actions?
+#B[2] Enable actions?
 #{If some actions are associated with an item, they will be proposed when the item is created.}
 enable actions = false
 

=== modified file 'Clipper/src/applet-clipboard.c'
--- Clipper/src/applet-clipboard.c	2010-08-07 01:43:25 +0000
+++ Clipper/src/applet-clipboard.c	2011-03-17 14:49:16 +0000
@@ -23,7 +23,7 @@
 #include "applet-struct.h"
 #include "applet-clipboard.h"
 
-const gchar *cEnvName[4] = {NULL, "gnome", "kde", "xfce"};
+const gchar *cEnvName[4] = {"other", "gnome", "kde", "xfce"};  // "other" allows to handle all the other DE (put your own actions into the corresponding file).
 
 static int _cd_clipper_compare_item (CDClipperItem *pItem1, CDClipperItem *pItem2)
 {

=== modified file 'Clipper/src/applet-notifications.c'
--- Clipper/src/applet-notifications.c	2010-09-07 00:39:20 +0000
+++ Clipper/src/applet-notifications.c	2011-03-17 14:49:16 +0000
@@ -35,7 +35,8 @@
 	else
 	{
 		GtkWidget *pMenu = cd_clipper_build_items_menu ();
-		cairo_dock_popup_menu_on_icon (pMenu, myIcon, myContainer);
+		CD_APPLET_POPUP_MENU_ON_MY_ICON (pMenu);
+		gtk_menu_shell_select_first (GTK_MENU_SHELL (pMenu), FALSE);  // must be done here, after the menu has been realized.
 	}
 CD_APPLET_ON_CLICK_END
 
@@ -103,7 +104,7 @@
 	else
 	{
 		GtkWidget *pMenu = cd_clipper_build_persistent_items_menu ();
-		cairo_dock_popup_menu_on_icon (pMenu, myIcon, myContainer);
+		CD_APPLET_POPUP_MENU_ON_MY_ICON (pMenu);
 	}
 CD_APPLET_ON_MIDDLE_CLICK_END
 

=== modified file 'Dbus/CMakeLists.txt'
--- Dbus/CMakeLists.txt	2010-08-07 01:43:25 +0000
+++ Dbus/CMakeLists.txt	2011-03-17 14:49:16 +0000
@@ -1,15 +1,5 @@
 
 add_subdirectory(src)
 add_subdirectory(data)
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-##dnl Process this file with automake to produce Makefile.in
-#
-#SUBDIRS = . src data
+add_subdirectory(interfaces)
+

=== modified file 'Dbus/data/Dbus.conf.in' (properties changed: +x to -x)
--- Dbus/data/Dbus.conf.in	2010-08-07 01:43:25 +0000
+++ Dbus/data/Dbus.conf.in	2011-03-17 14:49:16 +0000
@@ -35,8 +35,3 @@
 
 #b Let extern applications animate icons?
 enable animate icon = true
-
-#b Let extern applications register new module?
-enable new module = true
-
-modules=
\ No newline at end of file

=== modified file 'Dbus/data/icon.svg' (properties changed: +x to -x)
=== modified file 'Dbus/demos/demo_bash/demo_bash'
--- Dbus/demos/demo_bash/demo_bash	2010-08-07 01:43:25 +0000
+++ Dbus/demos/demo_bash/demo_bash	2011-03-17 14:49:16 +0000
@@ -1,12 +1,8 @@
 #!/usr/bin/python
 
 # This is a part of the external demo applet for Cairo-Dock
-#
-# Copyright : (C) 2010 by Nochka85
-#                      modified by matttbe for the new API
-#                      (based on the demo.py by Fabounet)
-# E-mail : [e-mail]
-#
+# Copyright : (C) 2010-2011 by Nochka85, Fabounet and atttbe
+# 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
@@ -15,100 +11,21 @@
 #
 # 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
+# ERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 # http://www.gnu.org/licenses/licenses.html#GPL
 
-### We assume the name of this applet is "demo_bash"
-### This Python script (demo_bash) should be placed in a folder alongside with 3 files :
-### demo_bash.conf (the default config file), "icon" (the default icon of the applet) , "preview" (a preview of this applet) and demo_bash.sh (the script in bash, where you will place your code)
-
-### REV : 21/01/2010
-
-### import ###
-import sys
-import gobject
-import glib
-import gtk
-import dbus
-import os.path
-from dbus.mainloop.glib import DBusGMainLoop
-
-# get our applet on the bus
-app_folder = os.path.dirname(sys.argv[0])
-applet_name = os.path.basename(os.path.abspath("."))
-applet_path = "/org/cairodock/CairoDock/"+applet_name
-DBusGMainLoop(set_as_default=True)
-bus = dbus.SessionBus()
-try:
-	applet_object = bus.get_object("org.cairodock.CairoDock", applet_path)
-except dbus.DBusException:
-	print ">>> module '"+applet_name+"' can't be found on the bus, exit."
-	sys.exit(2)
-myIcon = dbus.Interface(applet_object, "org.cairodock.CairoDock.applet") 
-
-### we'll have a sub-dock, so we also get the sub-icons object ###
-#sub_icons_object = bus.get_object("org.cairodock.CairoDock", applet_path+"/sub_icons")
-#mySubIcons = dbus.Interface(sub_icons_object, "org.cairodock.CairoDock.subapplet") 
-
-### callbacks ###
-def action_on_click(iState):
-	return_from_bash = os.popen("cd " + app_folder + " && ./" + applet_name + ".sh " + " action_on_click").read().rstrip()
-	print return_from_bash
-	
-def action_on_middle_click():
-	return_from_bash = os.popen("cd " + app_folder + " && ./" + applet_name + ".sh " + " action_on_middle_click").read().rstrip()
-	print return_from_bash
-
-def action_on_scroll_icon(bUpOrDown):
-	if bUpOrDown:
-		return_from_bash = os.popen("cd " + app_folder + " && ./" + applet_name + ".sh " + " action_on_scroll_icon 0").read().rstrip()
-		print return_from_bash
-	else:
-		return_from_bash = os.popen("cd " + app_folder + " && ./" + applet_name + ".sh " + " action_on_scroll_icon 1").read().rstrip()
-		print return_from_bash
-
-def action_on_drop_data(sDataName):
-	return_from_bash = os.popen("cd " + app_folder + " && ./" + applet_name + ".sh " + " action_on_drop_data " + sDataName).read().rstrip()
-	print return_from_bash
-
-def action_on_init():
-	return_from_bash = os.popen("cd " + app_folder + " && ./" + applet_name + ".sh " + " action_on_init").read().rstrip()
-	print return_from_bash
-	
-def action_on_stop():
-	return_from_bash = os.popen("cd " + app_folder + " && ./" + applet_name + ".sh " + " action_on_stop").read().rstrip()
-	print return_from_bash
-	
-def action_on_reload(bConfigHasChanged):
-	if bConfigHasChanged:
-		return_from_bash = os.popen("cd " + app_folder + " && ./" + applet_name + ".sh " + " action_on_reload").read().rstrip()
-		print return_from_bash
-
-def action_on_build_menu():
-	return_from_bash = os.popen("cd " + app_folder + " && ./" + applet_name + ".sh " + " action_on_build_menu").read().rstrip()
-	print return_from_bash
-	
-def action_on_menu_select(iNumEntry):
-	return_from_bash = os.popen("cd " + app_folder + " && ./" + applet_name + ".sh " + " action_on_menu_select " + str(iNumEntry)).read().rstrip()
-	print return_from_bash
-
-### init ###
-def init():
-	# register to the notifications on our applet
-	myIcon.connect_to_signal("on_click", action_on_click)
-	myIcon.connect_to_signal("on_middle_click", action_on_middle_click)
-	myIcon.connect_to_signal("on_scroll", action_on_scroll_icon)
-	myIcon.connect_to_signal("on_drop_data", action_on_drop_data)
-	myIcon.connect_to_signal("on_init_module", action_on_init)
-	myIcon.connect_to_signal("on_stop_module", action_on_stop)
-	myIcon.connect_to_signal("on_reload_module", action_on_reload)
-	myIcon.connect_to_signal("on_build_menu", action_on_build_menu)
-	myIcon.connect_to_signal("on_menu_select", action_on_menu_select)
-
-### main ###
+# The name of this applet is "demo_bash"; it is placed in a folder named "demo_bash", with a file named "auto-load.conf" which describes it.
+# Copy this folder into ~/.config/cairo-dock/third-party to let the dock register it automatically.
+# In the folder we have :
+# - "demo_bash"         : this python script, without extension
+# - "demo_bash.sh"      : the script in bash, where you actually place your code
+# - "demo_bash.conf"    : the config file of the applet
+# - "auto-load.conf"    : the file describing the applet
+# - "icon"              : the default icon of the applet (optionnal)
+# - "preview"           : a preview of this applet (optionnal)
+
+from CDBashApplet import CDBashApplet
+
 if __name__ == '__main__':
-	init()
-	gtk.main()
-	stop()
-	sys.exit(0)
+	CDBashApplet().run()

=== modified file 'Dbus/demos/demo_bash/demo_bash.conf' (properties changed: +x to -x)
=== modified file 'Dbus/demos/demo_bash/demo_bash.sh'
--- Dbus/demos/demo_bash/demo_bash.sh	2010-08-07 01:43:25 +0000
+++ Dbus/demos/demo_bash/demo_bash.sh	2011-03-17 14:49:16 +0000
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-# This is a part of the external demo applet for Cairo-Dock
+# This is a part of the external demo applets for Cairo-Dock
 #
-# Copyright : (C) 2010 by Nochka85
+# Copyright : (C) 2010-2011 by Nochka85
 #                      modified by matttbe for the new API
-#                      (based on the demo.py by Fabounet)
+#                      modified by Fabounet for the new interface
 # E-mail : [e-mail]
 #
 #
@@ -15,168 +15,111 @@
 #
 # 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
+# ERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 # http://www.gnu.org/licenses/licenses.html#GPL
 
-### This is a part of the external applet demo_bash.py for cairo-dock
+### This is a part of the external applet demo_bash for cairo-dock
 ### Author : Nochka85
 ### Contact : [e-mail]
-### Rev : 21/01/2010
-
-DBUS_NAME="org.cairodock.CairoDock"
-DBUS_PATH="/org/cairodock/CairoDock"
-DBUS_INTERFACE="org.cairodock.CairoDock"
-COMMAND=$0
-SCRIPT_NAME=`basename $COMMAND`
-APP_NAME="`echo $SCRIPT_NAME | cut -f1 -d '.' `"
-ACTION=$1
-DROP_DATA=$2
-MENU_SELECT=$2
-SCROLL_UP=$2
-CONF_FILE="/home/$USER/.config/cairo-dock/current_theme/plug-ins/$APP_NAME/$APP_NAME.conf"
-
-#############################################################################################################
-get_conf_param() {
-LIGNE=`cat $CONF_FILE | grep "$1"`
-PARAM="`echo $LIGNE | cut -f2 -d '=' `"
-}
-
-#############################################################################################################
-get_ALL_conf_params() {
-
-get_conf_param "demo_text"
-demo_text="$PARAM"
-
-get_conf_param "demo_truefalse"
-demo_truefalse="$PARAM"
-
-get_conf_param "demo_value"
-demo_value="$PARAM"
-
-}
-
-#############################################################################################################
-action_on_click() {
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Left clic !"
-dbus-send --session --dest=$DBUS_NAME $DBUS_PATH/$APP_NAME $DBUS_INTERFACE.applet.ShowDialog string:"Left clic !" int32:2
-
-exit
-}
-
-#############################################################################################################
-action_on_middle_click() {
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Middle clic !"
-dbus-send --session --dest=$DBUS_NAME $DBUS_PATH/$APP_NAME $DBUS_INTERFACE.applet.ShowDialog string:"Middle clic !" int32:2
-
-exit
-}
-
-#############################################################################################################
-action_on_scroll_icon() {
-if [ $SCROLL_UP -eq "0" ]; then
-	echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Scroll UP !"
-	dbus-send --session --dest=$DBUS_NAME $DBUS_PATH/$APP_NAME $DBUS_INTERFACE.applet.ShowDialog string:"Scroll UP!" int32:1
-else
-	echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Scroll DOWN !"
-	dbus-send --session --dest=$DBUS_NAME $DBUS_PATH/$APP_NAME $DBUS_INTERFACE.applet.ShowDialog string:"Scroll DOWN!" int32:1
-fi
-
-exit
-}
-
-#############################################################################################################
-action_on_drop_data() {
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> $DROP_DATA has been dropped on applet !"
-
-
-if [ "`echo $DROP_DATA |grep 'file://'`" != "" ]; then 	# It's a file !
-	DROP_DATA="`echo $DROP_DATA | cut -c 8-`"  # we remove 'file://' before the location
-	dbus-send --session --dest=$DBUS_NAME $DBUS_PATH/$APP_NAME $DBUS_INTERFACE.applet.ShowDialog string:"FILE : $DROP_DATA has been dropped on applet !" int32:4
-else	# It's an URL !
-	dbus-send --session --dest=$DBUS_NAME $DBUS_PATH/$APP_NAME $DBUS_INTERFACE.applet.ShowDialog string:"URL : $DROP_DATA has been dropped on applet !" int32:4	# we keep the 'http://' in the name
-fi
-
-exit
-}
-
-#############################################################################################################
-action_on_init() {
-get_ALL_conf_params
-
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> The demo_text in config is : $demo_text"
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> The demo_truefalse in config is : $demo_truefalse"
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> The demo_value in config is : $demo_value"
-
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Our module is started"
-dbus-send --session --dest=$DBUS_NAME $DBUS_PATH/$APP_NAME $DBUS_INTERFACE.applet.ShowDialog string:"I'm connected to Cairo-Dock !" int32:4
-dbus-send --session --dest=$DBUS_NAME $DBUS_PATH/$APP_NAME $DBUS_INTERFACE.applet.SetQuickInfo string:"123"
-
-exit
-}
-
-#############################################################################################################
-action_on_stop() {
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Our module is stopped"
-
-exit
-}
-
-#############################################################################################################
-action_on_reload() {
-get_ALL_conf_params
-
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> The demo_text in config is : $demo_text"
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> The demo_truefalse in config is : $demo_truefalse"
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> The demo_value in config is : $demo_value"
-
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Our module is reloaded"
-dbus-send --session --dest=$DBUS_NAME $DBUS_PATH/$APP_NAME $DBUS_INTERFACE.applet.ShowDialog string:"Our module is reloaded" int32:2
-
-exit
-}
-
-#############################################################################################################
-action_on_build_menu() {
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Build menu !"
-dbus-send --session --dest=$DBUS_NAME $DBUS_PATH/$APP_NAME $DBUS_INTERFACE.applet.PopulateMenu array:string:"choice 0","choice 1"
-
-exit
-}
-
-#############################################################################################################
-action_on_menu_select() {
-echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Choice $MENU_SELECT has been selected !"
-dbus-send --session --dest=$DBUS_NAME $DBUS_PATH/$APP_NAME $DBUS_INTERFACE.applet.ShowDialog string:"Choice $MENU_SELECT has been selected !" int32:4
-
-exit
-}
-
-#############################################################################################################
-# START ### DO NOT CHANGE THIS SECTION
-#############################################################################################################
-
-if [ "`echo $ACTION |grep 'register_the_applet'`" != "" ]; then
-	register_the_applet
-elif [ "`echo $ACTION |grep 'action_on_click'`" != "" ]; then
-	action_on_click
-elif [ "`echo $ACTION |grep 'action_on_middle_click'`" != "" ]; then
-	action_on_middle_click
-elif [ "`echo $ACTION |grep 'action_on_scroll_icon'`" != "" ]; then
-	action_on_scroll_icon
-elif [ "`echo $ACTION |grep 'action_on_drop_data'`" != "" ]; then
-	action_on_drop_data
-elif [ "`echo $ACTION |grep 'action_on_init'`" != "" ]; then
-	action_on_init
-elif [ "`echo $ACTION |grep 'action_on_stop'`" != "" ]; then
-	action_on_stop
-elif [ "`echo $ACTION |grep 'action_on_reload'`" != "" ]; then
-	action_on_reload
-elif [ "`echo $ACTION |grep 'action_on_build_menu'`" != "" ]; then
-	action_on_build_menu
-elif [ "`echo $ACTION |grep 'action_on_menu_select'`" != "" ]; then
-	action_on_menu_select
-fi
-
-exit
-
+### Rev : 09/02/2011
+
+. /usr/share/cairo-dock/plug-ins/Dbus/CDBashApplet.sh $*
+
+#############################################################################################################
+
+get_config()
+{
+	demo_text=`get_conf_param "demo_text"`
+	
+	demo_truefalse=`get_conf_param "demo_truefalse"`
+	
+	demo_value=`get_conf_param "demo_value"`
+}
+
+#############################################################################################################
+
+on_click()
+{
+	call ShowDialog "string:\"Left clic\"" "int32:2"
+}
+
+on_middle_click()
+{
+	call ShowDialog "string:\"Middle clic\"" "int32:2"
+}
+
+
+on_scroll_icon()
+{
+	i=0
+	if [ -f store ]; then
+		i=`cat store`
+	fi
+	if [ $1 -eq 1 ]; then
+		let "i += 1"
+	else
+		let "i -= 1"
+	fi
+	call SetQuickInfo "string:$i"
+	echo "$i" > store
+}
+
+on_drop_data()
+{
+	if [ "`echo $1 |grep file://`" ]; then # It's a file !
+		file="`echo $1 | cut -c 8-`" # we remove 'file://' before the location
+		call ShowDialog "string:\"FILE : $file has been dropped on the applet\"" "int32:5"
+	else	# It's an URL !
+		call ShowDialog "string:\"URL : $1 has been dropped on the applet\"" "int32:5"  # we keep the 'http://' in the name
+	fi
+}
+
+on_build_menu()
+{
+	call PopulateMenu "array:string:\"choice 0\",\"choice 1\""
+}
+
+on_menu_select()
+{
+	call ShowDialog "string:\"Choice $1 has been selected\"" "int32:4"
+}
+
+#############################################################################################################
+
+begin()
+{
+	get_config
+	
+	echo "from file $CONF_FILE:"
+	echo "Param 'demo_text' in config is : $demo_text"
+	echo "Param 'demo_truefalse' in config is : $demo_truefalse"
+	echo "Param 'demo_value' in config is : $demo_value"
+	
+	call ShowDialog "string:\"I'm connected to Cairo-Dock \!\"" "int32:4"
+	call SetQuickInfo "string:0"
+	
+	echo "0" > store
+}
+
+end()
+{
+	rm -f store
+}
+
+reload()
+{
+	get_config
+	
+	echo "Param 'demo_text' in config is now : $demo_text"
+	echo "Param 'demo_truefalse' in config is now : $demo_truefalse"
+	echo "Param 'demo_value' in config is now : $demo_value"
+	
+	call ShowDialog "string:\"Our module is reloaded\"" "int32:2"
+}
+
+#############################################################################################################
+
+run $*
+
+exit 0

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

=== modified file 'Dbus/demos/demo_mono/demo_mono.cs' (properties changed: +x to -x)
--- Dbus/demos/demo_mono/demo_mono.cs	2010-08-07 01:43:25 +0000
+++ Dbus/demos/demo_mono/demo_mono.cs	2011-03-17 14:49:16 +0000
@@ -2,7 +2,7 @@
 //
 //This is a part of the external demo applet for Cairo-Dock
 //
-//Copyright : (C) 2010 by Fabounet
+//Copyright : (C) 2010-2011 by Fabounet
 //E-mail : [e-mail]
 //
 //
@@ -30,125 +30,103 @@
 //If you drop some text on the icon, it will be used as the icon's label.
 
 // Compile it with the following command, then rename 'demo_mono.exe' to 'demo_mono'.
-//gmcs demo_mono.cs -r:/usr/lib/mono/gtk-sharp-2.0/glib-sharp.dll -r:/usr/lib/cli/ndesk-dbus-glib-1.0/NDesk.DBus.GLib.dll -r:/usr/lib/cli/ndesk-dbus-1.0/NDesk.DBus.dll
+// gmcs demo_mono.cs -r:/usr/lib/cli/CDApplet.dll
+// ln -s demo_mono.exe demo_mono
 
   //////////////////////////
  ////// dependancies //////
 //////////////////////////
 using System;
-using GLib;
-using NDesk.DBus;
-
-  ////////////////////////////
- ////// DBus Interface //////
-////////////////////////////
-public delegate void OnClickEvent (int i);
-public delegate void OnMiddleClickEvent ();
-public delegate void OnScrollEvent (bool b);
-public delegate void OnBuildMenuEvent ();
-public delegate void OnMenuSelectEvent (int i);
-public delegate void OnDropDataEvent (string s);
-public delegate void OnChangeFocusEvent (bool b);
-public delegate void OnAnswerEvent (System.Object v);
-public delegate void OnStopModuleEvent ();
-public delegate void OnReloadModuleEvent (bool b);
-[NDesk.DBus.Interface ("org.cairodock.CairoDock.applet")]
-public interface IIcon
-{
-	System.Object Get (string s);
-	void GetAll ();
-	void SetLabel (string s);
-	void SetIcon (string s);
-	void SetEmblem (string s, int i);
-	void Animate (string s, int i);
-	void SetQuickInfo (string s);
-	void ShowDialog (string s, int i);
-	void AskQuestion (string s);
-	void AskValue (string s, double x, double y);
-	void AskText (string s, string t);
-	void AddDataRenderer (string s, int i, string t);
-	void RenderValues (double[] x);
-	void ControlAppli (string s);
-	void PopulateMenu (string[] s);
-	event OnClickEvent on_click; 
-	event OnMiddleClickEvent on_middle_click; 
-	event OnScrollEvent on_scroll; 
-	event OnBuildMenuEvent on_build_menu; 
-	event OnMenuSelectEvent on_menu_select; 
-	event OnDropDataEvent on_drop_data; 
-	event OnChangeFocusEvent on_change_focus; 
-	event OnAnswerEvent on_answer; 
-	event OnStopModuleEvent on_stop_module; 
-	event OnReloadModuleEvent on_reload_module; 
-}
+using System.Collections.Generic;
+using CairoDock.Applet;
 
 public struct Config {
+	public string cTheme;
+	public int iMaxValue;
 	public bool yesno;
-	public int iMaxValue;
-	public string cTheme;
 }
 
-public class Applet
+////////////////////
+/// Applet class ///
+////////////////////
+public class Applet : CDApplet
 {
-	public static string applet_name = "demo_mono";  // the name of the applet must the same as the folder.
-	public static string applet_path = "/org/cairodock/CairoDock/"+applet_name;  // path where our object is stored on the bus.
-	public static string conf_file = Environment.GetEnvironmentVariable("HOME")+"/.config/cairo-dock/current_theme/plug-ins/"+applet_name+"/"+applet_name+".conf";  // path to the conf file of our applet.
-	public IIcon myIcon = null;
-	public Config myConfig;
-	private GLib.MainLoop loop = null;
+	private Config config;
 	private int count = 0;
 	
-	public void begin()
-	{
-		connect_to_dock ();
-		get_config ();
-		myIcon.ShowDialog ("I'm connected to Cairo-Dock !", 4);
-		myIcon.AddDataRenderer("gauge", 1, myConfig.cTheme);
+	public Applet()
+	{
+		
+	}
+	
+	  ////////////////////////////
+	 ////// private methods //////
+	////////////////////////////
+	
+	private void set_counter(int n)
+	{
+		this.count = n;
+		this.icon.RenderValues(new double[] {(double)n/this.config.iMaxValue});
+		this.icon.SetQuickInfo(String.Format(n.ToString()));
+	}
+	
+	  ///////////////////////////////
+	 ////// applet definition //////
+	///////////////////////////////
+	
+	public override void get_config (string cConfFilePath)
+	{
+		/// read cConfFilePath...
+		this.config.iMaxValue = 100;
+		this.config.cTheme = "Turbo-night";
+		this.config.yesno = true;
+	}
+	
+	public override void end()
+	{
+		Console.WriteLine("*** Bye !");
+	}
+	
+	public override void begin()
+	{
+		this.icon.ShowDialog ("I'm connected to Cairo-Dock !", 4);
+		this.icon.AddDataRenderer("gauge", 1, this.config.cTheme);
 		this.set_counter (0);
-		loop = new GLib.MainLoop();
-		loop.Run();
-	}
-	public void end()
-	{
-		loop.Quit();
-	}
-	public void connect_to_dock()
-	{
-		BusG.Init ();
-		Bus bus = Bus.Session;
-		myIcon = bus.GetObject<IIcon> ("org.cairodock.CairoDock", new ObjectPath (applet_path));
-		myIcon.on_click 			+= new OnClickEvent (action_on_click);
-		myIcon.on_middle_click 	+= new OnMiddleClickEvent (action_on_middle_click);
-		myIcon.on_scroll 		+= new OnScrollEvent (action_on_scroll);
-		myIcon.on_build_menu 	+= new OnBuildMenuEvent (action_on_build_menu);
-		myIcon.on_menu_select 	+= new OnMenuSelectEvent (action_on_menu_select);
-		myIcon.on_drop_data 		+= new OnDropDataEvent (action_on_drop_data);
-		myIcon.on_answer 		+= new OnAnswerEvent (action_on_answer);
-		myIcon.on_stop_module 	+= new OnStopModuleEvent (action_on_stop_module);
-		myIcon.on_reload_module 	+= new OnReloadModuleEvent (action_on_reload_module);
-	}
-	public void get_config ()
-	{
-		/// read this.conf_file ...
-		myConfig.iMaxValue = 100;
-		myConfig.cTheme = "Turbo-night";
-		myConfig.yesno = true;
-	}
+	}
+	
+	public override void reload()
+	{
+		this.icon.AddDataRenderer("gauge", 1, this.config.cTheme);
+		this.set_counter (Math.Min (this.count, this.config.iMaxValue));
+	}
+	
 	  ////////////////////////////////////////
 	 ////// callbacks on the main icon //////
 	////////////////////////////////////////
-	private void action_on_click (int iClickState)
-	{
-		Console.WriteLine(">>> click");
-	}
-	private void action_on_middle_click ()
-	{
-		Console.WriteLine(">>> middle click");
-		myIcon.AskValue("Set the value you want", this.count, 100);
-	}
-	private void action_on_scroll (bool bScrollUp)
-	{
-		Console.WriteLine(">>> scroll up " + bScrollUp);
+	
+	public override void on_click (int iClickState)
+	{
+		Console.WriteLine("*** click");
+	}
+	
+	public override void on_middle_click ()
+	{
+		Console.WriteLine("*** middle click");
+		Dictionary<string, object> dialog_attributes = new Dictionary<string, object> () {
+			{"icon" , "stock_properties"},
+			{"message" , "Set the value you want"},
+			{"buttons" , "ok;cancel"} };
+		Dictionary<string, object> widget_attributes = new Dictionary<string, object> () {
+			{"widget-type" , "scale"},
+			{"max-value" , this.config.iMaxValue},
+			{"message" , "Set the value you want"} };
+		
+		this.icon.PopupDialog(dialog_attributes, widget_attributes);
+	}
+	
+	public override void on_scroll (bool bScrollUp)
+	{
+		Console.WriteLine("*** scroll up " + bScrollUp);
 		int n;
 		if (bScrollUp)
 			n = Math.Min(100, this.count+1);
@@ -156,70 +134,68 @@
 			n = Math.Max(0, this.count-1);
 		this.set_counter(n);
 	}
-	private void action_on_build_menu ()
+	
+	public override void on_build_menu ()
 	{
-		Console.WriteLine(">>> build menu");
-		myIcon.PopulateMenu(new string [] {"set min value", "set medium value", "set max value"});
+		Console.WriteLine("*** build menu");
+		/// Warning : teh AddMenuItems fails with NDesk-DBus 0.6.0; until this is fixed, use the PopulateMenu method.
+		/**Dictionary<string, object>[] pItems = new Dictionary<string, object>[] {
+			new Dictionary<string, object>()
+			{
+				{"label", "set min value"},
+				{"icon", "gtk-zoom-out"},
+				{"id", 0}
+			},
+			new Dictionary<string, object>()
+			{
+				{"label", "set medium value"},
+				{"icon", "gtk-zoom-fit"},
+				{"id", 1}
+			},
+			new Dictionary<string, object>()
+			{
+				{"label", "set max value"},
+				{"icon", "gtk-zoom-in"},
+				{"id", 2}
+			}
+		};
+		Console.WriteLine("*** item 1:"+pItems[0]["icon"]);
+		this.icon.AddMenuItems(pItems);*/
+		this.icon.PopulateMenu(new string[] {"set min value", "set medium value", "set max value"});
 	}
-	private void action_on_menu_select (int iNumEntry)
+	
+	public override void on_menu_select (int iNumEntry)
 	{
-		Console.WriteLine(">>> select entry : "+iNumEntry);
+		Console.WriteLine("*** select entry : "+iNumEntry);
 		if (iNumEntry == 0)
 			this.set_counter(0);
 		else if (iNumEntry == 1)
-			this.set_counter(100/2);
+			this.set_counter(this.config.iMaxValue/2);
 		else if (iNumEntry == 2)
-			this.set_counter(100);
-	}
-	private void action_on_drop_data (string cReceivedData)
-	{
-		Console.WriteLine(">>> drop : "+cReceivedData);
-		myIcon.SetLabel(cReceivedData);
-	}
-	private void action_on_answer (System.Object answer)
-	{
-		Console.WriteLine(">>> answer : "+(double)answer);
-		double x = (double)answer;
-		this.set_counter((int) x);
-	}
-	  /////////////////////////////////////
-	 ////// callbacks on the applet //////
-	/////////////////////////////////////
-	private void action_on_stop_module ()
-	{
-		Console.WriteLine(">>> stop");
-		this.end();
-	}
-	private void action_on_reload_module (bool bConfigHasChanged)
-	{
-		Console.WriteLine(">>> our module is reloaded");
-		if (bConfigHasChanged)
+			this.set_counter(this.config.iMaxValue);
+	}
+	public override void on_drop_data (string cReceivedData)
+	{
+		Console.WriteLine("*** drop : "+cReceivedData);
+		this.icon.SetLabel(cReceivedData);
+	}
+	public override void on_answer_dialog (int iButton, System.Object answer)
+	{
+		Console.WriteLine("*** answer : "+(double)answer);
+		if (iButton == 0)
 		{
-			Console.WriteLine (">>>  and our config has changed");
-			this.get_config();
-			myIcon.AddDataRenderer("gauge", 1, this.myConfig.cTheme);
-			this.set_counter (Math.Min (this.count, this.myConfig.iMaxValue));
+			double x = (double)answer;
+			this.set_counter((int) x);
 		}
 	}
 	
-	  ////////////////////////////
-	 ////// applet methods //////
-	////////////////////////////
-	public void set_counter(int n)
-	{
-		this.count = n;
-		myIcon.RenderValues(new double[] {(double)n/myConfig.iMaxValue});
-		myIcon.SetQuickInfo(String.Format(n.ToString()));
-	}
-	
 	  //////////////////
 	 ////// main //////
 	//////////////////
-	public static void Main ()
+	public static void Main (string[] args)
 	{
-		Applet myApplet = new Applet ();
-		myApplet.begin();
-		Console.WriteLine(">>> bye");
+		Applet myApplet = new Applet();
+		myApplet.run();
 	}
 }
 

=== removed file 'Dbus/demos/demo_mono/demo_mono.exe'
Binary files Dbus/demos/demo_mono/demo_mono.exe	2010-08-07 01:43:25 +0000 and Dbus/demos/demo_mono/demo_mono.exe	1970-01-01 00:00:00 +0000 differ
=== modified file 'Dbus/demos/demo_mono/icon' (properties changed: +x to -x)
=== modified file 'Dbus/demos/demo_mono/preview' (properties changed: +x to -x)
=== modified file 'Dbus/demos/demo_python/auto-load.conf'
--- Dbus/demos/demo_python/auto-load.conf	2010-08-07 01:43:25 +0000
+++ Dbus/demos/demo_python/auto-load.conf	2011-03-17 14:49:16 +0000
@@ -11,3 +11,9 @@
 
 # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
 version = 0.0.2
+
+# Default icon to use if no icon has been defined by the user. If not specified, or if the file is not found, the "icon" file will be used.
+icon = 
+
+# Whether the applet can be instanciated several times or not.
+multi-instance = true
\ No newline at end of file

=== modified file 'Dbus/demos/demo_python/demo_python' (properties changed: +x to -x)
--- Dbus/demos/demo_python/demo_python	2010-08-07 01:43:25 +0000
+++ Dbus/demos/demo_python/demo_python	2011-03-17 14:49:16 +0000
@@ -1,11 +1,9 @@
 #!/usr/bin/python
 
 # This is a part of the external demo applet for Cairo-Dock
-#
-# Copyright : (C) 2010 by Fabounet
+# 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
@@ -17,166 +15,143 @@
 # GNU General Public License for more details.
 # http://www.gnu.org/licenses/licenses.html#GPL
 
-### The name of this applet is "demo_python"; it is placed in a folder named "demo_python", with a file named "auto-load.conf" which describes it.
-### Copy this folder into ~/.config/cairo-dock/third-party to let the dock register it automatically.
-### In the folder we have :
-### "demo_python" (the executable script), "demo_python.conf" (the default config file), "auto-load.conf" (the file describing our applet), "icon" (the default icon of the applet) and "preview" (a preview of this applet)
+# The name of this applet is "demo_python"; it is placed in a folder named "demo_python", with a file named "auto-load.conf" which describes it.
+# Copy this folder into ~/.config/cairo-dock/third-party to let the dock register it automatically.
+# In the folder we have :
+# - "demo_python"       : the executable script, without extension
+# - "demo_python.conf"  : the default config file
+# - "auto-load.conf"    : the file describing our applet
+# - "icon"              : the default icon of the applet (optionnal)
+# - "preview"           : a preview of this applet (optionnal)
 
 ### This very simple applet features a counter from 0 to iMaxValue It displays the counter on the icon with a gauge and a quick info.
 ### Scroll on the icon increase or decrease the counter.
 ### The menu offers the possibility to set some default value.
-### Left click on the icon will set a random value.
-### Middle click on the icon will raise a dialog asking you to set the value you want.
+### Left-click on the icon will set a random value.
+### Middle-click on the icon will raise a dialog asking you to set the value you want.
 ### If you drop some text on the icon, it will be used as the icon's label.
 
 ####################
 ### dependancies ###
 ####################
-import sys
-import os.path
-import ConfigParser
 import random
-import gobject
-import glib
-import dbus
-from dbus.mainloop.glib import DBusGMainLoop
-
-applet_name = os.path.basename(os.path.abspath("."))  # the name of the applet must the same as the folder.
-DBusGMainLoop(set_as_default=True)
-
-##################################
-### callbacks on the main icon ###
-##################################
-def action_on_click(iState):
-	print ">>> clic !"
-	set_counter(random.randint(0,myApplet.config['iMaxValue']))
-
-def action_on_middle_click():
-	print ">>> middle clic !"
-	myApplet.icon.AskValue("Set the value you want", myApplet.count, myApplet.config['iMaxValue']);
-
-def action_on_build_menu():
-	print ">>> build menu !"
-	myApplet.icon.PopulateMenu(["set min value", "set medium value", "set max value"])
-	
-def action_on_menu_select(iNumEntry):
-	print ">>> choice",iNumEntry,"has been selected !"
-	if iNumEntry == 0:
-		myApplet.set_counter(0)
-	elif iNumEntry == 1:
-		myApplet.set_counter(myApplet.config['iMaxValue']/2)
-	elif iNumEntry == 2:
-		myApplet.set_counter(myApplet.config['iMaxValue'])
-
-def action_on_scroll(bScrollUp):
-	print ">>> scroll !"
-	if bScrollUp:
-		count = min(myApplet.config['iMaxValue'], myApplet.count+1)
-	else:
-		count = max(0, myApplet.count-1)
-	myApplet.set_counter(count)
-
-def action_on_drop_data(cReceivedData):
-	print ">>> received",cReceivedData
-	myApplet.icon.SetLabel(cReceivedData)
-
-def action_on_answer(answer):
-	print ">>> answer :",answer
-	myApplet.set_counter(int (answer))
-
-##################################
-### callbacks on the sub-icons ###
-##################################
-def on_click_sub_icon(iState, cIconID):
-	print "clic on the sub-icon '"+cIconID+"' !"
-
-###############################
-### callbacks on the applet ###
-###############################
-def action_on_stop():
-	print ">>> our module is stopped"
-	myApplet.end()
-	loop.quit()
-
-def action_on_reload(bConfigHasChanged):
-	print ">>> our module is reloaded"
-	if bConfigHasChanged:
-		print ">>>  and our config has changed"
-		myApplet.get_config()
-		myApplet.icon.AddDataRenderer("gauge", 1, myApplet.config['cTheme'])
-		myApplet.icon.RenderValues([float(myApplet.count)/myApplet.config['iMaxValue']])
-		myApplet.sub_icons.RemoveSubIcon("any")
-		myApplet.sub_icons.AddSubIcons(["icon 1", "firefox-3.0", "id1", "icon 2", "natilus", "id2", "icon 3", "thunderbird", "id3"])
+from CDApplet import CDApplet
 
 ####################
 ### Applet class ###
 ####################
-class Applet:
+class Applet(CDApplet):
 	def __init__(self):
-		self.icon = None
-		self.sub_icons = None
-		self.config = {}
-		self.conf_file = os.path.expanduser("~/.config/cairo-dock/current_theme/plug-ins/"+applet_name+"/"+applet_name+".conf")  # path to the conf file of our applet.
+		# define internal variables
 		self.count = 0
-	
-	def get_config(self):
-		keyfile = ConfigParser.RawConfigParser()
-		keyfile.read(self.conf_file)
+		# call high-level init
+		CDApplet.__init__(self)
+	
+	##### private methods #####
+	
+	def set_counter(self,count):
+		self.count = count
+		percent = float(self.count)/self.config['iMaxValue']
+		self.icon.RenderValues([percent])
+		self.icon.SetQuickInfo(format(self.count, "d"))
+	
+	##### applet definition #####
+	
+	def get_config(self,keyfile):
+		print "*** get config"
 		self.config['cTheme'] 		= keyfile.get('Configuration', 'theme')
 		self.config['iMaxValue'] 	= keyfile.getint('Configuration', 'max value')
 		self.config['yesno'] 		= keyfile.getboolean('Configuration', 'yesno')
 	
+	def end(self):
+		print "*** end of demo_python"
+	
 	def begin(self):
-		self.connect_to_dock()
+		print "*** begin"
 		self.icon.ShowDialog("I'm connected to Cairo-Dock !", 4)  # show a dialog with this message for 4 seconds.
-		self.icon.SetQuickInfo(format(self.count, "d"))  # write the counter value on the icon.
 		self.icon.AddDataRenderer("gauge", 1, self.config['cTheme'])  # set a gauge with the theme read in config to display the value of the counter.
-		self.icon.RenderValues([float(self.count)/self.config['iMaxValue']])  # draw the gauge with an initial value.
+		self.set_counter(0)  # set the initial value of our counter.
 		self.sub_icons.AddSubIcons(["icon 1", "firefox-3.0", "id1", "icon 2", "trash", "id2", "icon 3", "thunderbird", "id3", "icon 4", "nautilus", "id4"])  # add 4 icons in our sub-dock. The tab contains triplets of {label, image, ID}.
 		self.sub_icons.RemoveSubIcon("id2")  # remove the 2nd icon of our sub-dock.
 		self.sub_icons.SetQuickInfo("1", "id1")  # write the ID on each icon of the sub-dock.
 		self.sub_icons.SetQuickInfo("3", "id3")
 		self.sub_icons.SetQuickInfo("4", "id4")
-	
-	def end(self):
-		pass
-	
-	def connect_to_dock(self):
-		# get our applet on the bus.
-		applet_path = "/org/cairodock/CairoDock/"+applet_name  # path where our object is stored on the bus.
-		bus = dbus.SessionBus()
-		applet_object = bus.get_object("org.cairodock.CairoDock", applet_path)
-		self.icon = dbus.Interface(applet_object, "org.cairodock.CairoDock.applet")  # this object represents our applet and also our icon inside the dock or a desklet.
-		# we'll have a sub-dock, so we also get the sub-icons object
-		sub_icons_object = bus.get_object("org.cairodock.CairoDock", applet_path+"/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", action_on_click)  # when the user left-clicks on our icon.
-		self.icon.connect_to_signal("on_middle_click", action_on_middle_click)  # when the user middle-clicks on our icon.
-		self.icon.connect_to_signal("on_build_menu", action_on_build_menu)  # when the user right-clicks on our applet (which builds the menu)
-		self.icon.connect_to_signal("on_menu_select", action_on_menu_select)  # when the user selects an entry of this menu.
-		self.icon.connect_to_signal("on_scroll", action_on_scroll)  # when the user scroll up or down on our icon.
-		self.icon.connect_to_signal("on_drop_data", action_on_drop_data)  # when the user drops something on our icon.
-		#myApplet.icon.connect_to_signal("on_init_module", action_on_init)
-		self.icon.connect_to_signal("on_answer", action_on_answer)  # when the user answer a question.
-		self.icon.connect_to_signal("on_stop_module", action_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", action_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", on_click_sub_icon)  # when the user left-clicks on a sub-icon.
-	
-	def set_counter(self,count):
-		self.count = count
-		percent = float(self.count)/self.config['iMaxValue']
-		self.icon.RenderValues([percent])
-		self.icon.SetQuickInfo(format(self.count, "d"))
-
+		self.icon.BindShortkey(["<Control>F9"])  # bind to ctrl+F9
+	
+	def reload(self):
+		print "*** reload"
+		self.icon.AddDataRenderer("gauge", 1, self.config['cTheme'])
+		self.icon.RenderValues([float(self.count)/self.config['iMaxValue']])
+		self.sub_icons.RemoveSubIcon("any")
+		self.sub_icons.AddSubIcons(["icon 1", "firefox-3.0", "id1", "icon 2", "natilus", "id2", "icon 3", "thunderbird", "id3"])
+	
+	##### callbacks #####
+	
+	def on_click(self,iState):
+		print "*** click"
+		self.set_counter(random.randint(0,self.config['iMaxValue']))
+	
+	def on_middle_click(self):
+		print "*** middle click"
+		dialog_attributes = {
+			"icon" : "stock_properties",
+			"message" : "Set the value you want",
+			"buttons" : "ok;cancel"}
+		widget_attributes = {
+			"widget-type" : "scale",
+			"max-value" : self.config['iMaxValue'],
+			"message" : "Set the value you want"}
+		
+		self.icon.PopupDialog(dialog_attributes, widget_attributes)
+	
+	def on_build_menu(self):
+		print "*** build menu"
+		items = [ {
+				"label": "set min value",
+				"icon" : "gtk-zoom-out",
+				"id"   : 1
+			}, {
+				"label": "set medium value",
+				"icon" : "gtk-zoom-fit",
+				"id"   : 2 
+			}, {
+				"label": "set max value",
+				"icon" : "gtk-zoom-in",
+				"id"   : 3
+			} ]
+		self.icon.AddMenuItems(items)
+		
+	def on_menu_select(self,iNumEntry):
+		print "*** choice",iNumEntry,"has been selected !"
+		if iNumEntry == 1:
+			self.set_counter(0)
+		elif iNumEntry == 2:
+			self.set_counter(self.config['iMaxValue']/2)
+		elif iNumEntry == 3:
+			self.set_counter(self.config['iMaxValue'])
+	
+	def on_scroll(self,bScrollUp):
+		print "*** scroll !"
+		if bScrollUp:
+			count = min(self.config['iMaxValue'], self.count+1)
+		else:
+			count = max(0, self.count-1)
+		self.set_counter(count)
+	
+	def on_drop_data(self,cReceivedData):
+		print "*** received",cReceivedData
+		self.icon.SetLabel(cReceivedData)
+	
+	def on_answer_dialog(self,button, answer):
+		print "*** answer dialog :",button, answer
+		self.set_counter(int (answer))
+	
+	def on_shortkey(self,key):
+		print "*** shortkey :",key
+	
+	
 ############
 ### main ###
 ############
 if __name__ == '__main__':
-	myApplet = Applet()
-	myApplet.get_config()
-	myApplet.begin()
-	loop = gobject.MainLoop()
-	loop.run()
-	print ">>> bye"
-	sys.exit(0)
+	Applet().run()

=== modified file 'Dbus/demos/demo_python/demo_python.conf' (properties changed: +x to -x)
=== modified file 'Dbus/demos/demo_python/icon' (properties changed: +x to -x)
=== modified file 'Dbus/demos/demo_python/preview' (properties changed: +x to -x)
=== added directory 'Dbus/demos/demo_ruby'
=== added file 'Dbus/demos/demo_ruby/README'
--- Dbus/demos/demo_ruby/README	1970-01-01 00:00:00 +0000
+++ Dbus/demos/demo_ruby/README	2011-03-17 14:49:16 +0000
@@ -0,0 +1,19 @@
+In order to use this applet, it is necessary to install Ruby, Rubygems and the gems dbus and parseconfig.
+
+# Installation process (Debian/Ubuntu)
+
+[+] Ruby 1.8: sudo apt-get install ruby1.8-dev ruby1.8 ri1.8 rdoc1.8 irb1.8 libreadline-ruby1.8 libruby1.8
+[+] Rubygems: (sudo) apt-get install rubygems
+[+] Gem parseconfig: (sudo) gem install parseconfig
+[+] Gem Dbus: (sudo) gem install ruby-dbus
+
+# Tips
+
+When running Cairo-Dock through terminal, for example, cairo-dock -c, check if any message regarding execution permission is being shown. If so, set execution permission to the applet, chmod a+x 755 demo_ruby
+
+# Contact me
+
+Any doubt, suggestion or anything else, except asking for some money, I would be pleased to received a message from you.
+
+Author: Eduardo Mucelli Rezende Oliveira
+E-mail: [e-mail] or [e-mail]

=== added file 'Dbus/demos/demo_ruby/auto-load.conf'
--- Dbus/demos/demo_ruby/auto-load.conf	1970-01-01 00:00:00 +0000
+++ Dbus/demos/demo_ruby/auto-load.conf	2011-03-17 14:49:16 +0000
@@ -0,0 +1,19 @@
+[Register]
+
+# Author of the applet
+author = Eduardo Mucelli
+
+# A short description of the applet and how to use it.
+description = This is a distant applet\nIt simulates a counter:\n Scroll up/down to increase/decrease the counter,\n Click/middle-click to increase/decrease the counter by 10\n Drop some text to set it as the label.
+
+# Category of the applet : 2 = files, 3 = internet, 4 = Desktop, 5 = accessory, 6 = fun
+category = 5
+
+# Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
+version = 0.0.1
+
+# Default icon to use if no icon has been defined by the user. If not specified, or if the file is not found, the "icon" file will be used.
+icon = 
+
+# Whether the applet can be instanciated several times or not.
+multi-instance = true

=== added file 'Dbus/demos/demo_ruby/demo_ruby'
--- Dbus/demos/demo_ruby/demo_ruby	1970-01-01 00:00:00 +0000
+++ Dbus/demos/demo_ruby/demo_ruby	2011-03-17 14:49:16 +0000
@@ -0,0 +1,127 @@
+#!/usr/bin/ruby
+
+# This is a part of the external demo_ruby applet for Cairo-Dock
+#
+# Author: Eduardo Mucelli Rezende Oliveira
+# E-mail: [e-mail] or [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.
+
+# This very simple applet features a counter from 0 to max_value. It displays the counter on the icon with a gauge and a quick info.
+# Scroll on the icon increase or decrease the counter
+# The menu offers the possibility to set some default value
+# Left click on the icon will set a random value
+# Middle click on the icon will raise a dialog asking you to set the value you want
+# If you drop some text on the icon, it will be used as the icon's label
+# Be aware to the messages, they are very wise :-)
+
+%w{rubygems dbus parseconfig CDApplet}.each { |x| require x }                           # requirements, do not forget CDApplet, it is not like Python
+
+class String
+	def to_b																			    # string to boolean
+	    ["true", "1", "T", "t"].include?(self.downcase)
+    end
+end
+
+class Applet < CDApplet
+	attr_accessor :counter, :configuration
+	def initialize
+		self.counter = 0
+        super
+	end
+	def start
+		self.icon.ShowDialog("I'm connected to Cairo-Dock !", 4)  							# show a dialog with this message for 4 seconds
+        self.icon.SetQuickInfo("#{self.counter}")			  								# write the counter value on the icon
+        self.icon.AddDataRenderer("gauge", 1, self.configuration['theme'])  				# set 1 gauge with the theme read in config
+        self.icon.RenderValues([Float(self.counter)/self.configuration['max_value']])  		# draw the gauge with an initial value
+
+        self.sub_icons.AddSubIcons(["icon 1", "firefox-3.0", "id1", "icon 3", "thunderbird", "id3", "icon 4", "nautilus", "id4"])	
+        self.sub_icons.RemoveSubIcon("id2") 												# remove the 2nd icon of our sub-dock
+        self.sub_icons.SetQuickInfo("1", "id1")  											# write the ID on each icon of the sub-dock
+        self.sub_icons.SetQuickInfo("3", "id3")
+        self.sub_icons.SetQuickInfo("4", "id4")
+	end
+
+    def get_config keyfile
+		self.configuration = {}
+		self.configuration['max_value'] = keyfile.params['Configuration']['max value'].to_i
+		self.configuration['theme'] = keyfile.params['Configuration']['theme']
+		self.configuration['yes_no'] = keyfile.params['Configuration']['yesno'].to_b        
+    end
+
+	# callbacks on the main icon
+	def on_click iState
+		p "[+] roger, right-click"
+		render_counter (self.counter+10)
+	end
+	def on_middle_click
+		p "[+] yes sir, middle-click received"
+		self.icon.AskValue("Set the value you want", self.counter, self.configuration['max_value'])
+	end
+	def on_build_menu
+		p "[+] let's build the menu"
+		self.icon.PopulateMenu(["Reset the counter", "Set Medium Value", "Set Max Value"])
+	end
+	def on_menu_select param
+		p "[+] let me guess, somebody chose the menu identified by the ID #{param}"
+		if param == 0
+			render_counter 0
+		elsif param == 1
+			render_counter self.configuration['max_value']/2
+		else
+			render_counter self.configuration['max_value']
+		end
+	end
+	def on_scroll scroll_up
+		p "[+] is there anybody out there scrolling #{scroll_up ? "up" : "down"} on my icon ?"
+		if scroll_up
+			count = [self.configuration['max_value'], self.counter + 1].min
+		else
+			count = self.counter - 1
+		end
+		render_counter count
+	end
+	def on_drop_data dropped_data
+		print "[+] ops, someone let #{dropped_data} fall into my icon"
+		self.icon.SetLabel(dropped_data)
+	end
+	def on_answer answer
+		p "[+] answer: #{answer}"
+		render_counter answer
+	end
+
+	# callbacks on the applet
+	def stop
+		p "[+] bye bye"
+		exit
+	end
+	def reload
+		p "[+] our module was reloaded, welcome back!"
+		self.icon.AddDataRenderer("gauge", 1, myApplet.config['theme'])
+		self.icon.RenderValues([Float(self.counter)/self.configuration['max_value']])
+		self.sub_icons.RemoveSubIcon("any")
+		self.sub_icons.AddSubIcons(["icon 1", "firefox-3.0", "id1", "icon 2", "natilus", "id2", "icon 3", "thunderbird", "id3"]) 
+	end
+	
+	# callbacks on the sub-icons
+	def on_click_sub_icon state, icon_id
+		p "[+] something tells me that you clicked on the icon #{icon_id}"
+	end
+
+	def render_counter cont
+		self.counter = cont																# equivalent to the set_count method in demo_python
+		percent = Float(self.counter) / self.configuration['max_value']
+		self.icon.RenderValues([percent])
+		self.icon.SetQuickInfo("#{self.counter.to_i}")
+	end
+end
+
+Applet.new.run

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

=== added file 'Dbus/demos/demo_ruby/icon'
Binary files Dbus/demos/demo_ruby/icon	1970-01-01 00:00:00 +0000 and Dbus/demos/demo_ruby/icon	2011-03-17 14:49:16 +0000 differ
=== added file 'Dbus/demos/demo_ruby/preview'
Binary files Dbus/demos/demo_ruby/preview	1970-01-01 00:00:00 +0000 and Dbus/demos/demo_ruby/preview	2011-03-17 14:49:16 +0000 differ
=== modified file 'Dbus/demos/demo_vala/demo_vala.vala' (properties changed: +x to -x)
--- Dbus/demos/demo_vala/demo_vala.vala	2010-08-07 01:43:25 +0000
+++ Dbus/demos/demo_vala/demo_vala.vala	2011-03-17 14:49:16 +0000
@@ -1,9 +1,8 @@
 /* This is a part of the external demo applet for Cairo-Dock
 
-Copyright : (C) 2010 by Fabounet
+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
@@ -28,12 +27,17 @@
 /// If you drop some text on the icon, it will be used as the icon's label.
 
 /// Compile it with (you may have to install valac) :
-/// valac --disable-dbus-transformation --pkg dbus-glib-1 -o demo_vala demo_vala.vala
+/// valac --pkg CDApplet -o demo_vala demo_vala.vala
+/// ou
+/// valac -q -C --disable-warnings --pkg CDApplet demo_vala.vala
+/// gcc -o demo_vala $(pkg-config --cflags --libs CDApplet) demo_vala.c
+
 
   /////////////////////////
  ///// dependancies //////
 /////////////////////////
 using GLib;
+using CairoDock.Applet;
 
 struct Config {
     public string cTheme;
@@ -41,57 +45,82 @@
     public bool yesno;
 }
 
-public class Applet : GLib.Object
+public class MyApplet : CDApplet
 {
-	// internal data.
-	private dynamic DBus.Object icon;
-	private dynamic DBus.Object sub_icons;
-	private MainLoop loop;
-	private string applet_name;
-	private string conf_file;
 	// my config.
 	private Config config;
 	// my data.
 	private int count;
 	
-	public Applet()
+	public MyApplet(string[] argv)
 	{
-		this.applet_name = GLib.Path.get_basename(GLib.Environment.get_current_dir());  // the name of the applet must the same as the folder.
-		this.conf_file = GLib.Environment.get_home_dir()+"/.config/cairo-dock/current_theme/plug-ins/"+applet_name+"/"+applet_name+".conf";  // path to the conf file of our applet.
-		this.config = Config();
+		//this.config = Config();
+		base(argv);
 	}
 	
-	public void run()
+	  ///////////////////////
+	 /// private methods ///
+	///////////////////////
+	
+	private void set_counter(int count)
 	{
-		this.connect_to_bus();
-		this.get_config();
-		this.load();
-		this.loop = new MainLoop(null, false);
-		this.loop.run();
+		this.count = count;
+		double[] percent = {1.0*this.count/this.config.iMaxValue};
+		base.icon.RenderValues(percent);
+		this.icon.SetQuickInfo("%d".printf(this.count));
 	}
 	
 	  ////////////////////////////////////////
 	 ////// callbacks on the main icon //////
 	////////////////////////////////////////
-	private void action_on_click(dynamic DBus.Object myIcon, int iState)
+	public override void on_click(int iState)
 	{
-		print (">>> clic !\n");
+		print ("*** clic !\n");
 		set_counter(GLib.Random.int_range(0,this.config.iMaxValue+1));
 	}
-	private void action_on_middle_click(dynamic DBus.Object myIcon)
-	{
-		print (">>> middle clic !\n");
-		myIcon.AskValue("Set the value you want", (double)this.count, (double)this.config.iMaxValue);
-	}
-	private void action_on_build_menu(dynamic DBus.Object myIcon)
-	{
-		print (">>> build menu !\n");
-		string[] entries = {"set min value", "set medium value", "set max value"};
-		myIcon.PopulateMenu(entries);
-	}
-	private void action_on_menu_select(dynamic DBus.Object myIcon, int iNumEntry)
-	{
-		print (">>> choice %d has been selected !\n", iNumEntry);
+	public override void on_middle_click()
+	{
+		print ("*** middle clic !\n");
+		//this.icon.AskValue("Set the value you want", (double)this.count, (double)this.config.iMaxValue);
+		HashTable<string,Variant>dialog_attributes = new HashTable<string,Variant>(str_hash, str_equal);
+		dialog_attributes.insert("icon", "stock_properties");
+		dialog_attributes.insert("message", "Set the value you want");
+		dialog_attributes.insert("buttons", "ok;cancel");
+		HashTable<string,Variant> widget_attributes = new HashTable<string,Variant>(str_hash, str_equal);  // even if you don't have widget attributes, you must fill the hash-table with at least 1 value, otherwise vala will crash :-/
+		widget_attributes.insert("widget-type","scale");
+		widget_attributes.insert("max-value",this.config.iMaxValue);
+		widget_attributes.insert("message","Set the value you want");
+		this.icon.PopupDialog(dialog_attributes, widget_attributes);
+	}
+	public override void on_build_menu()
+	{
+		print ("*** build menu !\n");
+		HashTable<string,Variant>[] pItems = {};
+		HashTable<string,Variant> pItem;
+		
+		pItem = new HashTable<string,Variant?>(str_hash, str_equal);
+		pItem.insert("label", "set min value");
+		pItem.insert("icon", "gtk-zoom-out");
+		pItem.insert("id", 0);
+		pItems += pItem;
+		
+		pItem = new HashTable<string,Variant?>(str_hash, str_equal);
+		pItem.insert("label", "set medium value");
+		pItem.insert("icon", "gtk-zoom-fit");
+		pItem.insert("id", 1);
+		pItems += pItem;
+		
+		pItem = new HashTable<string,Variant?>(str_hash, str_equal);
+		pItem.insert("label", "set max value");
+		pItem.insert("icon", "gtk-zoom-in");
+		pItem.insert("id", 2);
+		pItems += pItem;
+		
+		this.icon.AddMenuItems(pItems);
+	}
+	public override void on_menu_select(int iNumEntry)
+	{
+		print ("*** choice %d has been selected !\n", iNumEntry);
 		if (iNumEntry == 0)
 			this.set_counter(0);
 		else if (iNumEntry == 1)
@@ -99,100 +128,63 @@
 		else if (iNumEntry == 2)
 			this.set_counter(this.config.iMaxValue);
 	}
-	private void action_on_scroll(dynamic DBus.Object myIcon, bool bScrollUp)
+	public override void on_scroll(bool bScrollUp)
 	{
-		print (">>> scroll !\n");
+		print ("*** scroll !\n");
+		int count;
 		if (bScrollUp)
 			count = int.min(this.config.iMaxValue, this.count+1);
 		else
 			count = int.max(0, this.count-1);
 		this.set_counter(count);
 	}
-	private void action_on_drop_data(dynamic DBus.Object myIcon, string cReceivedData)
+	public override void on_drop_data(string cReceivedData)
 	{
-		print (">>> received : %s\n",cReceivedData);
+		print ("*** received : %s\n",cReceivedData);
 		this.icon.SetLabel(cReceivedData);
 	}
-	private void action_on_answer(dynamic DBus.Object myIcon, Value answer)
+	public override void on_answer_dialog(int iButton, Variant answer)
 	{
-		print (">>> answer : %d\n",(int)answer.get_double());
-		this.set_counter((int)answer.get_double());
+		print ("*** answer : %d\n",(int)answer.get_double());
+		if (iButton == 0)  // ok
+			this.set_counter((int)answer.get_double());
 	}
+	
 	  ////////////////////////////////////////
 	 ////// callbacks on the sub-icons //////
 	////////////////////////////////////////
-	private void action_on_click_sub_icon(dynamic DBus.Object mySubIcons, int iState, string cIconID)
+	public override void on_click_sub_icon(int iState, string cIconID)
 	{
 		print ("clic on the sub-icon '%s' !\n", cIconID);
 	}
-	  /////////////////////////////////////
-	 ////// callbacks on the applet //////
-	/////////////////////////////////////
-	private void action_on_stop(dynamic DBus.Object myIcon)
-	{
-		print (">>> our module is stopped\n");
-		loop.quit();
-	}
-
-	private void action_on_reload(dynamic DBus.Object myIcon, bool bConfigHasChanged)
-	{
-		print (">>> our module is reloaded");
-		if (bConfigHasChanged)
-		{
-			print (">>>  and our config has changed");
-			this.get_config();
-			this.icon.AddDataRenderer("gauge", 1, this.config.cTheme);
-			double[] percent = {1.0*this.count/this.config.iMaxValue};
-			this.icon.RenderValues(percent);
-			this.sub_icons.RemoveSubIcon("any");
-			string[] subicons = {"icon 1", "firefox-3.0", "id1", "icon 3", "thunderbird", "id3", "icon 4", "nautilus", "id4"};
-			this.sub_icons.AddSubIcons(subicons);
-		}
-	}
-	  //////////////////////////////////////
-	 ////// get our applet on the bus /////
-	//////////////////////////////////////
-	private void connect_to_bus()
-	{
-		string applet_path = "/org/cairodock/CairoDock/"+applet_name;  // path where our object is stored on the bus.
-		DBus.Connection bus = DBus.Bus.get (DBus.BusType.SESSION);
-		if (bus == null)
-		{
-			GLib.error (">>> module '%s' can't be found on the bus, exit.", this.applet_name);
-		}
-		this.icon = bus.get_object ("org.cairodock.CairoDock",
-			applet_path,
-			"org.cairodock.CairoDock.applet");  // this object represents our applet and also our icon. It can be either in a dock or in a desklet, we don't have to care.
-
-		////// we'll have a sub-dock, so we also get the sub-icons object //////
-		this.sub_icons = bus.get_object ("org.cairodock.CairoDock",
-			applet_path+"/sub_icons",
-			"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.
-		
-		this.icon.on_click += action_on_click;  // when the user left-clicks on our icon.
-		this.icon.on_middle_click += action_on_middle_click;  // when the user middle-clicks on our icon.
-		this.icon.on_build_menu += action_on_build_menu;  // when the user right-clicks on our applet (which builds the menu)
-		this.icon.on_menu_select += action_on_menu_select;  // when the user selects an entry of this menu.
-		this.icon.on_scroll += action_on_scroll;  // when the user scroll up or down on our icon.
-		this.icon.on_drop_data += action_on_drop_data;  // when the user drops something on our icon.
-		this.icon.on_answer += action_on_answer;  // when the user answer a question.
-		this.icon.on_stop_module += action_on_stop;  // when the user deactivate our applet (or the DBus plug-in, or when the Cairo-Dock is stopped).
-		this.icon.on_reload_module += action_on_reload;  // when the user changes something in our config, or when the desklet is resized (with no change in the config).
-		this.sub_icons.on_click_sub_icon += action_on_click_sub_icon;  // when the user left-clicks on a sub-icon.
-	}
-	private void get_config()
-	{
-		GLib.KeyFile keyfile = new GLib.KeyFile();
-		keyfile.load_from_file(this.conf_file, GLib.KeyFileFlags.NONE);
-		
+	
+	  ///////////////////////////////
+	 ////// applet definition //////
+	///////////////////////////////
+	public override void end()
+	{
+		print ("*** our module is stopped\n");
+	}
+
+	public override void reload()
+	{
+		this.icon.AddDataRenderer("gauge", 1, this.config.cTheme);
+		double[] percent = {1.0*this.count/this.config.iMaxValue};
+		this.icon.RenderValues(percent);
+		this.sub_icons.RemoveSubIcon("any");
+		string[] subicons = {"icon 1", "firefox-3.0", "id1", "icon 3", "thunderbird", "id3", "icon 4", "nautilus", "id4"};
+		this.sub_icons.AddSubIcons(subicons);
+	}
+	public override void get_config(GLib.KeyFile keyfile)
+	{
 		this.config.cTheme 	= keyfile.get_string("Configuration", "theme");
+		print ("cTheme: %s\n", this.config.cTheme);
 		this.config.iMaxValue 	= keyfile.get_integer("Configuration", "max value");
 		this.config.yesno 	= keyfile.get_boolean("Configuration", "yesno");
 	}
-	private void load()
+	public override void begin()
 	{
 		this.icon.ShowDialog("I'm connected to Cairo-Dock !", 4);  // show a dialog with this message for 4 seconds.
-		this.icon.SetQuickInfo("%d".printf(this.count));  // write the counter value on the icon.
 		this.icon.AddDataRenderer("gauge", 1, this.config.cTheme);  // set a gauge with the theme read in config to display the value of the counter.
 		double[] percent  = {1.0*this.count/this.config.iMaxValue};
 		this.icon.RenderValues(percent);  // draw the gauge with an initial value.
@@ -202,23 +194,16 @@
 		this.sub_icons.SetQuickInfo("1", "id1");  // write the ID on each icon of the sub-dock.
 		this.sub_icons.SetQuickInfo("3", "id3");
 		this.sub_icons.SetQuickInfo("4", "id4");
-	}
-	private void set_counter(int count)
-	{
-		this.count = count;
-		double[] percent = {1.0*this.count/this.config.iMaxValue};
-		this.icon.RenderValues(percent);
-		this.icon.SetQuickInfo("%d".printf(this.count));
+		print ("DEMO %s\n", this.config.cTheme);
 	}
 }
 
   //////////////////
  ////// main //////
 //////////////////
-static int main (string[] args)
+static int main (string[] argv)
 {	
-	var myApplet = new Applet();
+	var myApplet = new MyApplet(argv);
 	myApplet.run();
-	print("bye\n");
 	return 0;
 }

=== modified file 'Dbus/demos/demo_vala/icon' (properties changed: +x to -x)
=== modified file 'Dbus/demos/demo_vala/preview' (properties changed: +x to -x)
=== added directory 'Dbus/interfaces'
=== added file 'Dbus/interfaces/CMakeLists.txt'
--- Dbus/interfaces/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/CMakeLists.txt	2011-03-17 14:49:16 +0000
@@ -0,0 +1,14 @@
+
+if ("${PYTHON_FOUND}" STREQUAL "TRUE")
+	add_subdirectory(python)
+	add_subdirectory(bash)
+endif()
+if ("${RUBY_FOUND}" STREQUAL "TRUE")
+	add_subdirectory(ruby)
+endif()
+if ("${MONO_FOUND}" STREQUAL "TRUE")
+	add_subdirectory(mono)
+endif()
+if ("${with_vala}" STREQUAL "yes")
+	add_subdirectory(vala)
+endif()

=== added directory 'Dbus/interfaces/bash'
=== added file 'Dbus/interfaces/bash/BashInstall.cmake.in'
--- Dbus/interfaces/bash/BashInstall.cmake.in	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/bash/BashInstall.cmake.in	2011-03-17 14:49:16 +0000
@@ -0,0 +1,15 @@
+IF("@ROOT_PREFIX@" STREQUAL "")
+	EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+					"setup.py" "install"
+					"--prefix=${CMAKE_INSTALL_PREFIX}"
+					"@DEBIAN_INSTALL_LAYOUT@")
+ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "")
+	EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+					"setup.py" "install"
+					"--root=@ROOT_PREFIX@"
+					"@DEBIAN_INSTALL_LAYOUT@")
+ELSE()
+	EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+					"setup.py" "install"
+					"--root=@ROOT_PREFIX@")
+ENDIF()

=== added file 'Dbus/interfaces/bash/CDBashApplet.py'
--- Dbus/interfaces/bash/CDBashApplet.py	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/bash/CDBashApplet.py	2011-03-17 14:49:16 +0000
@@ -0,0 +1,83 @@
+#!/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.sh'
--- Dbus/interfaces/bash/CDBashApplet.sh	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/bash/CDBashApplet.sh	2011-03-17 14:49:16 +0000
@@ -0,0 +1,178 @@
+#!/bin/bash
+
+# This is a part of the external applets for Cairo-Dock
+# Copyright : (C) 2010-2011 by Nochka85
+#                      modified by matttbe for the new API
+#                      (based on the demo.py by Fabounet)
+# E-mail : [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
+
+## Rev : 09/02/2011
+
+APP_NAME="$1"
+shift 1
+DBUS_NAME="org.cairodock.CairoDock"
+DBUS_PATH="$1"
+shift 1
+DBUS_INTERFACE="org.cairodock.CairoDock"
+CONF_FILE="$1"
+shift 1
+PARENT_APP_NAME="$1"
+shift 1
+
+BOTTOM=0
+TOP=1
+RIGHT=2
+LEFT=3
+DOCK=0
+DESKLET=1
+UPPER_LEFT=0
+LOWER_RIGHT=1
+LOWER_LEFT=2
+UPPER_RIGHT=3
+MIDDLE=4
+MENU_ENTRY=0
+MENU_SUB_MENU=1
+MENU_SEPARATOR=2
+MENU_CHECKBOX=3
+MENU_RADIO_BUTTON=4
+MAIN_MENU_ID=0
+DIALOG_KEY_ENTER=-1
+DIALOG_KEY_ESCAPE=-2
+
+call() {  # method, args
+	method=$1
+	shift 1
+	command=`echo -e "dbus-send --session --dest=$DBUS_NAME $DBUS_PATH $DBUS_INTERFACE.applet.$method $*"`
+	eval $command
+}
+
+call_sub_icon() { # method, args
+	method=$1
+	shift
+	command=`echo "dbus-send --session --dest=$DBUS_NAME $DBUS_PATH/sub_icons $DBUS_INTERFACE.subapplet.$method $*"`
+	eval $command
+}
+
+get_conf_param() { # group, key
+	LINE=`cat $CONF_FILE | grep "$1"`
+	echo $LINE | cut -f2 -d '='
+}
+
+#############################################################################################################
+
+on_click()
+{
+	echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Left clic !"
+}
+
+on_middle_click()
+{
+	echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Middle clic !"
+}
+
+on_scroll_icon()
+{
+	echo -n "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Scroll"
+	if [ $1 -eq 1 ]; then
+		echo " UP !"
+	else
+		echo " DOWN !"
+	fi
+}
+
+on_drop_data()
+{
+	echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> $1 has been dropped on applet !"
+}
+
+on_build_menu()
+{
+	echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Build menu !"
+}
+
+on_menu_select()
+{
+	echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> Choice $1 has been selected !"
+}
+
+on_shortkey()
+{
+	echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> key $1 has been pressed !"
+}
+
+on_change_focus()
+{
+	echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> focus has changed to $1 !"
+}
+
+on_answer_dialog()
+{
+	echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> $2 has been answered with button $1!"
+}
+
+on_click_sub_icon()
+{
+	echo "$APP_NAME applet -> Script Name : $SCRIPT_NAME -> sub-icon $2 has been left-clicked !"
+}
+
+#############################################################################################################
+
+begin()
+{
+	echo "start !"
+}
+
+end()
+{
+	echo "stop !"
+}
+
+reload()
+{
+	echo "reload !"
+}
+
+#############################################################################################################
+
+run()
+{
+	shift 4
+	if [ "$1" = "on_click" ]; then
+		on_click $2
+	elif [ "$1" = "on_middle_click" ]; then
+		on_middle_click
+	elif [ "$1" = "on_scroll" ]; then
+		on_scroll_icon $2
+	elif [ "$1" = "on_drop_data" ]; then
+		on_drop_data "$2"
+	elif [ "$1" = "on_build_menu" ]; then
+		on_build_menu
+	elif [ "$1" = "on_menu_select" ]; then
+		on_menu_select $2
+	elif [ "$1" = "on_answer_dialog" ]; then
+		on_answer_dialog $2 "$3"
+	elif [ "$1" = "on_shortkey" ]; then
+		on_shortkey "$2"
+	elif [ "$1" = "on_change_focus" ]; then
+		on_change_focus $2
+	elif [ "$1" = "on_click_sub_icon" ]; then
+		on_click_sub_icon $2 "$3"
+	elif [ "$1" = "begin" ]; then
+		begin
+	elif [ "$1" = "end" ]; then
+		end
+	elif [ "$1" = "reload" ]; then
+		reload
+	fi
+}

=== added file 'Dbus/interfaces/bash/CMakeLists.txt'
--- Dbus/interfaces/bash/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/bash/CMakeLists.txt	2011-03-17 14:49:16 +0000
@@ -0,0 +1,19 @@
+
+########### install files ###############
+
+# 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})
+	exec_program("${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build")
+endif()
+# Run a custom script with 'make install' 
+add_custom_target(bash_pyc ALL)
+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)
+
+# 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}
+	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+WORLD_READ WORLD_EXECUTE)

=== added file 'Dbus/interfaces/bash/setup.py'
--- Dbus/interfaces/bash/setup.py	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/bash/setup.py	2011-03-17 14:49:16 +0000
@@ -0,0 +1,25 @@
+# This is a part of the external demo applet for Cairo-Dock
+# Copyright : (C) 2011 by 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
+
+from distutils.core import setup
+setup(name='CDBashApplet',
+		version='1.0',
+		license='GPL-3',
+		author='Fabrice Rey',
+		author_email='[e-mail]',
+		description='Bash interface for Cairo-Dock',
+		url='https://launchpad.net/cairo-dock',
+		py_modules=['CDBashApplet']
+	)

=== added directory 'Dbus/interfaces/mono'
=== added file 'Dbus/interfaces/mono/CDApplet.cs'
--- Dbus/interfaces/mono/CDApplet.cs	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/mono/CDApplet.cs	2011-03-17 14:49:16 +0000
@@ -0,0 +1,273 @@
+//
+//
+//This is a part of the external demo applet 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).
+
+// Compile it with the following command, then rename 'demo_mono.exe' to 'demo_mono'.
+// gmcs /target:library CDApplet.cs ISubApplet.cs IApplet.cs -pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0
+  //////////////////////////
+ ////// dependancies //////
+//////////////////////////
+using System;  // Environment
+using System.IO;  // Path, Directory
+using System.Reflection;
+using GLib;
+using NDesk.DBus;
+using CairoDock.Applet;
+
+//namespace CairoDock.Applet
+//{
+public class CDApplet
+{
+	public string cAppletName = null;
+	public string cParentAppName = null;
+	public string cBusPath = null;
+	public string cConfFile = null;
+	public IApplet icon = null;
+	public ISubApplet sub_icons= null;
+	private GLib.MainLoop loop = null;
+	private string cMenuIconId = null;
+	
+	public enum ScreenPosition {
+		BOTTOM = 0,
+		TOP,
+		RIGHT,
+		LEFT
+	}
+	public enum ContainerType {
+		DOCK = 0,
+		DESKLET
+	}
+	public enum EmblemPosition {
+		UPPER_LEFT = 0,
+		LOWER_RIGHT,
+		LOWER_LEFT,
+		UPPER_RIGHT,
+		MIDDLE
+	}
+	public enum MenuItemType {
+		MENU_ENTRY = 0,
+		MENU_SUB_MENU,
+		MENU_SEPARATOR,
+		MENU_CHECKBOX,
+		MENU_RADIO_BUTTON
+	}
+
+	public enum MenuItemId {
+		MAIN_MENU_ID = 0
+    }
+    
+	public enum DialogKey {
+		DIALOG_KEY_ENTER = -1,
+		DIALOG_KEY_ESCAPE = -2
+    }
+	
+	public CDApplet()
+	{
+		String[] argv = Environment.GetCommandLineArgs();
+		this.cAppletName = argv[0].Substring(2);
+		this.cBusPath = argv[2];
+		this.cConfFile = argv[3];
+		this.cParentAppName = argv[4];
+		
+		this._get_config ();
+		this._connect_to_dock ();
+	}
+	
+	public void run()
+	{
+		this.begin();
+		loop = new GLib.MainLoop();
+		loop.Run();
+		Console.WriteLine(">>> Applet " + this.cAppletName + " terminated");
+	}
+	
+	//////////////////////////////////
+	/// callbacks on the main icon ///
+	//////////////////////////////////
+	
+	public virtual void on_click (int iClickState)
+	{
+		Console.WriteLine(">>> click");
+	}
+	public virtual void on_middle_click ()
+	{
+		Console.WriteLine(">>> middle click");
+	}
+	public virtual void on_scroll (bool bScrollUp)
+	{
+		Console.WriteLine(">>> scroll up " + bScrollUp);
+	}
+	private void _on_build_menu ()
+	{
+		this.cMenuIconId = null;
+		this.on_build_menu ();
+	}
+	public virtual void on_build_menu ()
+	{
+		Console.WriteLine(">>> build menu");
+	}
+	private void _on_menu_select (int iNumEntry)
+	{
+		if (this.cMenuIconId == null)
+			this.on_menu_select (iNumEntry);
+		else
+			this.on_menu_select_sub_icon (iNumEntry, this.cMenuIconId);
+	}
+	public virtual void on_menu_select (int iNumEntry)
+	{
+		Console.WriteLine(">>> select entry : "+iNumEntry);
+	}
+	public virtual void on_drop_data (string cReceivedData)
+	{
+		Console.WriteLine(">>> drop : "+cReceivedData);
+	}
+	public virtual void on_answer (System.Object answer)
+	{
+		Console.WriteLine(">>> answer : "+answer);
+	}
+	public virtual void on_answer_dialog (int iButton, System.Object answer)
+	{
+		Console.WriteLine(">>> answer : "+answer);
+	}
+	public virtual void on_shortkey (string cKey)
+	{
+		Console.WriteLine(">>> key : "+cKey);
+	}
+	public virtual void on_change_focus (bool bIsActive)
+	{
+		Console.WriteLine(">>> focus changed : "+bIsActive);
+	}
+	
+	//////////////////////////////////
+	/// callbacks on the sub-icons ///
+	//////////////////////////////////
+	
+	public virtual void on_click_sub_icon (int iClickState, string cIconID)
+	{
+		Console.WriteLine(">>> click on sub-icon "+cIconID);
+	}
+	
+	public virtual void on_middle_click_sub_icon (string cIconID)
+	{
+		Console.WriteLine(">>> middle-click on sub-icon "+cIconID);
+	}
+	
+	public virtual void on_scroll_sub_icon (bool bScrollUp, string cIconID)
+	{
+		Console.WriteLine(">>> scroll on sub-icon "+cIconID);
+	}
+	
+	private void _on_build_menu_sub_icon (string cIconID)
+	{
+		this.cMenuIconId = cIconID;
+		this.on_build_menu_sub_icon (cIconID);
+	}
+	public virtual void on_build_menu_sub_icon (string cIconID)
+	{
+		Console.WriteLine(">>> menu on sub-icon "+cIconID);
+	}
+	
+	public virtual void on_menu_select_sub_icon (int iNumEntry, string cIconID)
+	{
+		Console.WriteLine(">>> menu entry "+iNumEntry+" selected on sub-icon "+cIconID);
+	}
+	
+	public virtual void on_drop_data_sub_icon (string cReceivedData, string cIconID)
+	{
+		Console.WriteLine(">>> data "+cReceivedData+" dropped on sub-icon "+cIconID);
+	}
+	
+	public virtual void on_answer_sub_icon (System.Object answer, string cIconID)
+	{
+		Console.WriteLine(">>> answer "+answer+" from sub-icon "+cIconID);
+	}
+	
+	///////////////////////////////
+	/// callbacks on the applet ///
+	///////////////////////////////
+	
+	public virtual void begin ()
+	{
+		
+	}
+	
+	public virtual void end ()
+	{
+		
+	}
+	
+	private void _on_stop ()
+	{
+		this.end();
+		this.loop.Quit();
+	}
+	
+	public virtual void reload ()
+	{
+		
+	}
+	
+	private void _on_reload (bool bConfigHasChanged)
+	{
+		if (bConfigHasChanged)
+		{
+			this._get_config();
+			this.reload();
+		}
+	}
+	
+	public virtual void get_config (string cConfFile_path)
+	{
+		
+	}
+	
+	private void _get_config()
+	{
+		this.get_config(this.cConfFile);
+	}
+	
+	private void _connect_to_dock ()
+	{
+		NDesk.DBus.BusG.Init();
+		NDesk.DBus.Bus bus = NDesk.DBus.Bus.Session;
+		this.icon = bus.GetObject<IApplet> ("org.cairodock.CairoDock", new ObjectPath (this.cBusPath));
+		this.icon.on_click 			+= new OnClickEvent (on_click);
+		this.icon.on_middle_click 	+= new OnMiddleClickEvent (on_middle_click);
+		this.icon.on_scroll 		+= new OnScrollEvent (on_scroll);
+		this.icon.on_build_menu 	+= new OnBuildMenuEvent (_on_build_menu);
+		this.icon.on_menu_select 	+= new OnMenuSelectEvent (_on_menu_select);
+		this.icon.on_drop_data 		+= new OnDropDataEvent (on_drop_data);
+		this.icon.on_answer 		+= new OnAnswerEvent (on_answer);
+		this.icon.on_answer_dialog 	+= new OnAnswerDialogEvent (on_answer_dialog);
+		this.icon._on_stop 			+= new OnStopModuleEvent (_on_stop);
+		this.icon._on_reload 		+= new OnReloadModuleEvent (_on_reload);
+		
+		this.sub_icons = bus.GetObject<ISubApplet>("org.cairodock.CairoDock", new ObjectPath(this.cBusPath + "/sub_icons"));
+		this.sub_icons.on_click_sub_icon			+= new OnClickSubIconEvent (on_click_sub_icon);
+		this.sub_icons.on_middle_click_sub_icon 	+= new OnMiddleClickSubIconEvent (on_middle_click_sub_icon);
+		this.sub_icons.on_scroll_sub_icon 		+= new OnScrollSubIconEvent (on_scroll_sub_icon);
+		this.sub_icons.on_build_menu_sub_icon 	+= new OnBuildMenuSubIconEvent (_on_build_menu_sub_icon);
+		this.sub_icons.on_menu_select_sub_icon 	+= new OnMenuSelectSubIconEvent (on_menu_select_sub_icon);
+		this.sub_icons.on_drop_data_sub_icon 	+= new OnDropDataSubIconEvent (on_drop_data_sub_icon);
+		this.sub_icons.on_answer_sub_icon 		+= new OnAnswerSubIconEvent (on_answer_sub_icon);
+	}
+}
+//}

=== added file 'Dbus/interfaces/mono/CMakeLists.txt'
--- Dbus/interfaces/mono/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/mono/CMakeLists.txt	2011-03-17 14:49:16 +0000
@@ -0,0 +1,13 @@
+	
+########### install files ###############
+
+execute_process(COMMAND ${GMCS_EXECUTABLE}
+	-target:library
+	-pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0
+	-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")
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/CDApplet.dll
+	DESTINATION ${MONO_LIB_DIR})
+

=== added file 'Dbus/interfaces/mono/IApplet.cs'
--- Dbus/interfaces/mono/IApplet.cs	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/mono/IApplet.cs	2011-03-17 14:49:16 +0000
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;  // Dictionnary
+using NDesk.DBus;
+
+namespace CairoDock.Applet
+{
+	public enum AppletEmblemPosition
+	{
+		UpperLeft,
+		LowerRight,
+		LowerLeft,
+		UpperRight,
+		Middle
+	}
+	
+	public enum AppletContainerType
+	{
+		Dock,
+		Desklet
+	}
+	
+	public enum AppletOrientationType
+	{
+		Bottom,
+		Top,
+		Right,
+		Left
+	}
+
+	[NDesk.DBus.Interface("org.cairodock.CairoDock.applet")]
+	public interface IApplet
+	{
+		object Get(string cProperty);
+		Dictionary<string, object> GetAll();
+		void SetQuickInfo(string cQuickInfo);
+		void SetLabel(string cLabel);
+		void SetIcon(string cImage);
+		void SetEmblem(string cImage, int iPosition);
+		void Animate(string cAnimation, int iNbRounds);
+		void DemandsAttention(bool bStart, string cAnimation);
+		void ShowDialog(string cMessage, int iDuration);
+		void AskQuestion(string cMessage);
+		void AskValue(string cMessage, double fInitialValue, double fMaxlValue);
+		void AskText(string cMessage, string cInitialText);
+		void PopupDialog(Dictionary<string, object> hDialogAttributes, Dictionary<string, object> hWidgetAttributes);
+		void AddDataRenderer(string cType, int iNbValues, string cTheme);
+		void RenderValues(double[] pValues);
+		void ControlAppli(string cApplicationClass);
+		void ShowAppli(bool bShow);
+		void PopulateMenu(string[] pLabels);
+		void AddMenuItems(Dictionary<string, object>[] pItems);
+		void BindShortkey(string[] cShortkeys);
+		event OnClickEvent on_click;
+		event OnMiddleClickEvent on_middle_click;
+		event OnScrollEvent on_scroll;
+		event OnBuildMenuEvent on_build_menu;
+		event OnMenuSelectEvent on_menu_select;
+		event OnDropDataEvent on_drop_data;
+		event OnChangeFocusEvent on_change_focus;
+		event OnAnswerEvent on_answer;
+		event OnAnswerDialogEvent on_answer_dialog;
+		event OnShortkeyEvent on_shortkey;
+		event OnStopModuleEvent _on_stop;
+		event OnReloadModuleEvent _on_reload;
+	}
+
+	public delegate void OnClickEvent(int iButtonState);
+
+	public delegate void OnMiddleClickEvent();
+
+	public delegate void OnScrollEvent(bool bDirectionUp);
+
+	public delegate void OnBuildMenuEvent();
+
+	public delegate void OnMenuSelectEvent(int iNumEntry);
+
+	public delegate void OnDropDataEvent(string cReceivedData);
+
+	public delegate void OnChangeFocusEvent(bool is_active);
+
+	public delegate void OnAnswerEvent(object answer);
+
+	public delegate void OnAnswerDialogEvent(int iClickedButton, object answer);
+
+	public delegate void OnShortkeyEvent(string cShortkey);
+
+	public delegate void OnStopModuleEvent();
+
+	public delegate void OnReloadModuleEvent(bool bConfigHasChanged);
+
+}

=== added file 'Dbus/interfaces/mono/ISubApplet.cs'
--- Dbus/interfaces/mono/ISubApplet.cs	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/mono/ISubApplet.cs	2011-03-17 14:49:16 +0000
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;  // Dictionnary
+using NDesk.DBus;
+
+namespace CairoDock.Applet
+{
+    [Interface("org.cairodock.CairoDock.subapplet")]
+    public interface ISubApplet
+    {
+        void SetQuickInfo(string cQuickInfo, string cIconID);
+        void SetLabel(string cLabel, string cIconID);
+        void SetIcon(string cImage, string cIconID);
+        void SetEmblem(string cImage, int iPosition, string cIconID);
+        void Animate(string cAnimation, int iNbRounds, string cIconID);
+        void ShowDialog(string message, int iDuration, string cIconID);
+        void AskQuestion(string cMessage, string cIconID);
+        void AskValue(string cMessage, double fInitialValue, double fMaxlValue, string cIconID);
+        void AskText(string cMessage, string cInitialText, string cIconID);
+        void AddSubIcons(string[] pIconFields);
+        void RemoveSubIcon(string cIconID);
+        event OnClickSubIconEvent on_click_sub_icon;
+        event OnMiddleClickSubIconEvent on_middle_click_sub_icon;
+        event OnScrollSubIconEvent on_scroll_sub_icon;
+        event OnBuildMenuSubIconEvent on_build_menu_sub_icon;
+        event OnMenuSelectSubIconEvent on_menu_select_sub_icon;
+        event OnDropDataSubIconEvent on_drop_data_sub_icon;
+        event OnAnswerSubIconEvent on_answer_sub_icon;
+    }
+
+    public delegate void OnClickSubIconEvent(int iButtonState, string cIconID);
+
+    public delegate void OnMiddleClickSubIconEvent(string cIconID);
+
+    public delegate void OnScrollSubIconEvent(bool bDirectionUp, string cIconID);
+
+    public delegate void OnBuildMenuSubIconEvent(string cIconID);
+
+    public delegate void OnMenuSelectSubIconEvent(int iNumEntry, string cIconID);
+
+    public delegate void OnDropDataSubIconEvent(string cReceivedData, string cIconID);
+
+    public delegate void OnAnswerSubIconEvent(object answer, string cIconID);
+}

=== added directory 'Dbus/interfaces/python'
=== added file 'Dbus/interfaces/python/CDApplet.py'
--- Dbus/interfaces/python/CDApplet.py	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/python/CDApplet.py	2011-03-17 14:49:16 +0000
@@ -0,0 +1,246 @@
+# This is a part of the external demo applet 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 dbus
+from dbus.mainloop.glib import DBusGMainLoop
+
+DBusGMainLoop(set_as_default=True)
+
+####################
+### Applet class ###
+####################
+class CDApplet:
+	
+	BOTTOM = 0
+	TOP    = 1
+	RIGHT  = 2
+	LEFT   = 3
+	
+	DOCK    = 0
+	DESKLET = 1
+	
+	UPPER_LEFT  = 0
+	LOWER_RIGHT = 1
+	LOWER_LEFT  = 2
+	UPPER_RIGHT = 3
+	MIDDLE      = 4
+	
+	MENU_ENTRY        = 0
+	MENU_SUB_MENU     = 1
+	MENU_SEPARATOR    = 2
+	MENU_CHECKBOX     = 3
+	MENU_RADIO_BUTTON = 4
+
+	MAIN_MENU_ID = 0
+	
+	DIALOG_KEY_ENTER = -1
+	DIALOG_KEY_ESCAPE = -2
+	
+	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:]
+		self.cBusPath = sys.argv[2]
+		self.cConfFile = sys.argv[3]
+		self.cParentAppName = sys.argv[4]
+		
+		self._get_config()
+		self._connect_to_dock()
+	
+	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)
+	
+	def _connect_to_dock(self):
+		# get our applet on the bus.
+		#~ applet_path = "/org/cairodock/CairoDock/"+self.cAppletName  # path where our object is stored on the bus.
+		bus = dbus.SessionBus()
+		try:
+			applet_object = bus.get_object("org.cairodock.CairoDock", self.cBusPath)
+		except:
+			print ">>> object '"+self.cBusPath+"' can't be found on the bus, exit.\nMake sure that the 'Dbus' plug-in is activated in Cairo-Dock"
+			sys.exit(2)
+		self.icon = dbus.Interface(applet_object, "org.cairodock.CairoDock.applet")  # this object represents our icon inside the dock or a desklet.
+		sub_icons_object = bus.get_object("org.cairodock.CairoDock", self.cBusPath+"/sub_icons")
+		self.sub_icons = dbus.Interface(sub_icons_object, "org.cairodock.CairoDock.subapplet")  # this object represents the list of icons contained in our sub-dock, or in our desklet. We'll add them one by one later, giving them a unique ID, which will be used to identify each of them.
+		# connect to signals.
+		self.icon.connect_to_signal("on_click", self.on_click)  # when the user left-clicks on our icon.
+		self.icon.connect_to_signal("on_middle_click", self.on_middle_click)  # when the user middle-clicks on our icon.
+		self.icon.connect_to_signal("on_build_menu", self._on_build_menu)  # when the user right-clicks on our applet (which builds the menu)
+		self.icon.connect_to_signal("on_menu_select", self._on_menu_select)  # when the user selects an entry of this menu.
+		self.icon.connect_to_signal("on_scroll", self.on_scroll)  # when the user scroll up or down on our icon.
+		self.icon.connect_to_signal("on_drop_data", self.on_drop_data)  # when the user drops something on our icon.
+		self.icon.connect_to_signal("on_answer_dialog", self.on_answer_dialog)  # when the user answer a question.
+		self.icon.connect_to_signal("on_shortkey", self.on_shortkey)  # when the user press the shortkey.
+		self.icon.connect_to_signal("on_change_focus", self.on_change_focus)  # when the window's focus changes.
+		self.icon.connect_to_signal("on_stop_module", self._on_stop)  # when the user deactivate our applet (or the DBus plug-in, or when the Cairo-Dock is stopped).
+		self.icon.connect_to_signal("on_reload_module", self._on_reload)  # when the user changes something in our config, or when the desklet is resized (with no change in the config).
+		self.sub_icons.connect_to_signal("on_click_sub_icon", self.on_click_sub_icon)  # when the user left-clicks on a sub-icon.
+		self.sub_icons.connect_to_signal("on_middle_click_sub_icon", self.on_middle_click_sub_icon)
+		self.sub_icons.connect_to_signal("on_scroll_sub_icon", self.on_scroll_sub_icon)
+		self.sub_icons.connect_to_signal("on_build_menu_sub_icon", self._on_build_menu_sub_icon)
+		self.sub_icons.connect_to_signal("on_drop_data_sub_icon", self.on_drop_data_sub_icon)

=== added file 'Dbus/interfaces/python/CMakeLists.txt'
--- Dbus/interfaces/python/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/python/CMakeLists.txt	2011-03-17 14:49:16 +0000
@@ -0,0 +1,13 @@
+
+########### install files ###############
+
+if (NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+	# copy *.py to current binary dir (cleaner)
+	execute_process(COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" "${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.py" ${CMAKE_CURRENT_BINARY_DIR})
+	exec_program("${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build")
+endif()
+# 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)
+set_target_properties(python_pyc PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/PythonInstall.cmake)
+# execute_process(COMMAND python setup.py install ${DEBIAN_INSTALL_LAYOUT})

=== added file 'Dbus/interfaces/python/PythonInstall.cmake.in'
--- Dbus/interfaces/python/PythonInstall.cmake.in	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/python/PythonInstall.cmake.in	2011-03-17 14:49:16 +0000
@@ -0,0 +1,15 @@
+IF("@ROOT_PREFIX@" STREQUAL "")
+	EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+					"setup.py" "install"
+					"--prefix=${CMAKE_INSTALL_PREFIX}"
+					"@DEBIAN_INSTALL_LAYOUT@")
+ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "")
+	EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+					"setup.py" "install"
+					"--root=@ROOT_PREFIX@"
+					"@DEBIAN_INSTALL_LAYOUT@")
+ELSE()
+	EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
+					"setup.py" "install"
+					"--root=@ROOT_PREFIX@")
+ENDIF()

=== added file 'Dbus/interfaces/python/setup.py'
--- Dbus/interfaces/python/setup.py	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/python/setup.py	2011-03-17 14:49:16 +0000
@@ -0,0 +1,25 @@
+# This is a part of the external demo applet for Cairo-Dock
+# Copyright : (C) 2011 by 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
+
+from distutils.core import setup
+setup(name='CDApplet',
+		version='1.0',
+		license='GPL-3',
+		author='Fabrice Rey',
+		author_email='[e-mail]',
+		description='Python interface for Cairo-Dock',
+		url='https://launchpad.net/cairo-dock',
+		py_modules=['CDApplet']
+	)

=== added directory 'Dbus/interfaces/ruby'
=== added file 'Dbus/interfaces/ruby/CDApplet.rb'
--- Dbus/interfaces/ruby/CDApplet.rb	1970-01-01 00:00:00 +0000
+++ Dbus/interfaces/ruby/CDApplet.rb	2011-03-17 14:49:16 +0000
@@ -0,0 +1,291 @@
+#!/usr/bin/ruby
+
+# This is a part of the external Ruby Interface for Cairo-Dock
+
+# Author: Fabounet and Eduardo Mucelli Rezende Oliveira
+# E-mail: [e-mail], [e-mail] or [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.
+
+# This applet monitors the battery through acpi module. It is possbile to show a dialog message
+#    containing the baterry status, charge, and temperature by left-clicking on the icon.
+#    Also, through the configuration panel it is possible to set the icon's label, 
+#	 show the % of carge as quick info, and activate an alert message to be shown when the charge is critically low.
+
+require 'rubygems'
+require 'dbus'
+require 'parseconfig'
+
+class CDApplet
+	attr_accessor :cConfFile, :cAppletName, :icon, :sub_icons, :config, :bus, :_cMenuIconId, :cParentAppName, :cBusPath
+	
+	BOTTOM = 0
+	TOP    = 1
+	RIGHT  = 2
+	LEFT   = 3
+	
+	DOCK    = 0
+	DESKLET = 1
+	
+	UPPER_LEFT  = 0
+	LOWER_RIGHT = 1
+	LOWER_LEFT  = 2
+	UPPER_RIGHT = 3
+	MIDDLE      = 4
+	
+	MENU_ENTRY        = 0
+	MENU_SUB_MENU     = 1
+	MENU_SEPARATOR    = 2
+	MENU_CHECKBOX     = 3
+	MENU_RADIO_BUTTON = 4
+
+	MAIN_MENU_ID = 0
+	
+	DIALOG_KEY_ENTER = -1
+	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
+		self.sub_icons = nil
+		self._cMenuIconId = nil
+		self.cAppletName = $0[2,999]
+		self.cBusPath = ARGV[1]
+		self.cConfFile = ARGV[2]
+		self.cParentAppName = ARGV[3]
+		
+		self._get_config()
+		self._connect_to_dock()
+	end
+	
+	def run
+		self.start()
+		loop = DBus::Main.new
+		loop << self.bus
+		loop.run
+		puts ">>> applet '#{self.cAppletName}' terminated."
+		exit
+	end
+	
+	##################################
+	### callbacks on the main icon ###
+	##################################
+	
+	def on_click iState
+		### action on click
+	end
+	
+	def on_middle_click
+		puts ">>> on_middle_click"
+		### action on middle-click
+	end
+	
+	def _on_build_menu
+		self._cMenuIconId = nil
+		self.on_build_menu()
+	end
+	
+	def on_build_menu
+		### build our menu
+	end
+	
+	def _on_menu_select(iNumEntry)
+		if self._cMenuIconId == nil
+			self.on_menu_select(iNumEntry)
+		else
+			self.on_menu_select_sub_icon(iNumEntry, self._cMenuIconId)
+		end
+	end
+	
+	def on_menu_select(iNumEntry)
+		### action on selecting an entry of our menu """
+	end
+	
+	def on_scroll(bScrollUp)
+		### action on scroll
+	end
+
+	def on_drop_data(cReceivedData)
+		### action on dropping something on our applet
+	end
+	
+	def on_answer(answer)
+		### action on answering a dialog
+	end
+
+	def on_answer_dialog(button, answer)
+		### action on answering a dialog
+	end
+
+	def on_shortkey(cKey)
+		### action on pressing one of the shortkeys we bound beforehand
+	end
+	
+	def on_change_focus(bIsActive)
+		### action when the window controlled by the applet takes or looses the focus
+	end
+	
+	##################################
+	### callbacks on the sub-icons ###
+	##################################
+	def on_click_sub_icon(iState, cIconID)
+		### action on click on one of our sub-icons
+	end
+	
+	def on_middle_click_sub_icon(cIconID)
+		### action on middle-click on one of our sub-icons
+	end
+	
+	def on_scroll_sub_icon(bScrollUp, cIconID)
+		### action on scroll on one of our sub-icons
+	end
+	
+	def _on_build_menu_sub_icon(cIconID)
+		self._cMenuIconId = cIconID
+		self.on_build_menu_sub_icon(cIconID)
+	end
+	
+	def on_build_menu_sub_icon(cIconID)
+		### action on build menu on one of our sub-icons
+	end
+	
+	def on_drop_data_sub_icon(cReceivedData, cIconID)
+		### action on drop data on one of our sub-icons
+	end
+	
+	def on_menu_select_sub_icon(iNumEntry, cIconID)
+		### action on select entry in the menu on one of our sub-icons
+	end
+	
+	
+	###############################
+	### callbacks on the applet ###
+	###############################
+	
+	def start
+		### action when the applet is started
+	end
+	
+	def stop
+		### action when the applet is terminated
+	end
+	
+	def _on_stop
+		self.stop()