Merge lp:~cairo-dock-team/cairo-dock-plug-ins/ubuntu into lp:ubuntu/maverick/cairo-dock-plug-ins

[Didier Roche-Tolomelli]

[Didier Roche-Tolomelli (didrocks)]

resubmit proposal as canonical branch wasn't up to date.
Weirdly, Unmerged revisions doesn't seem to update.

[Didier Roche-Tolomelli (didrocks)]

ok, approved. Please don't use "maverick" in debian/changelog as long as it's unreleased…

For instance, I'm adding one line there and the bzr history won't be clear enough. Can you pull lp:~didrocks/cairo-dock-plug-ins/fix-abi-transition, please?

review: Approve

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

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

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

[Matthieu Baerts (matttbe)]

@Didier: Thank you :)

review: Approve

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

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

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2010-09-07 00:39:20 +0000
+++ CMakeLists.txt	2010-10-02 18:13:46 +0000
@@ -10,7 +10,7 @@
 ########### project ###############
 
 project ("cairo-dock-plugins")
-set (VERSION "2.2.0-0rc1")
+set (VERSION "2.2.0-4")
 
 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/;en_GB.po$;~$;${CPACK_SOURCE_IGNORE_FILES}")
 include (CPack)
 
 add_custom_target( dist
@@ -45,34 +45,33 @@
 
 set (PACKAGE ${CMAKE_PROJECT_NAME})
 set (GETTEXT_PACKAGE ${PACKAGE})
+					# CMAKE_INSTALL_PREFIX = /usr
 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 ...
 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})
 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()
 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)
+if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT "${FORCE_LIB64}" STREQUAL "")  # 64bits and force install in lib64
+	set (libdir ${CMAKE_INSTALL_PREFIX}/lib64)
 else()
-	set (libdir lib${LIB_SUFFIX}/cairo-dock)
+	set (libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})	# /usr/lib
 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})
+if (NOT "${pluginsdir}" STREQUAL "${libdir}/cairo-dock")
+	message (STATUS "Warning : plug-ins should be installed in the same directory as the core, that is to say in ${pluginsdir}")
+	STRING (REGEX REPLACE "/${libdir}/cairo-dock" "" CMAKE_INSTALL_PREFIX ${pluginsdir})
 endif()
 set (localedir "${CMAKE_INSTALL_PREFIX}/share/locale")
 set (gaugesdir "${CMAKE_INSTALL_PREFIX}/share/cairo-dock/gauges")
@@ -559,7 +558,7 @@
 	add_subdirectory (terminal)
 endif()
 
-############# OY #################
+############# TOMBOY #################
 set (GETTEXT_TOMBOY ${GETTEXT_PLUGINS})
 set (VERSION_TOMBOY "1.3.0")
 set (PACKAGE_TOMBOY "cd-tomboy")
@@ -643,6 +642,6 @@
 	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)
+	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)
 endif()

=== modified file 'Dbus/src/applet-dbus.c'
--- Dbus/src/applet-dbus.c	2010-09-07 00:39:20 +0000
+++ Dbus/src/applet-dbus.c	2010-10-02 18:13:46 +0000
@@ -282,9 +282,13 @@
 			}
 		}
 		if (pDbusApplet->pSubApplet != NULL)
+		{
 			g_object_unref (pDbusApplet->pSubApplet);
-		g_object_unref (pDbusApplet);
+			pDbusApplet->pSubApplet = NULL;
+		}
+		///g_object_unref (pDbusApplet);
 	}
+	g_list_foreach (myData.pAppletList, (GFunc)g_object_unref, NULL);
 	g_list_free (myData.pAppletList);
 	myData.pAppletList = NULL;
 	
@@ -434,7 +438,7 @@
 	gpointer invocation_hint G_GNUC_UNUSED,
 	gpointer marshal_data)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	typedef void (*GMarshalFunc_VOID__INT_STRING) (gpointer     data1,
 												gint        arg_1,
 												gchar 	   *arg_2,
@@ -468,7 +472,7 @@
 	gpointer invocation_hint G_GNUC_UNUSED,
 	gpointer marshal_data)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	typedef void (*GMarshalFunc_VOID__BOOLEAN_STRING) (gpointer     data1,
 												gboolean    arg_1,
 												gchar 	   *arg_2,
@@ -502,7 +506,7 @@
 	gpointer invocation_hint G_GNUC_UNUSED,
 	gpointer marshal_data)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer     data1,
 												gchar      *arg_1,
 												gchar 	   *arg_2,
@@ -536,7 +540,7 @@
 	gpointer invocation_hint G_GNUC_UNUSED,
 	gpointer marshal_data)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	typedef void (*GMarshalFunc_VOID__VALUE) (gpointer     data1,
 												GValue     *arg_1,
 												gpointer     data2);
@@ -568,7 +572,7 @@
 	gpointer invocation_hint G_GNUC_UNUSED,
 	gpointer marshal_data)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	typedef void (*GMarshalFunc_VOID__INT_VALUE) (gpointer     data1,
 												gint 		arg_1,
 												GValue     *arg_2,
@@ -602,7 +606,7 @@
 	gpointer invocation_hint G_GNUC_UNUSED,
 	gpointer marshal_data)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	typedef void (*GMarshalFunc_VOID__VALUE_STRING) (gpointer     data1,
 												GValue     *arg_1,
 												gchar 	   *arg_2,

=== modified file 'Dbus/src/interface-applet-methods.c'
--- Dbus/src/interface-applet-methods.c	2010-08-07 01:43:25 +0000
+++ Dbus/src/interface-applet-methods.c	2010-10-02 18:13:46 +0000
@@ -1145,7 +1145,7 @@
 		}
 		if (! cShortkeys[i])  // raccourci non trouve dans la nouvelle liste => on l'enleve
 		{
-			g_print (" shortkey '%s' not wanted anymore\n", key);
+			//g_print (" shortkey '%s' not wanted anymore\n", key);
 			cd_keybinder_unbind (key, (CDBindkeyHandler) cd_dbus_applet_emit_on_shortkey);
 			pDbusApplet->pShortkeyList = g_list_delete_link (pDbusApplet->pShortkeyList, sk);
 		}
@@ -1165,7 +1165,7 @@
 		}
 		if (! sk)  // raccourci non encore lie => on lie.
 		{
-			g_print (" shortkey '%s' wanted\n", cShortkey);
+			//g_print (" shortkey '%s' wanted\n", cShortkey);
 			bCouldBind = cd_keybinder_bind (cShortkey, (CDBindkeyHandler) cd_dbus_applet_emit_on_shortkey, pDbusApplet);
 			if (bCouldBind)
 				pDbusApplet->pShortkeyList = g_list_prepend (pDbusApplet->pShortkeyList, g_strdup (cShortkey));

=== modified file 'Dbus/src/interface-applet-object.c'
--- Dbus/src/interface-applet-object.c	2010-08-07 01:43:25 +0000
+++ Dbus/src/interface-applet-object.c	2010-10-02 18:13:46 +0000
@@ -78,7 +78,7 @@
 	for (a = myData.pAppletList; a != NULL; a = a->next)
 	{
 		pDbusApplet = a->data;
-		if (strcmp (cModuleName, pDbusApplet->cModuleName) == 0)
+		if (pDbusApplet->cModuleName && strcmp (cModuleName, pDbusApplet->cModuleName) == 0)
 			break ;
 	}
 	return (a ? pDbusApplet : NULL);
@@ -92,7 +92,7 @@
 	for (a = myData.pAppletList; a != NULL; a = a->next)
 	{
 		pDbusApplet = a->data;
-		if (strcmp (cModuleName, pDbusApplet->cModuleName) == 0)
+		if (pDbusApplet->cModuleName && strcmp (cModuleName, pDbusApplet->cModuleName) == 0)
 			break ;
 	}
 	myData.pAppletList = g_list_delete_link (myData.pAppletList, a);

=== modified file 'Dbus/src/interface-applet-signals.c'
--- Dbus/src/interface-applet-signals.c	2010-08-07 01:43:25 +0000
+++ Dbus/src/interface-applet-signals.c	2010-10-02 18:13:46 +0000
@@ -632,7 +632,7 @@
 	}
 	
 	const gchar *cText = gtk_entry_get_text (GTK_ENTRY (pEntry));
-	g_print (" -> %s\n", cText);
+	//g_print (" -> %s\n", cText);
 	g_value_set_string (&v, cText);
 	_emit_answer_dialog (pDbusApplet, pDialog, iClickedButton, &v);
 }

=== modified file 'Folders/src/applet-notifications.c'
--- Folders/src/applet-notifications.c	2010-09-07 00:39:20 +0000
+++ Folders/src/applet-notifications.c	2010-10-02 18:13:46 +0000
@@ -51,10 +51,10 @@
 	}
 	else if (CD_APPLET_CLICKED_ICON != NULL)
 	{
-		g_print ("clic on %s\n", CD_APPLET_CLICKED_ICON->cBaseURI);
+		//g_print ("clic on %s\n", CD_APPLET_CLICKED_ICON->cBaseURI);
 		if (CD_APPLET_CLICKED_ICON->iVolumeID == -1)
 		{
-			g_print ("folder\n");
+			//g_print ("folder\n");
 			
 			/// lister le repertoire dans un thread.
 			
@@ -350,7 +350,7 @@
 				app[1] = CD_APPLET_CLICKED_CONTAINER;
 				app[2] = myApplet;
 				app[3] = g_strdup (pAppInfo[1]);
-				g_print (" + %s (%s ; %s)\n", pAppInfo[0], pAppInfo[1], pAppInfo[2]);
+				//g_print (" + %s (%s ; %s)\n", pAppInfo[0], pAppInfo[1], pAppInfo[2]);
 				myData.pAppList = g_list_prepend (myData.pAppList, app);
 				
 				if (pAppInfo[2] != NULL)
@@ -364,7 +364,7 @@
 			g_list_free (pApps);
 		}
 		else
-			g_print ("no apps list for '%s'\n", CD_APPLET_CLICKED_ICON->cBaseURI);
+			//g_print ("no apps list for '%s'\n", CD_APPLET_CLICKED_ICON->cBaseURI);
 		
 		CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU);
 		CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Properties"), GTK_STOCK_PROPERTIES, _cd_folders_show_file_properties, CD_APPLET_MY_MENU, data);
@@ -381,7 +381,7 @@
 
 gboolean cd_folders_on_drop_data (gpointer data, const gchar *cReceivedData, Icon *icon, double fOrder, CairoContainer *pContainer)
 {
-	g_print ("Folders received '%s'\n", cReceivedData);
+	//g_print ("Folders received '%s'\n", cReceivedData);
 	
 	if (fOrder == CAIRO_DOCK_LAST_ORDER)  // lachage sur une icone.
 		return CAIRO_DOCK_LET_PASS_NOTIFICATION;
@@ -394,7 +394,7 @@
 	
 	if (g_file_test (cPath, G_FILE_TEST_IS_DIR))
 	{
-		g_print (" ajout d'un repertoire...\n");
+		//g_print (" ajout d'un repertoire...\n");
 		CairoDockModule *pModule = cairo_dock_find_module_from_name ("Folders");
 		g_return_val_if_fail (pModule != NULL, CAIRO_DOCK_LET_PASS_NOTIFICATION);
 		

=== modified file 'GMenu/src/applet-util.c'
--- GMenu/src/applet-util.c	2010-08-07 01:43:25 +0000
+++ GMenu/src/applet-util.c	2010-10-02 18:13:46 +0000
@@ -188,7 +188,7 @@
 	else
 		cCommandExpanded = g_strdup (cCommand);
 #endif //CD_EXPAND_FIELD_CODES
-	g_print ("cCommandExpanded : %s\n", cCommandExpanded);
+	//g_print ("cCommandExpanded : %s\n", cCommandExpanded);
 	return cCommandExpanded;
 }
 static void _launch_from_file (const gchar *cDesktopFilePath)

=== modified file 'Indicator-applet/indicator-applet.c'
--- Indicator-applet/indicator-applet.c	2010-09-07 00:39:20 +0000
+++ Indicator-applet/indicator-applet.c	2010-10-02 18:13:46 +0000
@@ -123,7 +123,7 @@
 		g_object_unref (pIndicator->pServiceProxy);
 	g_print ("destroy menu...\n");
 	if (pIndicator->pMenu)
-		g_object_ref_sink (pIndicator->pMenu);
+		g_object_unref (pIndicator->pMenu);
 	g_print ("done.\n");
 	g_free (pIndicator);
 }
@@ -140,14 +140,30 @@
 	if (cStatusIcon == NULL)
 		return;
 	
-	gchar *cIconPath = cairo_dock_search_icon_s_path (cStatusIcon);
+	const gchar *cIconName = cStatusIcon;
+	gchar *tmp_icon_name = NULL;
+	gchar *cIconPath = cairo_dock_search_icon_s_path (cIconName);  // on regarde si l'icone sera trouvee.
 	gchar *cIconPathFallback = NULL;
+	if (cIconPath == NULL)  // l'icone ne sera pas trouvee, on regarde si ce n'est pas une icone en carton d'Ubuntu.
+	{
+		gchar *str = g_strstr_len (cIconName, -1, "-panel");
+		if (str)
+		{
+			tmp_icon_name = g_strndup (cIconName, str - cIconName);
+			cIconName = tmp_icon_name;
+			cIconPath = cairo_dock_search_icon_s_path (cIconName);
+		}
+	}
 	if (cIconPath == NULL)  // l'icone ne sera pas trouvee, on met une icone par defaut.
-		cIconPathFallback = g_strdup_printf ("%s/%s.svg", myApplet->pModule->pVisitCard->cShareDataDir, cStatusIcon);
-	
-	g_print ("set %s\n", cIconPathFallback ? cIconPathFallback : cStatusIcon);
-	CD_APPLET_SET_IMAGE_ON_MY_ICON (cIconPathFallback ? cIconPathFallback : cStatusIcon);
-	
+	{
+		gboolean bAddSuffix = (!g_str_has_suffix (cIconName, ".png") && !g_str_has_suffix (cIconName, ".svg"));
+		cIconPathFallback = g_strdup_printf ("%s/%s%s", myApplet->pModule->pVisitCard->cShareDataDir, cIconName, bAddSuffix ? ".svg" : "");
+	}
+	
+	g_print ("set %s\n", cIconPathFallback ? cIconPathFallback : cIconName);
+	CD_APPLET_SET_IMAGE_ON_MY_ICON (cIconPathFallback ? cIconPathFallback : cIconName);
+	
+	g_free (tmp_icon_name);
 	g_free (cIconPath);
 	g_free (cIconPathFallback);
 }

=== modified file 'MeMenu/src/applet-me.c'
--- MeMenu/src/applet-me.c	2010-08-07 01:43:25 +0000
+++ MeMenu/src/applet-me.c	2010-10-02 18:13:46 +0000
@@ -46,14 +46,14 @@
 static void
 username_cb (DBusGProxy * proxy, const char * username, GError *error, CairoDockModuleInstance *myApplet)
 {
-	g_print (" + new username: '%s'\n", username);
+	//g_print (" + new username: '%s'\n", username);
 	CD_APPLET_SET_NAME_FOR_MY_ICON (username);  // username peut etre NULL ou vide, c'est pas genant.
 }
 
 static void
 username_changed (DBusGProxy * proxy, gchar * username, CairoDockModuleInstance *myApplet)
 {
-	g_print ("Changing username: '%s'\n", username);
+	//g_print ("Changing username: '%s'\n", username);
 	
 	return username_cb(proxy, username, NULL, myApplet);
 }
@@ -63,7 +63,7 @@
 {
 	g_return_if_fail(icons != NULL);
 	g_return_if_fail(icons[0] != '\0');
-	g_print (" + new icon: '%s'\n", icons);
+	//g_print (" + new icon: '%s'\n", icons);
 	
 	cd_indicator_set_icon (myData.pIndicator, icons);
 	CD_APPLET_REDRAW_MY_ICON;
@@ -74,7 +74,7 @@
 static void
 status_icon_changed (DBusGProxy * proxy, gchar * icon, CairoDockModuleInstance *myApplet)
 {
-	g_print ("Changing status icon: '%s'\n", icon);
+	//g_print ("Changing status icon: '%s'\n", icon);
 	
 	return status_icon_cb(proxy, icon, NULL, myApplet);
 }

=== modified file 'MeMenu/src/applet-menu.c'
--- MeMenu/src/applet-menu.c	2010-08-07 01:43:25 +0000
+++ MeMenu/src/applet-menu.c	2010-10-02 18:13:46 +0000
@@ -56,7 +56,7 @@
 	g_value_init (&value, G_TYPE_STRING);
 	g_value_set_static_string (&value, gtk_entry_get_text (entry));
 
-	g_print ("user typed: %s\n", g_value_get_string (&value));
+	//g_print ("user typed: %s\n", g_value_get_string (&value));
 	dbusmenu_menuitem_handle_event (mi, "send", &value, gtk_get_current_event_time());
 }
 

=== modified file 'Messaging-Menu/src/applet-menu.c'
--- Messaging-Menu/src/applet-menu.c	2010-08-07 01:43:25 +0000
+++ Messaging-Menu/src/applet-menu.c	2010-10-02 18:13:46 +0000
@@ -67,7 +67,7 @@
 static gboolean
 new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new());
 
 	gint padding = 4;
@@ -86,7 +86,7 @@
 	gtk_widget_show(icon);
 
 	/* Application name in a label */
-	g_print ("  name : %s\n", dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
+	//g_print ("  name : %s\n", dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
 	GtkWidget * label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, padding);
@@ -131,7 +131,7 @@
 static void
 indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, indicator_item_t * mi_data)
 {
-	g_print ("%s (%s)\n", __func__, prop);
+	//g_print ("%s (%s)\n", __func__, prop);
 	if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_LABEL)) {
 		/* Set the main label */
 		gtk_label_set_text(GTK_LABEL(mi_data->label), g_value_get_string(value));
@@ -180,7 +180,7 @@
 static gboolean
 new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
 	g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
 	/* Note: not checking parent, it's reasonable for it to be NULL */

=== modified file 'Messaging-Menu/src/applet-messaging.c'
--- Messaging-Menu/src/applet-messaging.c	2010-08-07 01:43:25 +0000
+++ Messaging-Menu/src/applet-messaging.c	2010-10-02 18:13:46 +0000
@@ -38,7 +38,7 @@
 static void
 attention_changed_cb (DBusGProxy * proxy, gboolean dot, CairoDockModuleInstance *myApplet)
 {
-	g_print ("%s (attention : %d)\n", __func__, dot);
+	//g_print ("%s (attention : %d)\n", __func__, dot);
 	if (dot)
 	{
 		cd_indicator_set_icon (myData.pIndicator, "indicator-messages-new");
@@ -58,7 +58,7 @@
 static void
 icon_changed_cb (DBusGProxy * proxy, gboolean hidden, CairoDockModuleInstance *myApplet)
 {
-	g_print ("%s (hidden : %d)\n", __func__, hidden);
+	//g_print ("%s (hidden : %d)\n", __func__, hidden);
 	if (hidden)
 	{
 		myIcon->fAlpha = .5;
@@ -116,7 +116,7 @@
 
 void cd_messaging_on_disconnect (CairoDockModuleInstance *myApplet)
 {
-	g_print ("disconnected\n");
+	//g_print ("disconnected\n");
 	cd_indicator_set_icon (myData.pIndicator, DEFAULT_ICON);  // If we're disconnecting, go back to offline.
 }
 

=== modified file 'RSSreader/src/applet-draw.c'
--- RSSreader/src/applet-draw.c	2010-08-07 01:43:25 +0000
+++ RSSreader/src/applet-draw.c	2010-10-02 18:13:46 +0000
@@ -30,6 +30,7 @@
 {
 	if (iWidth < 20 || iHeight < 20)  // inutile de dessiner tant que le desklet n'a pas atteint sa taille definitive.
 		return;
+	g_return_if_fail (myDrawContext != NULL);
 	cd_debug ("%s (%dx%d)", __func__, iWidth, iHeight);
 	PangoLayout *pLayout = pango_cairo_create_layout (myDrawContext);
 	PangoRectangle ink, log;

=== added directory 'Remote-Control'
=== added file 'Remote-Control/CMakeLists.txt'
--- Remote-Control/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ Remote-Control/CMakeLists.txt	2010-10-02 18:13:46 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(src)
+add_subdirectory(data)

=== added directory 'Remote-Control/data'
=== added file 'Remote-Control/data/CMakeLists.txt'
--- Remote-Control/data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ Remote-Control/data/CMakeLists.txt	2010-10-02 18:13:46 +0000
@@ -0,0 +1,11 @@
+########### subdirs if any ###############
+
+
+########### install files ###############
+
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Remote-Control.conf
+	preview.jpg
+	icon.png
+	arrows.svg
+	DESTINATION ${remote_controldatadir})
+

=== added file 'Remote-Control/data/Remote-Control.conf.in'
--- Remote-Control/data/Remote-Control.conf.in	1970-01-01 00:00:00 +0000
+++ Remote-Control/data/Remote-Control.conf.in	2010-10-02 18:13:46 +0000
@@ -0,0 +1,14 @@
+#!en;@VERSION_REMOTE_CONTROL@
+
+#[gtk-preferences]
+[Configuration]
+
+#k Shortkey to trigger the applet:
+shortkey = <Control>F9
+
+#a+ Animation of the current icon :
+animation=pulse
+
+#I[0;2000] Duration of the stop animation :
+#{In ms.}
+stop duration = 800

=== added file 'Remote-Control/data/arrows.svg'
--- Remote-Control/data/arrows.svg	1970-01-01 00:00:00 +0000
+++ Remote-Control/data/arrows.svg	2010-10-02 18:13:46 +0000
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2391"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   version="1.0"
+   sodipodi:docname="arrows.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2393">
+    <linearGradient
+       id="linearGradient2076">
+      <stop
+         id="stop2078"
+         offset="0.0000000"
+         style="stop-color:#afd9ed;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2080"
+         offset="1.0000000"
+         style="stop-color:#cfc3db;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2082"
+       x1="12.615197"
+       x2="48.374069"
+       xlink:href="#linearGradient2076"
+       y1="25.909756"
+       y2="62.720371" />
+    <linearGradient
+       id="linearGradient2088">
+      <stop
+         id="stop2090"
+         offset="0.0000000"
+         style="stop-color:#87a8b7;stop-opacity:1.0000000;" />
+      <stop
+         id="stop2092"
+         offset="1.0000000"
+         style="stop-color:#7f718e;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2086"
+       x1="12.615197"
+       x2="48.374069"
+       xlink:href="#linearGradient2088"
+       y1="25.909756"
+       y2="62.720371" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2399" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2088"
+       id="linearGradient2420"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
+       x1="12.615197"
+       y1="25.909756"
+       x2="48.374069"
+       y2="62.720371" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2076"
+       id="linearGradient2422"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
+       x1="12.615197"
+       y1="25.909756"
+       x2="48.374069"
+       y2="62.720371" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2088"
+       id="linearGradient2434"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
+       x1="12.615197"
+       y1="25.909756"
+       x2="48.374069"
+       y2="62.720371" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2076"
+       id="linearGradient2436"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
+       x1="12.615197"
+       y1="25.909756"
+       x2="48.374069"
+       y2="62.720371" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2088"
+       id="linearGradient2448"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
+       x1="12.615197"
+       y1="25.909756"
+       x2="48.374069"
+       y2="62.720371" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2076"
+       id="linearGradient2450"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
+       x1="12.615197"
+       y1="25.909756"
+       x2="48.374069"
+       y2="62.720371" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2088"
+       id="linearGradient2462"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
+       x1="12.615197"
+       y1="25.909756"
+       x2="48.374069"
+       y2="62.720371" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2076"
+       id="linearGradient2464"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
+       x1="12.615197"
+       y1="25.909756"
+       x2="48.374069"
+       y2="62.720371" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.3277206"
+     inkscape:cx="117.47785"
+     inkscape:cy="-15.977159"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="641"
+     inkscape:window-height="719"
+     inkscape:window-x="293"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata2396">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g2409"
+       transform="matrix(0,0.8161651,-1.764176,0,125.43391,77.398373)">
+      <path
+         d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
+         id="path2084"
+         style="fill:url(#linearGradient2420);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+      <path
+         d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
+         id="rect1303"
+         style="fill:url(#linearGradient2422);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+      <path
+         d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
+         id="path2096"
+         style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <rect
+         height="1"
+         id="rect2098"
+         rx="0.5"
+         ry="0.5"
+         style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
+         transform="scale(-1,-1)"
+         width="23"
+         x="-27.270832"
+         y="-28" />
+    </g>
+    <g
+       id="g2424"
+       transform="matrix(0,-0.8161651,-1.6782543,0,122.04356,52.382073)">
+      <path
+         d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
+         id="path2426"
+         style="fill:url(#linearGradient2434);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+      <path
+         d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
+         id="path2428"
+         style="fill:url(#linearGradient2436);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+      <path
+         d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
+         id="path2430"
+         style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <rect
+         height="1"
+         id="rect2432"
+         rx="0.5"
+         ry="0.5"
+         style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
+         transform="scale(-1,-1)"
+         width="23"
+         x="-27.270832"
+         y="-28" />
+    </g>
+    <g
+       id="g2438"
+       transform="matrix(-0.8161651,0,0,-1.6496137,51.134197,122.05924)">
+      <path
+         d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
+         id="path2440"
+         style="fill:url(#linearGradient2448);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+      <path
+         d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
+         id="path2442"
+         style="fill:url(#linearGradient2450);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+      <path
+         d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
+         id="path2444"
+         style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <rect
+         height="1"
+         id="rect2446"
+         rx="0.5"
+         ry="0.5"
+         style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
+         transform="scale(-1,-1)"
+         width="23"
+         x="-27.270832"
+         y="-28" />
+    </g>
+    <g
+       id="g2452"
+       transform="matrix(0.8161651,0,0,-1.6496137,77.748214,121.52667)">
+      <path
+         d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
+         id="path2454"
+         style="fill:url(#linearGradient2462);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+      <path
+         d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
+         id="path2456"
+         style="fill:url(#linearGradient2464);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+      <path
+         d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
+         id="path2458"
+         style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <rect
+         height="1"
+         id="rect2460"
+         rx="0.5"
+         ry="0.5"
+         style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
+         transform="scale(-1,-1)"
+         width="23"
+         x="-27.270832"
+         y="-28" />
+    </g>
+  </g>
+</svg>

=== added file 'Remote-Control/data/icon.png'
Binary files Remote-Control/data/icon.png	1970-01-01 00:00:00 +0000 and Remote-Control/data/icon.png	2010-10-02 18:13:46 +0000 differ
=== added file 'Remote-Control/data/preview.jpg'
Binary files Remote-Control/data/preview.jpg	1970-01-01 00:00:00 +0000 and Remote-Control/data/preview.jpg	2010-10-02 18:13:46 +0000 differ
=== added directory 'Remote-Control/src'
=== added file 'Remote-Control/src/CMakeLists.txt'
--- Remote-Control/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ Remote-Control/src/CMakeLists.txt	2010-10-02 18:13:46 +0000
@@ -0,0 +1,40 @@
+
+########### sources ###############
+
+SET(MODULE_SRCS
+	applet-struct.h
+	applet-init.c 			applet-init.h
+	applet-config.c 			applet-config.h
+	applet-session.c 			applet-session.h
+	applet-icon-finder.c 		applet-icon-finder.h
+	applet-notifications.c 		applet-notifications.h
+)
+
+add_library(${PACKAGE_REMOTE_CONTROL} SHARED ${MODULE_SRCS})
+
+########### compil ###############
+add_definitions (-DMY_APPLET_SHARE_DATA_DIR="${remote_controldatadir}")
+add_definitions (-DMY_APPLET_PREVIEW_FILE="preview.jpg")
+add_definitions (-DMY_APPLET_CONF_FILE="Remote-Control.conf")
+add_definitions (-DMY_APPLET_USER_DATA_DIR="Remote-Control")
+add_definitions (-DMY_APPLET_VERSION="${VERSION_REMOTE_CONTROL}")
+add_definitions (-DMY_APPLET_GETTEXT_DOMAIN="${GETTEXT_REMOTE_CONTROL}")
+add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}")
+add_definitions (-DMY_APPLET_ICON_FILE="icon.png")
+### uncomment the following line to allow multi-instance applet.
+#add_definitions (-DCD_APPLET_MULTI_INSTANCE="1")
+### uncomment the following line to allow extended OpenGL drawing.
+#add_definitions (-DGL_GLEXT_PROTOTYPES="1")
+
+include_directories (
+	${PACKAGE_INCLUDE_DIRS})
+
+link_directories (
+	${PACKAGE_LIBRARY_DIRS})
+
+target_link_libraries (${PACKAGE_REMOTE_CONTROL}
+	${PACKAGE_LIBRARIES})
+
+########### install files ###############
+
+install(TARGETS ${PACKAGE_REMOTE_CONTROL} DESTINATION ${pluginsdir})

=== added file 'Remote-Control/src/applet-config.c'
--- Remote-Control/src/applet-config.c	1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-config.c	2010-10-02 18:13:46 +0000
@@ -0,0 +1,51 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <string.h>
+#include <cairo-dock.h>
+
+#include "applet-struct.h"
+#include "applet-notifications.h"
+#include "applet-config.h"
+
+
+//\_________________ Here you have to get all your parameters from the conf file. Use the macros CD_CONFIG_GET_BOOLEAN, CD_CONFIG_GET_INTEGER, CD_CONFIG_GET_STRING, etc. myConfig has been reseted to 0 at this point. This function is called at the beginning of init and reload.
+CD_APPLET_GET_CONFIG_BEGIN
+	myConfig.cShortkeyNav = CD_CONFIG_GET_STRING ("Configuration", "shortkey");
+	myConfig.iCloseDuration = CD_CONFIG_GET_INTEGER ("Configuration", "stop duration");
+	myConfig.cIconAnimation = CD_CONFIG_GET_STRING ("Configuration", "animation");
+	
+CD_APPLET_GET_CONFIG_END
+
+
+//\_________________ Here you have to free all ressources allocated for myConfig. This one will be reseted to 0 at the end of this function. This function is called right before you get the applet's config, and when your applet is stopped, in the end.
+CD_APPLET_RESET_CONFIG_BEGIN
+	if (myConfig.cShortkeyNav)
+	{
+		cd_keybinder_unbind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav);
+		g_free (myConfig.cShortkeyNav);
+	}
+	
+CD_APPLET_RESET_CONFIG_END
+
+
+//\_________________ Here you have to free all ressources allocated for myData. This one will be reseted to 0 at the end of this function. This function is called when your applet is stopped, in the very end.
+CD_APPLET_RESET_DATA_BEGIN
+	
+CD_APPLET_RESET_DATA_END

=== added file 'Remote-Control/src/applet-config.h'
--- Remote-Control/src/applet-config.h	1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-config.h	2010-10-02 18:13:46 +0000
@@ -0,0 +1,30 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __APPLET_CONFIG__
+#define  __APPLET_CONFIG__
+
+#include <cairo-dock.h>
+
+
+CD_APPLET_CONFIG_H
+
+
+#endif

=== added file 'Remote-Control/src/applet-icon-finder.c'
--- Remote-Control/src/applet-icon-finder.c	1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-icon-finder.c	2010-10-02 18:13:46 +0000
@@ -0,0 +1,257 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "applet-struct.h"
+#include "applet-session.h"
+#include "applet-notifications.h"
+#include "applet-icon-finder.h"
+
+static inline gboolean _cd_do_icon_match (Icon *pIcon, const gchar *cCommandPrefix, int length)
+{
+	gboolean bMatch = FALSE;
+	if (pIcon->cBaseURI != NULL)
+	{
+		gchar *cFile = g_path_get_basename (pIcon->cCommand);
+		bMatch = (cFile && g_ascii_strncasecmp (cCommandPrefix, cFile, length) == 0);
+		g_free (cFile);
+	}
+	else if (pIcon->cCommand)
+	{
+		bMatch = (g_ascii_strncasecmp (cCommandPrefix, pIcon->cCommand, length) == 0);
+		if (!bMatch)
+		{
+			gchar *str = strchr (pIcon->cCommand, '-');  // on se limite au 1er tiret.
+			if (str && *(str-1) != ' ')  // on verifie qu'il n'est pas un tiret d'option
+			{
+				str ++;
+				bMatch = (g_strncasecmp (str, cCommandPrefix, length) == 0);
+			}
+			if (!bMatch && pIcon->cName)
+				bMatch = (g_ascii_strncasecmp (cCommandPrefix, pIcon->cName, length) == 0);
+		}
+	}
+	return bMatch;
+}
+
+static void _find_icon_in_dock_with_command (Icon *pIcon, CairoDock *pDock, gpointer *data)
+{
+	gchar *cCommandPrefix = data[0];
+	int length = GPOINTER_TO_INT (data[1]);
+	Icon *pAfterIcon = data[2];
+	Icon **pFoundIcon = data[3];
+	CairoDock **pFoundDock = data[4];
+	Icon **pFirstIcon = data[5];
+	CairoDock **pFirstParentDock = data[6];
+	if (pDock == g_pMainDock || *pFoundIcon != NULL) // on a deja cherche dans le main dock, ou deja trouve ce qu'on cherchait.
+		return ;
+	
+	gboolean bFound = _cd_do_icon_match (pIcon, cCommandPrefix, length);
+	if (bFound)
+	{
+		if (pAfterIcon == NULL)
+		{
+			*pFoundIcon = pIcon;
+			*pFoundDock = pDock;
+		}
+		else
+		{
+			if (*pFirstIcon == NULL)  // on garde une trace de la 1ere icone pour boucler dans la liste.
+			{
+				*pFirstIcon = pIcon;
+				*pFirstParentDock = g_pMainDock;
+			}
+			if (pIcon == pAfterIcon)
+			{
+				data[2] = NULL;
+			}
+		}
+	}
+}
+Icon *cd_do_search_icon_by_command (const gchar *cCommandPrefix, Icon *pAfterIcon, CairoDock **pDock)
+{
+	g_return_val_if_fail (cCommandPrefix != NULL, NULL);
+	
+	//\_________________ on cherche en premier dans le main dock, car il est deja visible.
+	int length = strlen (cCommandPrefix);
+	Icon *pIcon, *pFirstIcon = NULL;
+	CairoDock *pParentDock, *pFirstParentDock = NULL;
+	GList *ic;
+	for (ic = g_pMainDock->icons; ic != NULL; ic = ic->next)
+	{
+		pIcon = ic->data;
+		if (pIcon->cCommand && g_ascii_strncasecmp (cCommandPrefix, pIcon->cCommand, length) == 0)
+		{
+			if (pAfterIcon == NULL)
+			{
+				*pDock = g_pMainDock;
+				return pIcon;
+			}
+			else
+			{
+				if (pFirstIcon == NULL)  // on garde une trace de la 1ere icone pour boucler dans la liste.
+				{
+					pFirstIcon = pIcon;
+					pFirstParentDock = g_pMainDock;
+				}
+				if (pIcon == pAfterIcon)
+				{
+					pAfterIcon = NULL;
+				}
+			}
+		}
+	}
+	
+	//\_________________ si on a rien trouve on cherche dans tous les docks.
+	pIcon = NULL;
+	*pDock = NULL;
+	gpointer data[7];
+	data[0] = (gchar *)cCommandPrefix;
+	data[1] = GINT_TO_POINTER (length);
+	data[2] = pAfterIcon;
+	data[3] = &pIcon;
+	data[4] = pDock;
+	data[5] = &pFirstIcon;
+	data[6] = &pFirstParentDock;
+	cairo_dock_foreach_icons_in_docks ((CairoDockForeachIconFunc) _find_icon_in_dock_with_command, data);
+	
+	if (pIcon == NULL)
+	{
+		pIcon = pFirstIcon;
+		*pDock = pFirstParentDock;
+	}
+	return pIcon;
+}
+
+
+void cd_do_change_current_icon (Icon *pIcon, CairoDock *pDock)
+{
+	//\_________________ on gere le cachage et le montrage du dock precedent et actuel.
+	if (myData.pCurrentDock != NULL && pDock != myData.pCurrentDock)  // on remet au repos le dock precedemment anime.
+	{
+		cairo_dock_emit_leave_signal (CAIRO_CONTAINER (myData.pCurrentDock));
+		cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (myData.pCurrentDock), CAIRO_DOCK_RENDER_DOCK, (CairoDockNotificationFunc) cd_do_render, NULL);
+		cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (myData.pCurrentDock), CAIRO_DOCK_UPDATE_DOCK, (CairoDockNotificationFunc) cd_do_update_container, NULL);
+	}
+	if (pDock != NULL && pDock != myData.pCurrentDock)  // on montre le nouveau dock
+	{
+		if (pDock != NULL)
+		{
+			if (pDock->iRefCount > 0)
+			{
+				CairoDock *pParentDock = NULL;
+				Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (pDock, &pParentDock);
+				if (pPointingIcon != NULL)
+				{
+					cairo_dock_show_subdock (pPointingIcon, pParentDock);  // utile pour le montrage des sous-docks au clic.
+				}
+			}
+			else
+			{
+				/// utile de faire ca si on entre dedans ?...
+				if (pDock->bAutoHide)
+					cairo_dock_start_showing (pDock);
+				if (pDock->iVisibility == CAIRO_DOCK_VISI_KEEP_BELOW)
+					cairo_dock_pop_up (pDock);
+			}
+			cairo_dock_emit_enter_signal (CAIRO_CONTAINER (pDock));
+		}
+		
+		cairo_dock_register_notification_on_container (CAIRO_CONTAINER (pDock),
+			CAIRO_DOCK_UPDATE_DOCK,
+			(CairoDockNotificationFunc) cd_do_update_container,
+			CAIRO_DOCK_RUN_AFTER, NULL);
+		cairo_dock_register_notification_on_container (CAIRO_CONTAINER (pDock),
+			CAIRO_DOCK_RENDER_DOCK,
+			(CairoDockNotificationFunc) cd_do_render,
+			CAIRO_DOCK_RUN_AFTER, NULL);
+	}
+	if (pDock != NULL)
+	{
+		gtk_window_present (GTK_WINDOW (pDock->container.pWidget));
+	}
+	
+	//\_________________ on gere l'allumage et l'eteignage de l'icone precedente et actuelle.
+	if (myData.pCurrentIcon != NULL && pIcon != myData.pCurrentIcon)  // on remet au repos l'icone precedemment anime.
+	{
+		myData.bIgnoreIconState = TRUE;
+		cairo_dock_stop_icon_animation (myData.pCurrentIcon);
+		myData.bIgnoreIconState = FALSE;
+		cairo_dock_redraw_icon (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));  /// utile ?...
+	}
+	if (pIcon != NULL && myData.pCurrentIcon != pIcon)  // on anime la nouvelle icone.
+	{
+		int x = pIcon->fXAtRest + pIcon->fWidth/2 + (- pDock->fFlatDockWidth + pDock->iMaxDockWidth)/2;
+		int y = pIcon->fDrawY + pIcon->fHeight/2 * pIcon->fScale;
+		if (1||myData.pCurrentDock != pDock)
+		{
+			cairo_dock_emit_motion_signal (pDock,
+				x,
+				y);
+		}
+		else
+		{
+			myData.iPrevMouseX = myData.iMouseX;
+			myData.iPrevMouseY = myData.iMouseY;
+			myData.iMotionCount = 10;
+		}
+		myData.iMouseX = x;
+		myData.iMouseY = y;
+		cairo_dock_request_icon_animation (pIcon, pDock, myConfig.cIconAnimation, 1e6);  // interrompt l'animation de "mouse over".
+		cairo_dock_launch_animation (CAIRO_CONTAINER (pDock));
+		//if (myAccessibility.bShowSubDockOnClick)
+		//	cairo_dock_show_subdock (pIcon, pDock, FALSE);
+	}
+	
+	myData.pCurrentDock = pDock;
+	myData.pCurrentIcon = pIcon;
+	if (myData.pCurrentDock == NULL)
+		gtk_window_present (GTK_WINDOW (g_pMainDock->container.pWidget));
+}
+
+
+void cd_do_search_current_icon (gboolean bLoopSearch)
+{
+	//\_________________ on cherche un lanceur correspondant.
+	CairoDock *pDock;
+	Icon *pIcon = cd_do_search_icon_by_command (myData.sCurrentText->str, (bLoopSearch ? myData.pCurrentIcon : NULL), &pDock);
+	cd_debug ("found icon : %s\n", pIcon ? pIcon->cName : "none");
+	
+	//\_________________ on gere le changement d'icone/dock.
+	cd_do_change_current_icon (pIcon, pDock);
+}
+
+
+gboolean cairo_dock_emit_motion_signal (CairoDock *pDock, int iMouseX, int iMouseY)
+{
+	static gboolean bReturn;
+	static GdkEventMotion motion;
+	motion.state = 0;
+	motion.x = iMouseX;
+	motion.y = iMouseY;
+	motion.x_root = pDock->container.iWindowPositionX + pDock->container.iMouseX;
+	motion.y_root = pDock->container.iWindowPositionY + pDock->container.iMouseY;
+	motion.time = 0;
+	motion.window = pDock->container.pWidget->window;
+	motion.device = gdk_device_get_core_pointer ();
+	g_signal_emit_by_name (pDock->container.pWidget, "motion-notify-event", &motion, &bReturn);
+	return FALSE;
+}

=== added file 'Remote-Control/src/applet-icon-finder.h'
--- Remote-Control/src/applet-icon-finder.h	1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-icon-finder.h	2010-10-02 18:13:46 +0000
@@ -0,0 +1,40 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __APPLET_ICON_FINDER__
+#define  __APPLET_ICON_FINDER__
+
+#include <cairo-dock.h>
+#include "applet-struct.h"
+
+
+Icon *cd_do_search_icon_by_command (const gchar *cCommandPrefix, Icon *pAfterIcon, CairoDock **pDock);
+
+
+void cd_do_change_current_icon (Icon *pIcon, CairoDock *pDock);
+
+
+void cd_do_search_current_icon (gboolean bLoopSearch);
+
+
+gboolean cairo_dock_emit_motion_signal (CairoDock *pDock, int iMouseX, int iMouseY);
+
+
+#endif

=== added file 'Remote-Control/src/applet-init.c'
--- Remote-Control/src/applet-init.c	1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-init.c	2010-10-02 18:13:46 +0000
@@ -0,0 +1,66 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "stdlib.h"
+
+#include "applet-struct.h"
+#include "applet-config.h"
+#include "applet-notifications.h"
+#include "applet-session.h"
+#include "applet-init.h"
+
+
+CD_APPLET_DEFINE_BEGIN (("Remote-Control"),
+	2, 2, 0,
+	CAIRO_DOCK_CATEGORY_APPLET_FUN,
+	("This plug-in lets you control your dock from the keyboard,\n"
+	" or even a remote controller.\n"
+	"Press the shortcut (by default CTRL + F9),\n"
+	" then use the arrows to navigate into the docks and sub-docks,\n"
+	" or type the name of a launcher and press Tab to automatically jump to the next suitable launcher\n"
+	"Press Enter to click on the icon, Shift+Enter for Shift+click, Alt+Enter for middle click, and Ctrl+Enter for left click\n"
+	"Escape or the same shortkey will cancel."),
+	"Fabounet (Fabrice Rey)")
+	CD_APPLET_DEFINE_COMMON_APPLET_INTERFACE
+	CD_APPLET_SET_CONTAINER_TYPE (CAIRO_DOCK_MODULE_IS_PLUGIN);
+CD_APPLET_DEFINE_END
+
+
+//\___________ Here is where you initiate your applet. myConfig is already set at this point, and also myIcon, myContainer, myDock, myDesklet (and myDrawContext if you're in dock mode). The macro CD_APPLET_MY_CONF_FILE and CD_APPLET_MY_KEY_FILE can give you access to the applet's conf-file and its corresponding key-file (also available during reload). If you're in desklet mode, myDrawContext is still NULL, and myIcon's buffers has not been filled, because you may not need them then (idem when reloading).
+CD_APPLET_INIT_BEGIN
+	cd_keybinder_bind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav, myApplet);
+	
+CD_APPLET_INIT_END
+
+
+//\___________ 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
+	cd_do_exit_session ();
+	
+CD_APPLET_STOP_END
+
+
+//\___________ The reload occurs in 2 occasions : when the user changes the applet's config, and when the user reload the cairo-dock's config or modify the desklet's size. The macro CD_APPLET_MY_CONFIG_CHANGED can tell you this. myConfig has already been reloaded at this point if you're in the first case, myData is untouched. You also have the macro CD_APPLET_MY_CONTAINER_TYPE_CHANGED that can tell you if you switched from dock/desklet to desklet/dock mode.
+CD_APPLET_RELOAD_BEGIN
+	if (CD_APPLET_MY_CONFIG_CHANGED)
+	{
+		cd_keybinder_bind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav, myApplet);  // shortkey were unbinded during reset_config.
+		
+	}
+CD_APPLET_RELOAD_END

=== added file 'Remote-Control/src/applet-init.h'
--- Remote-Control/src/applet-init.h	1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-init.h	2010-10-02 18:13:46 +0000
@@ -0,0 +1,31 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __APPLET_INIT__
+#define  __APPLET_INIT__
+
+
+#include <cairo-dock.h>
+
+
+CD_APPLET_H
+
+
+#endif

=== added file 'Remote-Control/src/applet-notifications.c'
--- Remote-Control/src/applet-notifications.c	1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-notifications.c	2010-10-02 18:13:46 +0000
@@ -0,0 +1,480 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "applet-struct.h"
+#include "applet-icon-finder.h"
+#include "applet-session.h"
+#include "applet-notifications.h"
+
+#define _alpha_prompt(k,n) cos (G_PI/2*fabs ((double) ((k % (2*n)) - n) / n));
+
+const int s_iNbPromptAnimationSteps = 40;
+
+
+static inline int _orient_arrow (CairoContainer *pContainer, int iKeyVal)
+{
+	switch (iKeyVal)
+	{
+		case GDK_Up :
+			if (pContainer->bIsHorizontal)
+			{
+				if (!pContainer->bDirectionUp)
+					iKeyVal = GDK_Down;
+			}
+			else
+			{
+				iKeyVal = GDK_Left;
+			}
+		break;
+		
+		case GDK_Down :
+			if (pContainer->bIsHorizontal)
+			{
+				if (!pContainer->bDirectionUp)
+					iKeyVal = GDK_Up;
+			}
+			else
+			{
+				iKeyVal = GDK_Right;
+			}
+		break;
+		
+		case GDK_Left :
+			if (!pContainer->bIsHorizontal)
+			{
+				if (pContainer->bDirectionUp)
+					iKeyVal = GDK_Up;
+				else
+					iKeyVal = GDK_Down;
+			}
+		break;
+		
+		case GDK_Right :
+			if (!pContainer->bIsHorizontal)
+			{
+				if (pContainer->bDirectionUp)
+					iKeyVal = GDK_Down;
+				else
+					iKeyVal = GDK_Up;
+			}
+		break;
+		default:
+		break;
+
+	}
+	return iKeyVal;
+}
+static void _find_next_dock (CairoDock *pDock, gpointer *data)
+{
+	if (data[3] == NULL)  // first root dock in the list.
+		data[3] = pDock;
+	if (data[0] == pDock)  // this dock is the current one, we'll take the next one.
+		data[2] = GINT_TO_POINTER (TRUE);
+	else if (data[2])  // we take this one.
+		data[1] = pDock;
+}
+gboolean cd_do_key_pressed (gpointer pUserData, CairoContainer *pContainer, guint iKeyVal, guint iModifierType, const gchar *string)
+{
+	g_return_val_if_fail (cd_do_session_is_running (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
+	
+	const gchar *cKeyName = gdk_keyval_name (iKeyVal);
+	guint32 iUnicodeChar = gdk_keyval_to_unicode (iKeyVal);
+	cd_debug ("+ cKeyName : %s (%c, %s)\n", cKeyName, iUnicodeChar, string);
+	
+	if (iKeyVal == GDK_Escape)  // on clot la session.
+	{
+		cd_do_close_session ();
+	}
+	else if (iKeyVal == GDK_space && myData.sCurrentText->len == 0)  // pas d'espace en debut de chaine.
+	{
+		// on rejette.
+	}
+	else if (iKeyVal >= GDK_Shift_L && iKeyVal <= GDK_Hyper_R)  // on n'ecrit pas les modificateurs.
+	{
+		// on rejette.
+	}
+	else if (iKeyVal == GDK_Menu)  // emulation du clic droit.
+	{
+		if (myData.pCurrentIcon != NULL && myData.pCurrentDock != NULL)
+		{
+			myData.bIgnoreIconState = TRUE;
+			cairo_dock_stop_icon_animation (myData.pCurrentIcon);  // car on va perdre le focus.
+			myData.bIgnoreIconState = FALSE;
+			
+			GtkWidget *menu = cairo_dock_build_menu (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
+			cairo_dock_popup_menu_on_icon (menu, myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
+		}
+	}
+	else if (iKeyVal == GDK_BackSpace)  // on efface la derniere lettre.
+	{
+		if (myData.sCurrentText->len > 0)
+		{
+			cd_debug ("on efface la derniere lettre de %s (%d)\n", myData.sCurrentText->str, myData.sCurrentText->len);
+			
+			g_string_truncate (myData.sCurrentText, myData.sCurrentText->len-1);
+			
+			// on relance la recherche.
+			if (myData.pCurrentIcon == NULL)  // sinon l'icone actuelle convient toujours.
+				cd_do_search_current_icon (FALSE);
+		}
+	}
+	else if (iKeyVal == GDK_Tab)  // jump to next icon.
+	{
+		if (myData.sCurrentText->len > 0)
+		{
+			gboolean bPrevious = iModifierType & GDK_SHIFT_MASK;
+			// on cherche l'icone suivante.
+			cd_do_search_current_icon (TRUE);  // pCurrentIcon peut etre NULL si elle s'est faite detruire pendant la recherche, auquel cas on cherchera juste normalement.
+		}
+	}
+	else if (iKeyVal == GDK_Return)
+	{
+		if (myData.pCurrentIcon != NULL && myData.pCurrentDock != NULL)
+		{
+			cd_debug ("on clique sur l'icone '%s' [%d, %d]\n", myData.pCurrentIcon->cName, iModifierType, GDK_SHIFT_MASK);
+			
+			myData.bIgnoreIconState = TRUE;
+			if (iModifierType & GDK_MOD1_MASK)  // ALT
+			{
+				myData.bIgnoreIconState = TRUE;
+				cairo_dock_stop_icon_animation (myData.pCurrentIcon);  // car aucune animation ne va la remplacer.
+				myData.bIgnoreIconState = FALSE;
+				cairo_dock_notify (CAIRO_DOCK_MIDDLE_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock);
+			}
+			else if (iModifierType & GDK_CONTROL_MASK)  // CTRL
+			{
+				myData.bIgnoreIconState = TRUE;
+				cairo_dock_stop_icon_animation (myData.pCurrentIcon);  // car on va perdre le focus.
+				myData.bIgnoreIconState = FALSE;
+				
+				myData.pCurrentDock->bMenuVisible = TRUE;
+				GtkWidget *menu = cairo_dock_build_menu (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
+				cairo_dock_popup_menu_on_icon (menu, myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
+			}
+			else if (myData.pCurrentIcon != NULL)
+			{
+				cairo_dock_notify (CAIRO_DOCK_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock, iModifierType);
+				if (CAIRO_DOCK_IS_APPLI (myData.pCurrentIcon))
+					myData.iPreviouslyActiveWindow = 0;
+			}
+			if (myData.pCurrentIcon != NULL)
+				cairo_dock_start_icon_animation (myData.pCurrentIcon, myData.pCurrentDock);
+			myData.bIgnoreIconState = FALSE;
+			myData.pCurrentIcon = NULL;  // sinon on va interrompre l'animation en fermant la session.
+		}
+		cd_do_close_session ();
+	}
+	else if (iKeyVal == GDK_Left || iKeyVal == GDK_Right || iKeyVal == GDK_Up || iKeyVal == GDK_Down)
+	{
+		iKeyVal = _orient_arrow (pContainer, iKeyVal);
+		if (iKeyVal == GDK_Up)
+		{
+			if (myData.pCurrentIcon != NULL && myData.pCurrentIcon->pSubDock != NULL)
+			{
+				cd_debug ("on monte dans le sous-dock %s\n", myData.pCurrentIcon->cName);
+				Icon *pIcon = cairo_dock_get_first_icon (myData.pCurrentIcon->pSubDock->icons);
+				cd_do_change_current_icon (pIcon, myData.pCurrentIcon->pSubDock);
+			}
+		}
+		else if (iKeyVal == GDK_Down)
+		{
+			if (myData.pCurrentDock != NULL && myData.pCurrentDock->iRefCount > 0)
+			{
+				CairoDock *pParentDock = NULL;
+				Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (myData.pCurrentDock, &pParentDock);
+				if (pPointingIcon != NULL)
+				{
+					cd_debug ("on redescend dans le dock parent via %s\n", pPointingIcon->cName);
+					cd_do_change_current_icon (pPointingIcon, pParentDock);
+				}
+			}
+		}
+		else if (iKeyVal == GDK_Left)
+		{
+			if (myData.pCurrentDock == NULL)  // on initialise le deplacement.
+			{
+				myData.pCurrentDock = g_pMainDock;
+				int n = g_list_length (g_pMainDock->icons);
+				if (n > 0)
+				{
+					myData.pCurrentIcon =  g_list_nth_data (g_pMainDock->icons, (n-1) / 2);
+					if (CAIRO_DOCK_IS_SEPARATOR (myData.pCurrentIcon) && n > 1)
+						myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n+1) / 2);
+				}
+			}
+			if (myData.pCurrentDock->icons != NULL)
+			{
+				Icon *pPrevIcon = cairo_dock_get_previous_icon (myData.pCurrentDock->icons, myData.pCurrentIcon);
+				if (CAIRO_DOCK_IS_SEPARATOR (pPrevIcon))
+					pPrevIcon = cairo_dock_get_previous_icon (myData.pCurrentDock->icons, pPrevIcon);
+				if (pPrevIcon == NULL)  // pas trouve ou bien 1ere icone.
+				{
+					pPrevIcon = cairo_dock_get_last_icon (myData.pCurrentDock->icons);
+				}
+				
+				cd_debug ("on se deplace a gauche sur %s\n", pPrevIcon ? pPrevIcon->cName : "none");
+				cd_do_change_current_icon (pPrevIcon, myData.pCurrentDock);
+			}
+		}
+		else  // Gdk_Right.
+		{
+			if (myData.pCurrentDock == NULL)  // on initialise le deplacement.
+			{
+				myData.pCurrentDock = g_pMainDock;
+				int n = g_list_length (g_pMainDock->icons);
+				if (n > 0)
+				{
+					myData.pCurrentIcon =  g_list_nth_data (g_pMainDock->icons, (n-1) / 2);
+					if (CAIRO_DOCK_IS_SEPARATOR (myData.pCurrentIcon) && n > 1)
+						myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n+1) / 2);
+				}
+			}
+			if (myData.pCurrentDock->icons != NULL)
+			{
+				Icon *pNextIcon = cairo_dock_get_next_icon (myData.pCurrentDock->icons, myData.pCurrentIcon);
+				if (CAIRO_DOCK_IS_SEPARATOR (pNextIcon))
+					pNextIcon = cairo_dock_get_next_icon (myData.pCurrentDock->icons, pNextIcon);
+				if (pNextIcon == NULL)  // pas trouve ou bien 1ere icone.
+				{
+					pNextIcon = cairo_dock_get_first_icon (myData.pCurrentDock->icons);
+				}
+				
+				cd_debug ("on se deplace a gauche sur %s\n", pNextIcon ? pNextIcon->cName : "none");
+				cd_do_change_current_icon (pNextIcon, myData.pCurrentDock);
+			}
+		}
+	}
+	else if (iKeyVal == GDK_Page_Down || iKeyVal == GDK_Page_Up || iKeyVal == GDK_Home || iKeyVal == GDK_End)
+	{
+		if (iModifierType & GDK_CONTROL_MASK)  // changement de dock principal
+		{
+			gpointer data[4] = {myData.pCurrentDock, NULL, GINT_TO_POINTER (FALSE), NULL};
+			cairo_dock_foreach_root_docks ((GFunc) _find_next_dock, data);
+			CairoDock *pNextDock = data[1];
+			if (pNextDock == NULL)
+				pNextDock = data[3];
+			if (pNextDock != NULL)
+			{
+				Icon *pNextIcon = NULL;
+				int n = g_list_length (pNextDock->icons);
+				if (n > 0)
+				{
+					pNextIcon =  g_list_nth_data (pNextDock->icons, (n-1) / 2);
+					if (CAIRO_DOCK_IS_SEPARATOR (pNextIcon) && n > 1)
+						pNextIcon = g_list_nth_data (pNextDock->icons, (n+1) / 2);
+				}
+				cd_do_change_current_icon (pNextIcon, pNextDock);
+			}
+		}
+		
+		Icon *pIcon = (iKeyVal == GDK_Page_Up || iKeyVal == GDK_Home ? cairo_dock_get_first_icon (myData.pCurrentDock->icons) : cairo_dock_get_last_icon (myData.pCurrentDock->icons));
+		cd_debug ("on se deplace a l'extremite sur %s\n", pIcon ? pIcon->cName : "none");
+		cd_do_change_current_icon (pIcon, myData.pCurrentDock);
+	}
+	else if (string)  /// utiliser l'unichar ...
+	{
+		cd_debug ("string:'%s'\n", string);
+		g_string_append_c (myData.sCurrentText, *string);
+		
+		cd_do_search_current_icon (FALSE);
+	}
+	
+	return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
+}
+
+
+void cd_do_on_shortkey_nav (const char *keystring, gpointer data)
+{
+	if (! cd_do_session_is_running ())
+	{
+		cd_do_open_session ();
+	}
+	else
+	{
+		cd_do_close_session ();
+	}
+}
+
+
+gboolean cd_do_update_container (gpointer pUserData, CairoContainer *pContainer, gboolean *bContinueAnimation)
+{
+	g_return_val_if_fail (!cd_do_session_is_off (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
+	
+	if (myData.iMotionCount != 0)
+	{
+		myData.iMotionCount --;
+		double f = (double) myData.iMotionCount / 10;
+		cairo_dock_emit_motion_signal (CAIRO_DOCK (pContainer),
+			f * myData.iPrevMouseX + (1-f) * myData.iMouseX,
+			f * myData.iPrevMouseY + (1-f) * myData.iMouseY);
+		*bContinueAnimation = TRUE;
+	}
+	
+	int iDeltaT = cairo_dock_get_animation_delta_t (pContainer);
+	if (cd_do_session_is_closing ())
+	{
+		//\___________________ animation de fermeture de la session (disparition des lettres ou du prompt).
+		myData.iCloseTime -= iDeltaT;
+		if (myData.iCloseTime <= 0)
+			cd_do_exit_session ();
+		else
+			*bContinueAnimation = TRUE;
+		cairo_dock_redraw_container (pContainer);
+	}
+	else if (cd_do_session_is_running ())
+	{
+		//\___________________ animation du prompt.
+		myData.iPromptAnimationCount ++;
+		*bContinueAnimation = TRUE;
+		
+		cairo_dock_redraw_container (pContainer);
+	}
+	
+	return CAIRO_DOCK_LET_PASS_NOTIFICATION;
+}
+
+
+gboolean cd_do_check_icon_stopped (gpointer pUserData, Icon *pIcon)
+{
+	if (pIcon == myData.pCurrentIcon && ! myData.bIgnoreIconState)
+	{
+		cd_debug ("notre icone vient de se faire stopper\n");
+		myData.pCurrentIcon = NULL;
+		myData.pCurrentDock = NULL;
+		
+		// eventuellement emuler un TAB pour trouver la suivante ...
+	}
+	
+	return CAIRO_DOCK_LET_PASS_NOTIFICATION;
+}
+
+
+static void _check_dock_is_active (gchar *cDockName, CairoDock *pDock, Window *data)
+{
+	Window xActiveWindow = data[0];
+	if (GDK_WINDOW_XID (pDock->container.pWidget->window) == xActiveWindow)
+		data[1] = 1;
+}
+gboolean cd_do_check_active_dock (gpointer pUserData, Window *XActiveWindow)
+{
+	if (myData.sCurrentText == NULL || XActiveWindow == NULL)
+		return CAIRO_DOCK_LET_PASS_NOTIFICATION;
+	Window data[2] = {*XActiveWindow, 0};
+	cairo_dock_foreach_docks ((GHFunc) _check_dock_is_active, data);
+	
+	if (data[1] == 0)
+		gtk_window_present (GTK_WINDOW (g_pMainDock->container.pWidget));
+	return CAIRO_DOCK_LET_PASS_NOTIFICATION;
+}
+
+
+static void _render_cairo (CairoContainer *pContainer, cairo_t *pCairoContext)
+{
+	double fAlpha;
+	if (myData.iCloseTime != 0) // animation de fin
+		fAlpha = (double) myData.iCloseTime / myConfig.iCloseDuration;
+	else
+		fAlpha = 1.;
+	
+	if (myData.pArrowImage->pSurface != NULL)
+	{
+		double fFrameWidth = myData.pArrowImage->iWidth;
+		double fFrameHeight = myData.pArrowImage->iHeight;
+		
+		double fDockOffsetX, fDockOffsetY;  // Offset du coin haut gauche du prompt.
+		if (pContainer->bIsHorizontal)
+		{
+			fDockOffsetX = (pContainer->iWidth - fFrameWidth) / 2;
+			fDockOffsetY = (pContainer->iHeight - fFrameHeight) / 2;
+		}
+		else
+		{
+			fDockOffsetY = (pContainer->iWidth - fFrameWidth) / 2;
+			fDockOffsetX = (pContainer->iHeight - fFrameHeight) / 2;
+		}
+		
+		fAlpha *= _alpha_prompt (myData.iPromptAnimationCount, s_iNbPromptAnimationSteps);
+		
+		if (fAlpha != 0)
+		{
+			cairo_translate (pCairoContext, fDockOffsetX, fDockOffsetY);
+			cairo_dock_draw_surface (pCairoContext, myData.pArrowImage->pSurface, fFrameWidth, fFrameHeight, pContainer->bDirectionUp, pContainer->bIsHorizontal, fAlpha);
+		}
+	}
+}
+
+static void _render_opengl (CairoContainer *pContainer)
+{
+	double fAlpha;
+	if (myData.iCloseTime != 0) // animation de fin
+		fAlpha = (double) myData.iCloseTime / myConfig.iCloseDuration;
+	else
+		fAlpha = 1.;
+	
+	if (myData.pArrowImage->iTexture != 0)
+	{
+		double fFrameWidth = myData.pArrowImage->iWidth;
+		double fFrameHeight = myData.pArrowImage->iHeight;
+		
+		double fDockOffsetX, fDockOffsetY;  // Offset du coin haut gauche du prompt.
+		fDockOffsetX = (pContainer->iWidth - fFrameWidth) / 2;
+		fDockOffsetY = (pContainer->iHeight - fFrameHeight) / 2;
+		
+		fAlpha *= _alpha_prompt (myData.iPromptAnimationCount, s_iNbPromptAnimationSteps);
+		
+		if (fAlpha != 0)
+		{
+			glPushMatrix ();
+			
+			cairo_dock_set_container_orientation_opengl (pContainer);
+			
+			glTranslatef (pContainer->iWidth/2, pContainer->iHeight/2, 0.);
+			
+			_cairo_dock_enable_texture ();
+			_cairo_dock_set_blend_alpha ();
+			
+			_cairo_dock_apply_texture_at_size_with_alpha (myData.pArrowImage->iTexture, fFrameWidth, fFrameHeight, fAlpha);
+			
+			_cairo_dock_disable_texture ();
+			
+			glPopMatrix();
+		}
+	}
+}
+
+gboolean cd_do_render (gpointer pUserData, CairoContainer *pContainer, cairo_t *pCairoContext)
+{
+	g_return_val_if_fail (!cd_do_session_is_off (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
+	
+	if (pCairoContext != NULL)
+	{
+		_render_cairo (pContainer, pCairoContext);
+	}
+	else
+	{
+		_render_opengl (pContainer);
+	}
+	
+	return CAIRO_DOCK_LET_PASS_NOTIFICATION;
+}

=== added file 'Remote-Control/src/applet-notifications.h'
--- Remote-Control/src/applet-notifications.h	1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-notifications.h	2010-10-02 18:13:46 +0000
@@ -0,0 +1,45 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __APPLET_NOTIFICATIONS__
+#define  __APPLET_NOTIFICATIONS__
+
+#include <cairo-dock.h>
+
+
+gboolean cd_do_key_pressed (gpointer pUserData, CairoContainer *pContainer, guint iKeyVal, guint iModifierType, const gchar *string);
+
+
+void cd_do_on_shortkey_nav (const char *keystring, gpointer data);
+
+
+gboolean cd_do_update_container (gpointer pUserData, CairoContainer *pContainer, gboolean *bContinueAnimation);
+
+
+gboolean cd_do_check_icon_stopped (gpointer pUserData, Icon *pIcon);
+
+
+gboolean cd_do_check_active_dock (gpointer pUserData, Window *XActiveWindow);
+
+
+gboolean cd_do_render (gpointer pUserData, CairoContainer *pContainer, cairo_t *pCairoContext);
+
+
+#endif

=== added file 'Remote-Control/src/applet-session.c'
--- Remote-Control/src/applet-session.c	1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-session.c	2010-10-02 18:13:46 +0000
@@ -0,0 +1,154 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "applet-struct.h"
+#include "applet-notifications.h"
+#include "applet-icon-finder.h"
+#include "applet-session.h"
+
+
+void cd_do_open_session (void)
+{
+	if (cd_do_session_is_running ())  // session already running
+		return;
+	
+	// register to draw on dock.
+	/**if (cd_do_session_is_off ())
+	{
+		cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock),
+			CAIRO_DOCK_UPDATE_DOCK,
+			(CairoDockNotificationFunc) cd_do_update_container,
+			CAIRO_DOCK_RUN_AFTER, NULL);
+		cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock),
+			CAIRO_DOCK_RENDER_DOCK,
+			(CairoDockNotificationFunc) cd_do_render,
+			CAIRO_DOCK_RUN_AFTER, NULL);
+	}*/
+	
+	// wait for keyboard input.
+	cairo_dock_register_notification (CAIRO_DOCK_KEY_PRESSED, (CairoDockNotificationFunc) cd_do_key_pressed, CAIRO_DOCK_RUN_AFTER, NULL);
+	cairo_dock_register_notification (CAIRO_DOCK_STOP_ICON, (CairoDockNotificationFunc) cd_do_check_icon_stopped, CAIRO_DOCK_RUN_AFTER, NULL);
+	cairo_dock_register_notification (CAIRO_DOCK_WINDOW_ACTIVATED, (CairoDockNotificationFunc) cd_do_check_active_dock, CAIRO_DOCK_RUN_AFTER, NULL);
+	
+	myData.sCurrentText = g_string_sized_new (20);
+	myData.iPromptAnimationCount = 0;
+	if (myData.pArrowImage == NULL)
+	{
+		myData.pArrowImage = cairo_dock_create_image_buffer (MY_APPLET_SHARE_DATA_DIR"/arrows.svg",
+			g_pMainDock->iMaxDockHeight,
+			g_pMainDock->iMaxDockHeight,
+			CAIRO_DOCK_KEEP_RATIO);
+	}
+	
+	// set initial position.
+	myData.pCurrentDock = NULL;
+	myData.pCurrentIcon =  NULL;
+	
+	CairoDock *pDock = g_pMainDock;
+	Icon *pIcon = NULL;
+	int n = g_list_length (g_pMainDock->icons);
+	if (n > 0)
+	{
+		pIcon =  g_list_nth_data (pDock->icons, (n-1) / 2);
+		if (CAIRO_DOCK_IS_SEPARATOR (pIcon) && n > 1)
+			pIcon = g_list_nth_data (pDock->icons, (n+1) / 2);
+	}
+	cd_do_change_current_icon (pIcon, pDock);
+	
+	// show main dock.
+	myData.bIgnoreIconState = TRUE;
+	cairo_dock_emit_enter_signal (CAIRO_CONTAINER (g_pMainDock));
+	myData.bIgnoreIconState = FALSE;
+	
+	// give focus to main dock for inputs.
+	myData.iPreviouslyActiveWindow = cairo_dock_get_active_xwindow ();
+	
+	///gtk_window_present (GTK_WINDOW (g_pMainDock->container.pWidget));
+	gtk_window_present_with_time (GTK_WINDOW (g_pMainDock->container.pWidget), gdk_x11_get_server_time (g_pMainDock->container.pWidget->window));  // pour eviter la prevention du vol de focus.
+	cairo_dock_freeze_docks (TRUE);
+	
+	// launch animation.
+	cairo_dock_launch_animation (CAIRO_CONTAINER (g_pMainDock));
+	
+	myData.iSessionState = 2;
+}
+
+void cd_do_close_session (void)
+{
+	if (! cd_do_session_is_running ())  // session not running
+		return;
+	
+	// no more keyboard input.
+	cairo_dock_remove_notification_func (CAIRO_DOCK_KEY_PRESSED, (CairoDockNotificationFunc) cd_do_key_pressed, NULL);
+	cairo_dock_remove_notification_func (CAIRO_DOCK_STOP_ICON, (CairoDockNotificationFunc) cd_do_check_icon_stopped, NULL);
+	cairo_dock_remove_notification_func (CAIRO_DOCK_WINDOW_ACTIVATED, (CairoDockNotificationFunc) cd_do_check_active_dock, NULL);
+	
+	g_string_free (myData.sCurrentText, TRUE);
+	myData.sCurrentText = NULL;
+	
+	// give back focus.
+	if (myData.iPreviouslyActiveWindow != 0)
+	{
+		// ne le faire que si on a encore le focus, sinon c'est que l'utilisateur a change lui-meme de fenetre...
+		Window iActiveWindow = cairo_dock_get_active_xwindow ();
+		if (myData.pCurrentDock && iActiveWindow == GDK_WINDOW_XID (myData.pCurrentDock->container.pWidget->window))
+			cairo_dock_show_xwindow (myData.iPreviouslyActiveWindow);
+		
+		myData.iPreviouslyActiveWindow = 0;
+	}
+	
+	// reset session state.
+	if (myData.pCurrentIcon != NULL)
+	{
+		myData.bIgnoreIconState = TRUE;
+		cairo_dock_stop_icon_animation (myData.pCurrentIcon);
+		myData.bIgnoreIconState = FALSE;
+		myData.pCurrentIcon = NULL;
+	}
+	
+	if (myData.pCurrentDock != NULL)
+	{
+		cairo_dock_emit_leave_signal (CAIRO_CONTAINER (myData.pCurrentDock));
+	}
+	
+	// launch closing animation.
+	myData.iCloseTime = myConfig.iCloseDuration;
+	cairo_dock_launch_animation (CAIRO_CONTAINER (g_pMainDock));
+	cairo_dock_freeze_docks (FALSE);
+	
+	myData.iSessionState = 1;
+}
+
+
+void cd_do_exit_session (void)
+{
+	if (cd_do_session_is_off ())  // session already off
+		return;
+	
+	cd_do_close_session ();
+	
+	myData.iCloseTime = 0;
+	
+	cd_do_change_current_icon (NULL, NULL);
+	
+	myData.iSessionState = 0;
+}

=== added file 'Remote-Control/src/applet-session.h'
--- Remote-Control/src/applet-session.h	1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-session.h	2010-10-02 18:13:46 +0000
@@ -0,0 +1,38 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __APPLET_SESSION__
+#define  __APPLET_SESSION__
+
+#include <cairo-dock.h>
+#include "applet-struct.h"
+
+
+void cd_do_open_session (void);
+
+void cd_do_close_session (void);
+
+void cd_do_exit_session (void);
+
+#define cd_do_session_is_running(...) (myData.iSessionState == 2)
+#define cd_do_session_is_closing(...) (myData.iSessionState == 1)
+#define cd_do_session_is_off(...) (myData.iSessionState == 0)
+
+
+#endif

=== added file 'Remote-Control/src/applet-struct.h'
--- Remote-Control/src/applet-struct.h	1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-struct.h	2010-10-02 18:13:46 +0000
@@ -0,0 +1,51 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail    : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __CD_APPLET_STRUCT__
+#define  __CD_APPLET_STRUCT__
+
+#include <cairo-dock.h>
+
+//\___________ structure containing the applet's configuration parameters.
+struct _AppletConfig {
+	gchar *cShortkeyNav;
+	gchar *cIconAnimation;
+	gint iCloseDuration;
+	} ;
+
+//\___________ structure containing the applet's data, like surfaces, dialogs, results of calculus, etc.
+struct _AppletData {
+	gint iSessionState;  // 0:no session, 1: session closing, 2: session running
+	GString *sCurrentText;
+	CairoDockImageBuffer *pArrowImage;
+	gint iPromptAnimationCount;
+	gint iCloseTime;
+	Window iPreviouslyActiveWindow;
+	Icon *pCurrentIcon;
+	CairoDock *pCurrentDock;
+	gboolean bIgnoreIconState;
+	
+	int iPrevMouseX, iPrevMouseY;
+	int iMouseX, iMouseY;
+	int iMotionCount;
+	} ;
+
+
+#endif

=== modified file 'Scooby-Do/data/CMakeLists.txt'
--- Scooby-Do/data/CMakeLists.txt	2010-08-07 01:43:25 +0000
+++ Scooby-Do/data/CMakeLists.txt	2010-10-02 18:13:46 +0000
@@ -9,7 +9,6 @@
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Scooby-Do.conf
 	preview.jpg
 	icon.png
-	arrows.svg
 	active-button.svg
 	inactive-button.svg
 	internet.png

=== modified file 'Scooby-Do/data/Scooby-Do.conf.in'
--- Scooby-Do/data/Scooby-Do.conf.in	2010-08-07 01:43:25 +0000
+++ Scooby-Do/data/Scooby-Do.conf.in	2010-10-02 18:13:46 +0000
@@ -6,9 +6,6 @@
 #k Shortkey to enable/disable the finder mode:
 shortkey search = <Control>Return
 
-#k Shortkey to enable/disable the navigation mode:
-shortkey = <Control>F9
-
 #i[10;200] Maximum number of results :
 #{Maximum number of mails that will be previewed. Put -1 to show the maximum possible.}
 nb results = 80

=== removed file 'Scooby-Do/data/arrows.svg'
--- Scooby-Do/data/arrows.svg	2009-10-05 19:27:17 +0000
+++ Scooby-Do/data/arrows.svg	1970-01-01 00:00:00 +0000
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg2391"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="arrows.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2393">
-    <linearGradient
-       id="linearGradient2076">
-      <stop
-         id="stop2078"
-         offset="0.0000000"
-         style="stop-color:#afd9ed;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2080"
-         offset="1.0000000"
-         style="stop-color:#cfc3db;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2082"
-       x1="12.615197"
-       x2="48.374069"
-       xlink:href="#linearGradient2076"
-       y1="25.909756"
-       y2="62.720371" />
-    <linearGradient
-       id="linearGradient2088">
-      <stop
-         id="stop2090"
-         offset="0.0000000"
-         style="stop-color:#87a8b7;stop-opacity:1.0000000;" />
-      <stop
-         id="stop2092"
-         offset="1.0000000"
-         style="stop-color:#7f718e;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2086"
-       x1="12.615197"
-       x2="48.374069"
-       xlink:href="#linearGradient2088"
-       y1="25.909756"
-       y2="62.720371" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2399" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2088"
-       id="linearGradient2420"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
-       x1="12.615197"
-       y1="25.909756"
-       x2="48.374069"
-       y2="62.720371" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2076"
-       id="linearGradient2422"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
-       x1="12.615197"
-       y1="25.909756"
-       x2="48.374069"
-       y2="62.720371" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2088"
-       id="linearGradient2434"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
-       x1="12.615197"
-       y1="25.909756"
-       x2="48.374069"
-       y2="62.720371" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2076"
-       id="linearGradient2436"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
-       x1="12.615197"
-       y1="25.909756"
-       x2="48.374069"
-       y2="62.720371" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2088"
-       id="linearGradient2448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
-       x1="12.615197"
-       y1="25.909756"
-       x2="48.374069"
-       y2="62.720371" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2076"
-       id="linearGradient2450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
-       x1="12.615197"
-       y1="25.909756"
-       x2="48.374069"
-       y2="62.720371" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2088"
-       id="linearGradient2462"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
-       x1="12.615197"
-       y1="25.909756"
-       x2="48.374069"
-       y2="62.720371" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2076"
-       id="linearGradient2464"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
-       x1="12.615197"
-       y1="25.909756"
-       x2="48.374069"
-       y2="62.720371" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.3277206"
-     inkscape:cx="117.47785"
-     inkscape:cy="-15.977159"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="641"
-     inkscape:window-height="719"
-     inkscape:window-x="293"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata2396">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2409"
-       transform="matrix(0,0.8161651,-1.764176,0,125.43391,77.398373)">
-      <path
-         d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
-         id="path2084"
-         style="fill:url(#linearGradient2420);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
-      <path
-         d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
-         id="rect1303"
-         style="fill:url(#linearGradient2422);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
-      <path
-         d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
-         id="path2096"
-         style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         height="1"
-         id="rect2098"
-         rx="0.5"
-         ry="0.5"
-         style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
-         transform="scale(-1,-1)"
-         width="23"
-         x="-27.270832"
-         y="-28" />
-    </g>
-    <g
-       id="g2424"
-       transform="matrix(0,-0.8161651,-1.6782543,0,122.04356,52.382073)">
-      <path
-         d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
-         id="path2426"
-         style="fill:url(#linearGradient2434);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
-      <path
-         d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
-         id="path2428"
-         style="fill:url(#linearGradient2436);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
-      <path
-         d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
-         id="path2430"
-         style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         height="1"
-         id="rect2432"
-         rx="0.5"
-         ry="0.5"
-         style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
-         transform="scale(-1,-1)"
-         width="23"
-         x="-27.270832"
-         y="-28" />
-    </g>
-    <g
-       id="g2438"
-       transform="matrix(-0.8161651,0,0,-1.6496137,51.134197,122.05924)">
-      <path
-         d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
-         id="path2440"
-         style="fill:url(#linearGradient2448);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
-      <path
-         d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
-         id="path2442"
-         style="fill:url(#linearGradient2450);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
-      <path
-         d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
-         id="path2444"
-         style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         height="1"
-         id="rect2446"
-         rx="0.5"
-         ry="0.5"
-         style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
-         transform="scale(-1,-1)"
-         width="23"
-         x="-27.270832"
-         y="-28" />
-    </g>
-    <g
-       id="g2452"
-       transform="matrix(0.8161651,0,0,-1.6496137,77.748214,121.52667)">
-      <path
-         d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
-         id="path2454"
-         style="fill:url(#linearGradient2462);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
-      <path
-         d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
-         id="path2456"
-         style="fill:url(#linearGradient2464);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
-      <path
-         d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
-         id="path2458"
-         style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         height="1"
-         id="rect2460"
-         rx="0.5"
-         ry="0.5"
-         style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
-         transform="scale(-1,-1)"
-         width="23"
-         x="-27.270832"
-         y="-28" />
-    </g>
-  </g>
-</svg>

=== modified file 'Scooby-Do/src/applet-appli-finder.h'
--- Scooby-Do/src/applet-appli-finder.h	2009-10-05 19:27:17 +0000
+++ Scooby-Do/src/applet-appli-finder.h	2010-10-02 18:13:46 +0000
@@ -17,11 +17,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #ifndef __APPLET_APPLI_FINDER__
 #define  __APPLET_APPLI_FINDER__
 
-
 #include <cairo-dock.h>
 #include "applet-struct.h"
 

=== modified file 'Scooby-Do/src/applet-config.c'
--- Scooby-Do/src/applet-config.c	2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-config.c	2010-10-02 18:13:46 +0000
@@ -60,7 +60,6 @@
 
 //\_________________ Here you have to get all your parameters from the conf file. Use the macros CD_CONFIG_GET_BOOLEAN, CD_CONFIG_GET_INTEGER, CD_CONFIG_GET_STRING, etc. myConfig has been reseted to 0 at this point. This function is called at the beginning of init and reload.
 CD_APPLET_GET_CONFIG_BEGIN
-	myConfig.cShortkeyNav = CD_CONFIG_GET_STRING ("Configuration", "shortkey");
 	myConfig.cShortkeySearch = CD_CONFIG_GET_STRING ("Configuration", "shortkey search");
 	myConfig.iAppearanceDuration = CD_CONFIG_GET_INTEGER ("Configuration", "appear duration");
 	myConfig.iCloseDuration = CD_CONFIG_GET_INTEGER ("Configuration", "stop duration");
@@ -126,10 +125,6 @@
 
 //\_________________ Here you have to free all ressources allocated for myConfig. This one will be reseted to 0 at the end of this function. This function is called right before you get the applet's config, and when your applet is stopped, in the end.
 CD_APPLET_RESET_CONFIG_BEGIN
-	//g_print ("%s / %s\n", myConfig.cShortkeyNav, myConfig.cShortkeySearch);
-	if (myConfig.cShortkeyNav)
-		cd_keybinder_unbind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav);
-	g_free (myConfig.cShortkeyNav);
 	if (myConfig.cShortkeySearch)
 		cd_keybinder_unbind (myConfig.cShortkeySearch, (CDBindkeyHandler) cd_do_on_shortkey_search);
 	g_free (myConfig.cShortkeySearch);
@@ -154,10 +149,6 @@
 		cairo_surface_destroy (myData.pPromptSurface);
 	if (myData.iPromptTexture != 0)
 		_cairo_dock_delete_texture (myData.iPromptTexture);
-	if (myData.pArrowSurface != NULL)
-		cairo_surface_destroy (myData.pArrowSurface);
-	if (myData.iArrowTexture != 0)
-		_cairo_dock_delete_texture (myData.iArrowTexture);
 	if (myData.pScoobySurface != NULL)
 		cairo_surface_destroy (myData.pScoobySurface);
 	if (myData.pActiveButtonSurface != NULL)

=== modified file 'Scooby-Do/src/applet-draw.c'
--- Scooby-Do/src/applet-draw.c	2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-draw.c	2010-10-02 18:13:46 +0000
@@ -91,7 +91,7 @@
 	
 	if (myData.pCharList == NULL && myData.pListingHistory == NULL)  // aucune lettre de tapee => on montre le prompt.
 	{
-		if (! myData.bNavigationMode && myData.pPromptSurface != NULL)
+		if (myData.pPromptSurface != NULL)
 		{
 			double fFrameWidth = myData.iPromptWidth;
 			double fFrameHeight = myData.iPromptHeight;
@@ -105,30 +105,11 @@
 			if (fAlpha != 0)
 			{
 				cairo_translate (pCairoContext, fDockOffsetX, fDockOffsetY);
-				cairo_dock_draw_surface (pCairoContext, myData.pArrowSurface, fFrameWidth, fFrameHeight, pMainDock->container.bDirectionUp, pMainDock->container.bIsHorizontal, fAlpha);
+				cairo_dock_draw_surface (pCairoContext, myData.pPromptSurface, fFrameWidth, fFrameHeight, pMainDock->container.bDirectionUp, pMainDock->container.bIsHorizontal, fAlpha);
 				//cairo_set_source_surface (pCairoContext, myData.pPromptSurface, 0., 0.);
 				//cairo_paint_with_alpha (pCairoContext, fAlpha);
 			}
 		}
-		else if (myData.bNavigationMode && myData.pArrowSurface != NULL)
-		{
-			double fFrameWidth = myData.iArrowWidth;
-			double fFrameHeight = myData.iArrowHeight;
-			
-			double fDockOffsetX, fDockOffsetY;  // Offset du coin haut gauche du prompt.
-			fDockOffsetX = (pMainDock->container.iWidth - fFrameWidth) / 2;
-			fDockOffsetY = (pMainDock->container.iHeight - fFrameHeight) / 2;
-			
-			fAlpha *= _alpha_prompt (myData.iPromptAnimationCount, s_iNbPromptAnimationSteps);
-			
-			if (fAlpha != 0)
-			{
-				cairo_translate (pCairoContext, fDockOffsetX, fDockOffsetY);
-				cairo_dock_draw_surface (pCairoContext, myData.pArrowSurface, fFrameWidth, fFrameHeight, pMainDock->container.bDirectionUp, pMainDock->container.bIsHorizontal, fAlpha);
-				//cairo_set_source_surface (pCairoContext, myData.pArrowSurface, 0., 0.);
-				//cairo_paint_with_alpha (pCairoContext, fAlpha);
-			}
-		}
 	}
 	else  // si du texte a ete entre, on le dessine, ainsi que eventuellement la liste des icones correspondantes.
 	{
@@ -282,7 +263,7 @@
 	
 	if (myData.pCharList == NULL && myData.pListingHistory == NULL)  // aucune lettre de tapee => on montre le prompt.
 	{
-		if (! myData.bNavigationMode && myData.iPromptTexture != 0)
+		if (myData.iPromptTexture != 0)
 		{
 			double fFrameWidth = myData.iPromptWidth;
 			double fFrameHeight = myData.iPromptHeight;
@@ -310,34 +291,6 @@
 				glPopMatrix();
 			}
 		}
-		else if (myData.bNavigationMode && myData.iArrowTexture != 0)
-		{
-			double fFrameWidth = myData.iArrowWidth;
-			double fFrameHeight = myData.iArrowHeight;
-						
-			double fDockOffsetX, fDockOffsetY;  // Offset du coin haut gauche du prompt.
-			fDockOffsetX = (pMainDock->container.iWidth - fFrameWidth) / 2;
-			fDockOffsetY = (pMainDock->container.iHeight - fFrameHeight) / 2;
-			
-			fAlpha *= _alpha_prompt (myData.iPromptAnimationCount, s_iNbPromptAnimationSteps);
-			
-			if (fAlpha != 0)
-			{
-				glPushMatrix ();
-				if (! pMainDock->container.bIsHorizontal)
-					glRotatef (pMainDock->container.bDirectionUp ? 90. : -90., 0., 0., 1.);
-				glTranslatef (pMainDock->container.iWidth/2, pMainDock->container.iHeight/2, 0.);
-				
-				_cairo_dock_enable_texture ();
-				_cairo_dock_set_blend_alpha ();
-				
-				_cairo_dock_apply_texture_at_size_with_alpha (myData.iArrowTexture, fFrameWidth, fFrameHeight, fAlpha);
-				
-				_cairo_dock_disable_texture ();
-				
-				glPopMatrix();
-			}
-		}
 	}
 	else  // si du texte a ete entre, on le dessine, ainsi que eventuellement la liste des icones correspondantes.
 	{

=== modified file 'Scooby-Do/src/applet-icon-finder.c'
--- Scooby-Do/src/applet-icon-finder.c	2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-icon-finder.c	2010-10-02 18:13:46 +0000
@@ -52,197 +52,6 @@
 	return bMatch;
 }
 
-static void _find_icon_in_dock_with_command (Icon *pIcon, CairoDock *pDock, gpointer *data)
-{
-	gchar *cCommandPrefix = data[0];
-	int length = GPOINTER_TO_INT (data[1]);
-	Icon *pAfterIcon = data[2];
-	Icon **pFoundIcon = data[3];
-	CairoDock **pFoundDock = data[4];
-	Icon **pFirstIcon = data[5];
-	CairoDock **pFirstParentDock = data[6];
-	if (pDock == g_pMainDock || *pFoundIcon != NULL) // on a deja cherche dans le main dock, ou deja trouve ce qu'on cherchait.
-		return ;
-	
-	gboolean bFound = _cd_do_icon_match (pIcon, cCommandPrefix, length);
-	if (bFound)
-	{
-		if (pAfterIcon == NULL)
-		{
-			*pFoundIcon = pIcon;
-			*pFoundDock = pDock;
-		}
-		else
-		{
-			if (*pFirstIcon == NULL)  // on garde une trace de la 1ere icone pour boucler dans la liste.
-			{
-				*pFirstIcon = pIcon;
-				*pFirstParentDock = g_pMainDock;
-			}
-			if (pIcon == pAfterIcon)
-			{
-				data[2] = NULL;
-			}
-		}
-	}
-}
-Icon *cd_do_search_icon_by_command (const gchar *cCommandPrefix, Icon *pAfterIcon, CairoDock **pDock)
-{
-	g_return_val_if_fail (cCommandPrefix != NULL, NULL);
-	
-	//\_________________ on cherche en premier dans le main dock, car il est deja visible.
-	int length = strlen (cCommandPrefix);
-	Icon *pIcon, *pFirstIcon = NULL;
-	CairoDock *pParentDock, *pFirstParentDock = NULL;
-	GList *ic;
-	for (ic = g_pMainDock->icons; ic != NULL; ic = ic->next)
-	{
-		pIcon = ic->data;
-		if (pIcon->cCommand && g_ascii_strncasecmp (cCommandPrefix, pIcon->cCommand, length) == 0)
-		{
-			if (pAfterIcon == NULL)
-			{
-				*pDock = g_pMainDock;
-				return pIcon;
-			}
-			else
-			{
-				if (pFirstIcon == NULL)  // on garde une trace de la 1ere icone pour boucler dans la liste.
-				{
-					pFirstIcon = pIcon;
-					pFirstParentDock = g_pMainDock;
-				}
-				if (pIcon == pAfterIcon)
-				{
-					pAfterIcon = NULL;
-				}
-			}
-		}
-	}
-	
-	//\_________________ si on a rien trouve on cherche dans tous les docks.
-	pIcon = NULL;
-	*pDock = NULL;
-	gpointer data[7];
-	data[0] = (gchar *)cCommandPrefix;
-	data[1] = GINT_TO_POINTER (length);
-	data[2] = pAfterIcon;
-	data[3] = &pIcon;
-	data[4] = pDock;
-	data[5] = &pFirstIcon;
-	data[6] = &pFirstParentDock;
-	cairo_dock_foreach_icons_in_docks ((CairoDockForeachIconFunc) _find_icon_in_dock_with_command, data);
-	
-	if (pIcon == NULL)
-	{
-		pIcon = pFirstIcon;
-		*pDock = pFirstParentDock;
-	}
-	return pIcon;
-}
-
-
-void cd_do_change_current_icon (Icon *pIcon, CairoDock *pDock)
-{
-	//\_________________ on gere le cachage et le montrage du dock precedent et actuel.
-	if (myData.pCurrentDock != NULL && pDock != myData.pCurrentDock && myData.pCurrentDock != g_pMainDock)  // on remet au repos dock precedemment anime.
-	{
-		cairo_dock_emit_leave_signal (myData.pCurrentDock);
-	}
-	if (pDock != NULL && pDock != g_pMainDock && pDock != myData.pCurrentDock)  // on montre le nouveau dock
-	{
-		if (pDock != NULL)
-		{
-			if (pDock->iRefCount > 0)
-			{
-				CairoDock *pParentDock = NULL;
-				Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (pDock, &pParentDock);
-				if (pPointingIcon != NULL)
-				{
-					cairo_dock_show_subdock (pPointingIcon, pParentDock);  // utile pour le montrage des sous-docks au clic.
-				}
-			}
-			else
-			{
-				///cairo_dock_pop_up (pDock);
-			}
-			cairo_dock_emit_enter_signal (pDock);
-		}
-	}
-	if (pDock != NULL)
-	{
-		
-		gtk_window_present (GTK_WINDOW (pDock->container.pWidget));
-	}
-	
-	//\_________________ on gere l'allumage et l'eteignage de l'icone precedente et actuelle.
-	if (myData.pCurrentIcon != NULL && pIcon != myData.pCurrentIcon)  // on remet au repos l'icone precedemment anime.
-	{
-		myData.bIgnoreIconState = TRUE;
-		cairo_dock_stop_icon_animation (myData.pCurrentIcon);
-		myData.bIgnoreIconState = FALSE;
-		cairo_dock_redraw_icon (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));  /// utile ?...
-	}
-	if (pIcon != NULL && myData.pCurrentIcon != pIcon)  // on anime la nouvelle icone.
-	{
-		int x = pIcon->fXAtRest + pIcon->fWidth/2 + (- pDock->fFlatDockWidth + pDock->iMaxDockWidth)/2;
-		int y = pIcon->fDrawY + pIcon->fHeight/2 * pIcon->fScale;
-		if (1||myData.pCurrentDock != pDock)
-		{
-			cairo_dock_emit_motion_signal (pDock,
-				x,
-				y);
-		}
-		else
-		{
-			myData.iPrevMouseX = myData.iMouseX;
-			myData.iPrevMouseY = myData.iMouseY;
-			myData.iMotionCount = 10;
-		}
-		myData.iMouseX = x;
-		myData.iMouseY = y;
-		cairo_dock_request_icon_animation (pIcon, pDock, myConfig.cIconAnimation, 1e6);  // interrompt l'animation de "mouse over".
-		cairo_dock_launch_animation (CAIRO_CONTAINER (pDock));
-		//if (myAccessibility.bShowSubDockOnClick)
-		//	cairo_dock_show_subdock (pIcon, pDock, FALSE);
-	}
-	
-	myData.pCurrentDock = pDock;
-	myData.pCurrentIcon = pIcon;
-	if (myData.pCurrentDock == NULL)
-		gtk_window_present (GTK_WINDOW (g_pMainDock->container.pWidget));
-}
-
-
-void cd_do_search_current_icon (gboolean bLoopSearch)
-{
-	//\_________________ on cherche un lanceur correspondant.
-	CairoDock *pDock;
-	Icon *pIcon = cd_do_search_icon_by_command (myData.sCurrentText->str, (bLoopSearch ? myData.pCurrentIcon : NULL), &pDock);
-	cd_debug ("found icon : %s\n", pIcon ? pIcon->cName : "none");
-	
-	//\_________________ on gere le changement d'icone/dock.
-	cd_do_change_current_icon (pIcon, pDock);
-}
-
-
-gboolean cairo_dock_emit_motion_signal (CairoDock *pDock, int iMouseX, int iMouseY)
-{
-	static gboolean bReturn;
-	static GdkEventMotion motion;
-	motion.state = 0;
-	motion.x = iMouseX;
-	motion.y = iMouseY;
-	motion.x_root = pDock->container.iWindowPositionX + pDock->container.iMouseX;
-	motion.y_root = pDock->container.iWindowPositionY + pDock->container.iMouseY;
-	motion.time = 0;
-	motion.window = pDock->container.pWidget->window;
-	motion.device = gdk_device_get_core_pointer ();
-	g_signal_emit_by_name (pDock->container.pWidget, "motion-notify-event", &motion, &bReturn);
-	return FALSE;
-}
-
-
 
 static inline void _cd_do_search_matching_icons_in_dock (CairoDock *pDock)
 {
@@ -270,7 +79,7 @@
 		return;
 	cd_debug ("%s (%s)\n", __func__, myData.sCurrentText->str);
 	gchar *str = strchr (myData.sCurrentText->str, ' ');  // on ne compte pas les arguments d'une eventuelle commande deja tapee.
-	int length = myData.sCurrentText->len;
+	guint length = myData.sCurrentText->len;
 	if (str != NULL)
 	{
 		g_string_set_size (myData.sCurrentText, str - myData.sCurrentText->str + 1);
@@ -279,22 +88,13 @@
 		
 	if (myData.pMatchingIcons == NULL)
 	{
-		if (myData.bSessionStartedAutomatically)  // on cherche dans le dock courant.
-		{
-			cd_debug ("on cherche dans le dock\n");
-			_cd_do_search_matching_icons_in_dock (myData.pCurrentDock);
-			myData.pMatchingIcons = g_list_reverse (myData.pMatchingIcons);
-		}
-		else
-		{
-			cd_debug ("on cherche tout\n");
-			// on parcours tous les docks.
-			cairo_dock_foreach_icons_in_docks ((CairoDockForeachIconFunc) _cd_do_search_in_one_dock, NULL);
-			myData.pMatchingIcons = g_list_reverse (myData.pMatchingIcons);
-			
-			// on rajoute les icones ne venant pas du dock.
-			cd_do_find_matching_applications ();
-		}
+		cd_debug ("on cherche tout\n");
+		// on parcours tous les docks.
+		cairo_dock_foreach_icons_in_docks ((CairoDockForeachIconFunc) _cd_do_search_in_one_dock, NULL);
+		myData.pMatchingIcons = g_list_reverse (myData.pMatchingIcons);
+		
+		// on rajoute les icones ne venant pas du dock.
+		cd_do_find_matching_applications ();
 	}
 	else  // optimisation : on peut se contenter de chercher parmi les icones deja trouvees.
 	{
@@ -317,7 +117,7 @@
 	myData.iCurrentMatchingOffset = 0;
 	if (myData.pCurrentApplicationToLoad != NULL)  // on va continuer le chargement sur la sous-liste.
 		myData.pCurrentApplicationToLoad = myData.pMatchingIcons;  // comme l'ordre de la liste n'a pas ete altere, on n'est sur de ne pas sauter d'icone.
-	cairo_dock_redraw_container (CAIRO_CONTAINER (myData.pCurrentDock));
+	cairo_dock_redraw_container (CAIRO_CONTAINER (g_pMainDock));
 	//g_print ("%d / %d\n", length , myData.sCurrentText->len);
 	if (length != myData.sCurrentText->len)
 		g_string_set_size (myData.sCurrentText, length);

=== modified file 'Scooby-Do/src/applet-icon-finder.h'
--- Scooby-Do/src/applet-icon-finder.h	2009-10-05 19:27:17 +0000
+++ Scooby-Do/src/applet-icon-finder.h	2010-10-02 18:13:46 +0000
@@ -17,7 +17,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #ifndef __APPLET_ICON_FINDER__
 #define  __APPLET_ICON_FINDER__
 

=== modified file 'Scooby-Do/src/applet-init.c'
--- Scooby-Do/src/applet-init.c	2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-init.c	2010-10-02 18:13:46 +0000
@@ -36,22 +36,18 @@
 CD_APPLET_DEFINE_BEGIN ("Scooby-Do",
 	2, 1, 4,
 	CAIRO_DOCK_CATEGORY_APPLET_SYSTEM,
-	N_("This plug-in allows you to make different actions directly from the keyboard.\n"
-	"It has 2 modes, each one being triggered by a keyboard shortcut:\n\n"
-	"- the finder mode (default shortcut : CTRL + Enter) :\n"
-	"    It lets you find and launch applications, files, recent files, firefox bookmarks, commands, and even calculations.\n"
-	"    Type what you want to search, the results will be displayed in real time.\n"
-	"    The first results of each category are displayed in the main listing.\n"
-	"    Use the up/down arrows to navigate inside the list,\n"
-	"    and use the left/right arrows to enter into a category, or to display more actions (when a little arrow is drawn next to text).\n"
-	"    Once inside a category, you can filter the results by typing some letters.\n"
-	"    Press Enter to validate, maintain SHIFT or ALT to keep the list of results opened.\n\n"
-	"- the navigation mode (default shortcut : CTRL + F9) :\n"
-	"    use the arrows to navigate into the docks and sub-docks,\n"
-	"    or type the name of a launcher and press Tab to automatically jump to the next suitable launcher\n"
-	"    press Enter to click on the icon, Shift+Enter for Shift+click, Alt+Enter for middle click, and Ctrl+Enter for left click\n"
+	("This plug-in allows you to make different actions directly from the keyboard.\n"
+	"It is triggered by a keyboard shortcut (by default: CTRL + Enter):\n"
+	"It lets you find and launch applications, files, recent files, firefox bookmarks, commands, and even calculations.\n"
+	"Type what you want to search, the results will be displayed in real time.\n"
+	"The first results of each category are displayed in the main listing.\n"
+	"Use the up/down arrows to navigate inside the list,\n"
+	" and use the left/right arrows to enter into a category, or to display more actions (when a little arrow is drawn next to text).\n"
+	"Once inside a category, you can filter the results by typing some letters.\n"
+	"Press Enter to validate, maintain SHIFT or ALT to keep the list of results opened.\n"
 	"Escape or the same shortkey will cancel."),
 	"Fabounet (Fabrice Rey)")
+	CD_APPLET_DEFINE_COMMON_APPLET_INTERFACE
 	CD_APPLET_SET_CONTAINER_TYPE (CAIRO_DOCK_MODULE_IS_PLUGIN);
 CD_APPLET_DEFINE_END
 
@@ -70,7 +66,6 @@
 CD_APPLET_INIT_BEGIN
 	cairo_dock_register_notification (CAIRO_DOCK_KEY_PRESSED, (CairoDockNotificationFunc) cd_do_key_pressed, CAIRO_DOCK_RUN_AFTER, NULL);
 	
-	cd_keybinder_bind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav, myApplet);
 	cd_keybinder_bind (myConfig.cShortkeySearch, (CDBindkeyHandler) cd_do_on_shortkey_search, myApplet);
 	
 	_register_backends ();
@@ -97,7 +92,6 @@
 		cd_do_destroy_listing (myData.pListing);
 		myData.pListing = NULL;
 		
-		cd_keybinder_bind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav, myApplet);  // shortkey were unbinded during reset_config.
 		cd_keybinder_bind (myConfig.cShortkeySearch, (CDBindkeyHandler) cd_do_on_shortkey_search, myApplet);  // shortkey were unbinded during reset_config.
 		
 		if (myData.sCurrentText != NULL)  // peu probable.

=== modified file 'Scooby-Do/src/applet-notifications.c'
--- Scooby-Do/src/applet-notifications.c	2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-notifications.c	2010-10-02 18:13:46 +0000
@@ -32,7 +32,7 @@
 
 gboolean cd_do_render (gpointer pUserData, CairoContainer *pContainer, cairo_t *pCairoContext)
 {
-	g_return_val_if_fail (cd_do_session_is_running (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
+	g_return_val_if_fail (!cd_do_session_is_off (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
 	
 	if (pCairoContext != NULL)
 	{
@@ -49,17 +49,7 @@
 
 gboolean cd_do_update_container (gpointer pUserData, CairoContainer *pContainer, gboolean *bContinueAnimation)
 {
-	g_return_val_if_fail (cd_do_session_is_running (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
-	
-	if (myData.iMotionCount != 0)
-	{
-		myData.iMotionCount --;
-		double f = (double) myData.iMotionCount / 10;
-		cairo_dock_emit_motion_signal (CAIRO_DOCK (pContainer),
-			f * myData.iPrevMouseX + (1-f) * myData.iMouseX,
-			f * myData.iPrevMouseY + (1-f) * myData.iMouseY);
-		*bContinueAnimation = TRUE;
-	}
+	g_return_val_if_fail (!cd_do_session_is_off (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
 	
 	int iDeltaT = cairo_dock_get_animation_delta_t (pContainer);
 	if (cd_do_session_is_closing ())
@@ -72,7 +62,7 @@
 			*bContinueAnimation = TRUE;
 		cairo_dock_redraw_container (pContainer);
 	}
-	else if (cd_do_session_is_waiting_for_input ())
+	else if (cd_do_session_is_running ())
 	{
 		if (myData.pCharList == NULL)
 		{
@@ -137,31 +127,6 @@
 }*/
 
 
-gboolean cd_do_check_icon_stopped (gpointer pUserData, Icon *pIcon)
-{
-	if (pIcon == myData.pCurrentIcon && ! myData.bIgnoreIconState)
-	{
-		cd_debug ("notre icone vient de se faire stopper\n");
-		myData.pCurrentIcon = NULL;
-		myData.pCurrentDock = NULL;
-		
-		// eventuellement emuler un TAB pour trouver la suivante ...
-	}
-	if (myData.pMatchingIcons != NULL)
-	{
-		myData.pMatchingIcons = g_list_remove (myData.pMatchingIcons, pIcon);
-		if (myData.pCurrentMatchingElement && myData.pCurrentMatchingElement->data == pIcon)
-			myData.pCurrentMatchingElement = NULL;
-		if (myData.pCurrentApplicationToLoad && myData.pCurrentApplicationToLoad->data == pIcon)
-		{
-			myData.pCurrentApplicationToLoad = myData.pCurrentApplicationToLoad->next;
-		}
-	}
-	
-	return CAIRO_DOCK_LET_PASS_NOTIFICATION;
-}
-
-
 static void _check_dock_is_active (gchar *cDockName, CairoDock *pDock, Window *data)
 {
 	Window xActiveWindow = data[0];
@@ -170,6 +135,8 @@
 }
 gboolean cd_do_check_active_dock (gpointer pUserData, Window *XActiveWindow)
 {
+	g_return_val_if_fail (cd_do_session_is_running (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
+	
 	if (myData.sCurrentText == NULL || XActiveWindow == NULL)
 		return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 	Window data[2] = {*XActiveWindow, 0};
@@ -181,73 +148,10 @@
 }
 
 
-static void _place_menu (GtkMenu *menu,
-	gint *x,
-	gint *y,
-	gboolean *push_in,
-	gpointer user_data)
-{
-	/// gerer les docks verticaux ...
-	*x = myData.pCurrentDock->container.iWindowPositionX + myData.pCurrentDock->container.iMouseX;
-	*y = myData.pCurrentDock->container.iWindowPositionY;
-	*push_in = TRUE;
-}
-
-static inline int _orient_arrow (CairoContainer *pContainer, int iKeyVal)
-{
-	switch (iKeyVal)
-	{
-		case GDK_Up :
-			if (pContainer->bIsHorizontal)
-			{
-				if (!pContainer->bDirectionUp)
-					iKeyVal = GDK_Down;
-			}
-			else
-			{
-				iKeyVal = GDK_Left;
-			}
-		break;
-		
-		case GDK_Down :
-			if (pContainer->bIsHorizontal)
-			{
-				if (!pContainer->bDirectionUp)
-					iKeyVal = GDK_Up;
-			}
-			else
-			{
-				iKeyVal = GDK_Right;
-			}
-		break;
-		
-		case GDK_Left :
-			if (!pContainer->bIsHorizontal)
-			{
-				if (pContainer->bDirectionUp)
-					iKeyVal = GDK_Up;
-				else
-					iKeyVal = GDK_Down;
-			}
-		break;
-		
-		case GDK_Right :
-			if (!pContainer->bIsHorizontal)
-			{
-				if (pContainer->bDirectionUp)
-					iKeyVal = GDK_Down;
-				else
-					iKeyVal = GDK_Up;
-			}
-		break;
-		default:
-		break;
-
-	}
-	return iKeyVal;
-}
 gboolean cd_do_key_pressed (gpointer pUserData, CairoContainer *pContainer, guint iKeyVal, guint iModifierType, const gchar *string)
 {
+	g_return_val_if_fail (cd_do_session_is_running (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
+	
 	if (myData.sCurrentText == NULL)
 		return CAIRO_DOCK_LET_PASS_NOTIFICATION;
 	
@@ -267,30 +171,6 @@
 	{
 		// on rejette.
 	}
-	else if (iKeyVal == GDK_Menu)  // emulation du clic droit.
-	{
-		if (myData.bNavigationMode)
-		{
-			if (myData.pCurrentIcon != NULL)
-			{
-				myData.bIgnoreIconState = TRUE;
-				cairo_dock_stop_icon_animation (myData.pCurrentIcon);  // car on va perdre le focus.
-				myData.bIgnoreIconState = FALSE;
-			}
-			if (myData.pCurrentDock == NULL)
-				myData.pCurrentDock = g_pMainDock;
-			myData.pCurrentDock->bMenuVisible = TRUE;
-			GtkWidget *menu = cairo_dock_build_menu (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
-			gtk_widget_show_all (menu);
-			gtk_menu_popup (GTK_MENU (menu),
-				NULL,
-				NULL,
-				(GtkMenuPositionFunc) _place_menu,  // pour positionner le menu sur le dock plutot que sur la souris.
-				NULL,
-				1,
-				gtk_get_current_event_time ());
-		}
-	}
 	else if (iKeyVal == GDK_BackSpace)  // on efface la derniere lettre.
 	{
 		if (myData.iNbValidCaracters > 0)
@@ -303,38 +183,31 @@
 			cd_do_delete_invalid_caracters ();
 			
 			// on relance la recherche.
-			if (myData.bNavigationMode)
-			{
-				if (myData.pCurrentIcon == NULL)  // sinon l'icone actuelle convient toujours.
-					cd_do_search_current_icon (FALSE);
-			}
-			else  // mode recherche.
-			{
-				if (myData.pListingHistory == NULL)  // recherche principale.
-				{
-					g_list_free (myData.pMatchingIcons);
-					myData.pMatchingIcons = NULL;
-					cd_do_search_matching_icons ();
-					if (myData.pMatchingIcons == NULL && myData.sCurrentText->len > 0)  // on n'a trouve aucun programme, on cherche des entrees.
-					{
-						if (myData.iSidLoadExternAppliIdle != 0)
-						{
-							g_source_remove (myData.iSidLoadExternAppliIdle);
-							myData.iSidLoadExternAppliIdle = 0;
-						}
-						cd_do_launch_all_backends ();
-					}
-					else  // on a trouve au moins un programme, on cache le listing des fichiers.
-					{
-						
-						cd_do_hide_listing ();
-					}
-				}
-				else  // sous-recherche => on filtre.
-				{
-					cd_do_filter_current_listing ();
-				}
-			}
+			if (myData.pListingHistory == NULL)  // recherche principale.
+			{
+				g_list_free (myData.pMatchingIcons);
+				myData.pMatchingIcons = NULL;
+				cd_do_search_matching_icons ();
+				if (myData.pMatchingIcons == NULL && myData.sCurrentText->len > 0)  // on n'a trouve aucun programme, on cherche des entrees.
+				{
+					if (myData.iSidLoadExternAppliIdle != 0)
+					{
+						g_source_remove (myData.iSidLoadExternAppliIdle);
+						myData.iSidLoadExternAppliIdle = 0;
+					}
+					cd_do_launch_all_backends ();
+				}
+				else  // on a trouve au moins un programme, on cache le listing des fichiers.
+				{
+					
+					cd_do_hide_listing ();
+				}
+			}
+			else  // sous-recherche => on filtre.
+			{
+				cd_do_filter_current_listing ();
+			}
+			
 			
 			// on repositionne les caracteres et on anime tout ca.
 			cd_do_launch_appearance_animation ();
@@ -345,176 +218,45 @@
 		if (myData.iNbValidCaracters > 0)
 		{
 			gboolean bPrevious = iModifierType & GDK_SHIFT_MASK;
-			if (myData.bNavigationMode)
+			if (myData.pMatchingIcons != NULL)
 			{
-				// on cherche l'icone suivante.
-				cd_do_search_current_icon (TRUE);  // pCurrentIcon peut etre NULL si elle s'est faite detruire pendant la recherche, auquel cas on cherchera juste normalement.
+				cd_do_select_previous_next_matching_icon (!bPrevious);
 			}
-			else 
+			else
 			{
-				if (myData.pMatchingIcons != NULL)
-				{
-					cd_do_select_previous_next_matching_icon (!bPrevious);
-				}
-				else
-				{
-					// faire un truc ?...
-				}
+				// faire un truc ?...
 			}
 		}
 	}
 	else if (iKeyVal == GDK_Return)
 	{
 		cd_debug ("Enter (%s)\n", myData.cSearchText);
-		if (myData.bNavigationMode)
-		{
-			if (myData.pCurrentIcon != NULL && myData.pCurrentDock != NULL)
-			{
-				cd_debug ("on clique sur l'icone '%s' [%d, %d]\n", myData.pCurrentIcon->cName, iModifierType, GDK_SHIFT_MASK);
-				
-				myData.bIgnoreIconState = TRUE;
-				if (iModifierType & GDK_MOD1_MASK)  // ALT
-				{
-					myData.bIgnoreIconState = TRUE;
-					cairo_dock_stop_icon_animation (myData.pCurrentIcon);  // car aucune animation ne va la remplacer.
-					myData.bIgnoreIconState = FALSE;
-					cairo_dock_notify (CAIRO_DOCK_MIDDLE_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock);
-				}
-				else if (iModifierType & GDK_CONTROL_MASK)  // CTRL
-				{
-					myData.bIgnoreIconState = TRUE;
-					cairo_dock_stop_icon_animation (myData.pCurrentIcon);  // car on va perdre le focus.
-					myData.bIgnoreIconState = FALSE;
-					
-					myData.pCurrentDock->bMenuVisible = TRUE;
-					GtkWidget *menu = cairo_dock_build_menu (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
-					gtk_widget_show_all (menu);
-					gtk_menu_popup (GTK_MENU (menu),
-						NULL,
-						NULL,
-						NULL,
-						NULL,
-						1,
-						gtk_get_current_event_time ());
-				}
-				else if (myData.pCurrentIcon != NULL)
-					cairo_dock_notify (CAIRO_DOCK_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock, iModifierType);
-				if (myData.pCurrentIcon != NULL)
-					cairo_dock_start_icon_animation (myData.pCurrentIcon, myData.pCurrentDock);
-				myData.bIgnoreIconState = FALSE;
-				myData.pCurrentIcon = NULL;  // sinon on va interrompre l'animation en fermant la session.
-			}
+		if (myData.pMatchingIcons != NULL)  // on a une appli a lancer.
+		{
+			Icon *pIcon = (myData.pCurrentMatchingElement ? myData.pCurrentMatchingElement->data : myData.pMatchingIcons->data);
+			cairo_dock_launch_command (pIcon->cCommand);
+		}
+		else if (myData.pListing && myData.pListing->pCurrentEntry)  // pas d'appli mais une entree => on l'execute.
+		{
+			CDEntry *pEntry = myData.pListing->pCurrentEntry->data;
+			cd_debug ("on valide l'entree '%s ; %s'\n", pEntry->cName, pEntry->cPath);
+			if (pEntry->execute)
+				pEntry->execute (pEntry);
+			else
+				return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
+		}
+		else if (myData.iNbValidCaracters > 0)  // pas d'entree mais du texte => on l'execute tel quel.
+		{
+			cd_debug ("on execute '%s'\n", myData.sCurrentText->str);
+			cairo_dock_launch_command (myData.sCurrentText->str);
+		}
+		
+		if (!(iModifierType & GDK_CONTROL_MASK) && !(iModifierType & GDK_MOD1_MASK) && !(iModifierType & GDK_SHIFT_MASK))
 			cd_do_close_session ();
-		}
-		else  // mode recherche.
-		{
-			if (myData.pMatchingIcons != NULL)  // on a une appli a lancer.
-			{
-				Icon *pIcon = (myData.pCurrentMatchingElement ? myData.pCurrentMatchingElement->data : myData.pMatchingIcons->data);
-				cairo_dock_launch_command (pIcon->cCommand);
-			}
-			else if (myData.pListing && myData.pListing->pCurrentEntry)  // pas d'appli mais une entree => on l'execute.
-			{
-				CDEntry *pEntry = myData.pListing->pCurrentEntry->data;
-				cd_debug ("on valide l'entree '%s ; %s'\n", pEntry->cName, pEntry->cPath);
-				if (pEntry->execute)
-					pEntry->execute (pEntry);
-				else
-					return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
-			}
-			else if (myData.iNbValidCaracters > 0)  // pas d'entree mais du texte => on l'execute tel quel.
-			{
-				cd_debug ("on execute '%s'\n", myData.sCurrentText->str);
-				cairo_dock_launch_command (myData.sCurrentText->str);
-			}
-			
-			if (!(iModifierType & GDK_CONTROL_MASK) && !(iModifierType & GDK_MOD1_MASK) && !(iModifierType & GDK_SHIFT_MASK))
-				cd_do_close_session ();
-		}
 	}
 	else if (iKeyVal == GDK_Left || iKeyVal == GDK_Right || iKeyVal == GDK_Up || iKeyVal == GDK_Down)
 	{
-		if (myData.bNavigationMode)
-		{
-			iKeyVal = _orient_arrow (pContainer, iKeyVal);
-			if (iKeyVal == GDK_Up)
-			{
-				if (myData.pCurrentIcon != NULL && myData.pCurrentIcon->pSubDock != NULL)
-				{
-					cd_debug ("on monte dans le sous-dock %s\n", myData.pCurrentIcon->cName);
-					Icon *pIcon = cairo_dock_get_first_icon (myData.pCurrentIcon->pSubDock->icons);
-					cd_do_change_current_icon (pIcon, myData.pCurrentIcon->pSubDock);
-				}
-			}
-			else if (iKeyVal == GDK_Down)
-			{
-				if (myData.pCurrentDock != NULL && myData.pCurrentDock->iRefCount > 0)
-				{
-					CairoDock *pParentDock = NULL;
-					Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (myData.pCurrentDock, &pParentDock);
-					if (pPointingIcon != NULL)
-					{
-						cd_debug ("on redescend dans le dock parent via %s\n", pPointingIcon->cName);
-						cd_do_change_current_icon (pPointingIcon, pParentDock);
-					}
-				}
-			}
-			else if (iKeyVal == GDK_Left)
-			{
-				if (myData.pCurrentDock == NULL)  // on initialise le deplacement.
-				{
-					myData.pCurrentDock = g_pMainDock;
-					int n = g_list_length (g_pMainDock->icons);
-					if (n > 0)
-					{
-						myData.pCurrentIcon =  g_list_nth_data (g_pMainDock->icons, (n-1) / 2);
-						if (CAIRO_DOCK_IS_SEPARATOR (myData.pCurrentIcon) && n > 1)
-							myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n+1) / 2);
-					}
-				}
-				if (myData.pCurrentDock->icons != NULL)
-				{
-					Icon *pPrevIcon = cairo_dock_get_previous_icon (myData.pCurrentDock->icons, myData.pCurrentIcon);
-					if (CAIRO_DOCK_IS_SEPARATOR (pPrevIcon))
-						pPrevIcon = cairo_dock_get_previous_icon (myData.pCurrentDock->icons, pPrevIcon);
-					if (pPrevIcon == NULL)  // pas trouve ou bien 1ere icone.
-					{
-						pPrevIcon = cairo_dock_get_last_icon (myData.pCurrentDock->icons);
-					}
-					
-					cd_debug ("on se deplace a gauche sur %s\n", pPrevIcon ? pPrevIcon->cName : "none");
-					cd_do_change_current_icon (pPrevIcon, myData.pCurrentDock);
-				}
-			}
-			else  // Gdk_Right.
-			{
-				if (myData.pCurrentDock == NULL)  // on initialise le deplacement.
-				{
-					myData.pCurrentDock = g_pMainDock;
-					int n = g_list_length (g_pMainDock->icons);
-					if (n > 0)
-					{
-						myData.pCurrentIcon =  g_list_nth_data (g_pMainDock->icons, (n-1) / 2);
-						if (CAIRO_DOCK_IS_SEPARATOR (myData.pCurrentIcon) && n > 1)
-							myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n+1) / 2);
-					}
-				}
-				if (myData.pCurrentDock->icons != NULL)
-				{
-					Icon *pNextIcon = cairo_dock_get_next_icon (myData.pCurrentDock->icons, myData.pCurrentIcon);
-					if (CAIRO_DOCK_IS_SEPARATOR (pNextIcon))
-						pNextIcon = cairo_dock_get_next_icon (myData.pCurrentDock->icons, pNextIcon);
-					if (pNextIcon == NULL)  // pas trouve ou bien 1ere icone.
-					{
-						pNextIcon = cairo_dock_get_first_icon (myData.pCurrentDock->icons);
-					}
-					
-					cd_debug ("on se deplace a gauche sur %s\n", pNextIcon ? pNextIcon->cName : "none");
-					cd_do_change_current_icon (pNextIcon, myData.pCurrentDock);
-				}
-			}
-		}
-		else if (myData.pMatchingIcons != NULL)
+		if (myData.pMatchingIcons != NULL)
 		{
 			cd_do_select_previous_next_matching_icon (iKeyVal == GDK_Right || iKeyVal == GDK_Down);
 		}
@@ -540,15 +282,7 @@
 	}
 	else if (iKeyVal == GDK_Page_Down || iKeyVal == GDK_Page_Up || iKeyVal == GDK_Home || iKeyVal == GDK_End)
 	{
-		if (myData.bNavigationMode)
-		{
-			if (myData.pCurrentDock == NULL)  // on initialise le deplacement.
-				myData.pCurrentDock = g_pMainDock;
-			Icon *pIcon = (iKeyVal == GDK_Page_Up || iKeyVal == GDK_Home ? cairo_dock_get_first_icon (myData.pCurrentDock->icons) : cairo_dock_get_last_icon (myData.pCurrentDock->icons));
-			cd_debug ("on se deplace a l'extremite sur %s\n", pIcon ? pIcon->cName : "none");
-			cd_do_change_current_icon (pIcon, myData.pCurrentDock);
-		}
-		else if (myData.pListing != NULL)
+		if (myData.pListing != NULL)
 		{
 			if (iKeyVal == GDK_Page_Down || iKeyVal == GDK_Page_Up)
 				cd_do_select_prev_next_page_in_listing (iKeyVal == GDK_Page_Down);  // TRUE <=> next page
@@ -558,7 +292,7 @@
 	}
 	else if (iKeyVal >= GDK_F1 && iKeyVal <= GDK_F9)
 	{
-		if (! myData.bNavigationMode && myData.pListing != NULL && GTK_WIDGET_VISIBLE (myData.pListing->container.pWidget))
+		if (myData.pListing != NULL && GTK_WIDGET_VISIBLE (myData.pListing->container.pWidget))
 		{
 			cd_debug ("modification du filtre : option n°%d", iKeyVal - GDK_F1);
 			cd_do_activate_filter_option (iKeyVal - GDK_F1);
@@ -568,7 +302,7 @@
 	else if (string)  /// utiliser l'unichar ...
 	{
 		cd_debug ("string:'%s'\n", string);
-		int iNbNewChar = 0;
+		guint iNbNewChar = 0;
 		if ((iModifierType & GDK_CONTROL_MASK) && iUnicodeChar == 'v')  // CTRL+v
 		{
 			cd_debug ("CTRL+v\n");
@@ -597,30 +331,25 @@
 			myData.iNbValidCaracters = myData.sCurrentText->len;  // l'utilisateur valide la nouvelle lettre ainsi que celles precedemment ajoutee par completion.
 		}
 		
-		if (myData.bNavigationMode)  // on cherche un lanceur correspondant.
+
+		// on cherche la liste des icones qui correspondent.
+		if (myData.pListingHistory == NULL)
 		{
-			cd_do_search_current_icon (FALSE);
+			//if (! (myData.bFoundNothing || (myData.pListing && myData.pListing->pEntries)))  // on n'est pas deja dans une recherche de fichiers
+			if (myData.iNbValidCaracters == iNbNewChar || myData.pMatchingIcons != NULL)  // 1er ajout de lettre ou precedente recherche d'icones fructueuse => on remet ca.
+			{
+				cd_do_search_matching_icons ();
+			}
+			
+			// si on n'a trouve aucun lanceur, on lance la recherche dans les backends.
+			if (myData.pMatchingIcons == NULL)
+			{
+				cd_do_launch_all_backends ();
+			}
 		}
-		else  // on cherche la liste des icones qui correspondent.
+		else
 		{
-			if (myData.pListingHistory == NULL)
-			{
-				//if (! (myData.bFoundNothing || (myData.pListing && myData.pListing->pEntries)))  // on n'est pas deja dans une recherche de fichiers
-				if (myData.iNbValidCaracters == iNbNewChar || myData.pMatchingIcons != NULL)  // 1er ajout de lettre ou precedente recherche d'icones fructueuse => on remet ca.
-				{
-					cd_do_search_matching_icons ();
-				}
-				
-				// si on n'a trouve aucun lanceur, on lance la recherche dans les backends.
-				if (myData.pMatchingIcons == NULL)
-				{
-					cd_do_launch_all_backends ();
-				}
-			}
-			else
-			{
-				cd_do_filter_current_listing ();
-			}
+			cd_do_filter_current_listing ();
 		}
 		
 		// on rajoute une surface/texture pour la/les nouvelle(s) lettre(s).
@@ -636,22 +365,14 @@
 }
 
 
-#define _cd_do_on_shortkey(bNewModeNav) \
-	if (myData.sCurrentText == NULL) { \
-		myData.bNavigationMode = bNewModeNav; \
-		cd_do_open_session (); } \
-	else { \
-		cd_do_close_session (); \
-		if (myData.bNavigationMode != bNewModeNav) { \
-			cd_do_open_session (); \
-			myData.bNavigationMode = bNewModeNav; } }
-	
-void cd_do_on_shortkey_nav (const char *keystring, gpointer data)
-{
-	_cd_do_on_shortkey (TRUE);
-}
-
 void cd_do_on_shortkey_search (const char *keystring, gpointer data)
 {
-	_cd_do_on_shortkey (FALSE);
+	if (! cd_do_session_is_running ())
+	{
+		cd_do_open_session ();
+	}
+	else
+	{
+		cd_do_close_session ();
+	}
 }

=== modified file 'Scooby-Do/src/applet-notifications.h'
--- Scooby-Do/src/applet-notifications.h	2009-10-05 19:27:17 +0000
+++ Scooby-Do/src/applet-notifications.h	2010-10-02 18:13:46 +0000
@@ -35,16 +35,12 @@
 //gboolean cd_do_enter_container (gpointer pUserData, CairoContainer *pContainer, gboolean *bStartAnimation);
 
 
-gboolean cd_do_check_icon_stopped (gpointer pUserData, Icon *pIcon);
-
-
 gboolean cd_do_check_active_dock (gpointer pUserData, Window *XActiveWindow);
 
 
 gboolean cd_do_key_pressed (gpointer pUserData, CairoContainer *pContainer, guint iKeyVal, guint iModifierType, const gchar *string);
 
 
-void cd_do_on_shortkey_nav (const char *keystring, gpointer data);
 void cd_do_on_shortkey_search (const char *keystring, gpointer data);
 
 

=== modified file 'Scooby-Do/src/applet-search.c'
--- Scooby-Do/src/applet-search.c	2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-search.c	2010-10-02 18:13:46 +0000
@@ -70,7 +70,7 @@
 	pBackend->bFoundNothing = FALSE;
 	pBackend->bTooManyResults = FALSE;
 	
-	if (! cd_do_session_is_waiting_for_input () || myData.pListingHistory != NULL)  // on a quitte la session ou on a choisi une entree en cours de route.
+	if (! cd_do_session_is_running () || myData.pListingHistory != NULL)  // on a quitte la session ou on a choisi une entree en cours de route.
 	{
 		cd_debug (" on a quitte la session ou on a choisi une entree en cours de route\n");
 		_discard_results (pBackend);

=== modified file 'Scooby-Do/src/applet-session.c'
--- Scooby-Do/src/applet-session.c	2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-session.c	2010-10-02 18:13:46 +0000
@@ -29,22 +29,34 @@
 
 void cd_do_open_session (void)
 {
-	// on termine l'animation de fin de la precedente session.
+	if (cd_do_session_is_running ())  // session already running
+		return;
+	
+	// on termine la precedente session.
 	cd_do_exit_session ();
 	cd_do_stop_all_backends ();  // on le fait maintenant pour ne pas bloquer au exit.
 	
-	// on s'abonne aux notifications dont on aura besoin pour la session.
-	cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock), CAIRO_DOCK_UPDATE_DOCK, (CairoDockNotificationFunc) cd_do_update_container, CAIRO_DOCK_RUN_AFTER, NULL);
-	cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock), CAIRO_DOCK_RENDER_DOCK, (CairoDockNotificationFunc) cd_do_render, CAIRO_DOCK_RUN_AFTER, NULL);
-	cairo_dock_register_notification (CAIRO_DOCK_STOP_ICON, (CairoDockNotificationFunc) cd_do_check_icon_stopped, CAIRO_DOCK_RUN_AFTER, NULL);
+	// register to draw on dock.
+	if (cd_do_session_is_off ())
+	{
+		cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock),
+			CAIRO_DOCK_UPDATE_DOCK,
+			(CairoDockNotificationFunc) cd_do_update_container,
+			CAIRO_DOCK_RUN_AFTER, NULL);
+		cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock),
+			CAIRO_DOCK_RENDER_DOCK,
+			(CairoDockNotificationFunc) cd_do_render,
+			CAIRO_DOCK_RUN_AFTER, NULL);
+	}
+	
+	// wait for keyboard input.
+	cairo_dock_register_notification (CAIRO_DOCK_KEY_PRESSED, (CairoDockNotificationFunc) cd_do_key_pressed, CAIRO_DOCK_RUN_AFTER, NULL);
 	cairo_dock_register_notification (CAIRO_DOCK_WINDOW_ACTIVATED, (CairoDockNotificationFunc) cd_do_check_active_dock, CAIRO_DOCK_RUN_AFTER, NULL);
-	//cairo_dock_register_notification (CAIRO_DOCK_ENTER_DOCK, (CairoDockNotificationFunc) cd_do_enter_container, CAIRO_DOCK_RUN_FIRST, NULL);
 	
-	// on se met en attente de texte.
 	myData.sCurrentText = g_string_sized_new (20);
 	myConfig.labelDescription.iSize = myConfig.fFontSizeRatio * g_pMainDock->iMaxDockHeight;
 	myData.iPromptAnimationCount = 0;
-	if (! myData.bNavigationMode && myData.pPromptSurface == NULL)
+	if (myData.pPromptSurface == NULL)
 	{
 		cairo_t *pCairoContext = cairo_dock_create_context_from_window (CAIRO_CONTAINER (g_pMainDock));
 		myData.pPromptSurface = cairo_dock_create_surface_from_text (D_("Enter your search"), &myConfig.labelDescription, &myData.iPromptWidth, &myData.iPromptHeight);
@@ -54,22 +66,9 @@
 			myData.iPromptTexture = cairo_dock_create_texture_from_surface (myData.pPromptSurface);
 		}
 	}
-	else if (myData.bNavigationMode && myData.pArrowSurface == NULL)
-	{
-		cairo_t *pCairoContext = cairo_dock_create_context_from_window (CAIRO_CONTAINER (g_pMainDock));
-		myData.pArrowSurface = cairo_dock_create_surface_for_icon (MY_APPLET_SHARE_DATA_DIR"/arrows.svg", g_pMainDock->iMaxDockHeight, g_pMainDock->iMaxDockHeight);
-		myData.iArrowWidth = g_pMainDock->iMaxDockHeight;
-		myData.iArrowHeight = g_pMainDock->iMaxDockHeight;
-		cairo_destroy (pCairoContext);
-		if (g_bUseOpenGL)
-		{
-			myData.iArrowTexture = cairo_dock_create_texture_from_surface (myData.pArrowSurface);
-		}
-	}
+	
 	// on montre le main dock.
-	myData.bIgnoreIconState = TRUE;
-	cairo_dock_emit_enter_signal (g_pMainDock);
-	myData.bIgnoreIconState = FALSE;
+	cairo_dock_emit_enter_signal (CAIRO_CONTAINER (g_pMainDock));
 	
 	// le main dock prend le focus.
 	myData.iPreviouslyActiveWindow = cairo_dock_get_active_xwindow ();
@@ -81,24 +80,23 @@
 	
 	// On lance l'animation d'attente.
 	cairo_dock_launch_animation (CAIRO_CONTAINER (g_pMainDock));
+	
+	myData.iSessionState = 2;
 }
 
 void cd_do_close_session (void)
 {
-	// on ne veut plus de texte.
+	if (! cd_do_session_is_running ())  // session not running
+		return;
+	
+	// no more keyboard input.
+	cairo_dock_remove_notification_func (CAIRO_DOCK_KEY_PRESSED, (CairoDockNotificationFunc) cd_do_key_pressed, NULL);
+	cairo_dock_remove_notification_func (CAIRO_DOCK_WINDOW_ACTIVATED, (CairoDockNotificationFunc) cd_do_check_active_dock, NULL);
+	
 	g_string_free (myData.sCurrentText, TRUE);
 	myData.sCurrentText = NULL;
 	myData.iNbValidCaracters = 0;
 	
-	// on remet a zero la session.
-	if (myData.pCurrentIcon != NULL)
-	{
-		myData.bIgnoreIconState = TRUE;
-		cairo_dock_stop_icon_animation (myData.pCurrentIcon);
-		myData.bIgnoreIconState = FALSE;
-		myData.pCurrentIcon = NULL;
-	}
-	
 	// on cache les resultats
 	cd_do_hide_listing ();
 	
@@ -106,16 +104,7 @@
 	myData.cSearchText = NULL;
 	myData.iCurrentFilter = 0;
 	
-	if (myData.pCurrentDock != NULL)
-	{
-		//cairo_dock_leave_from_main_dock (myData.pCurrentDock);  /// voir avec un emit_leave_signal ...
-		cairo_dock_emit_leave_signal (myData.pCurrentDock);
-		myData.pCurrentDock = NULL;
-	}
-	if (myData.pCurrentDock != g_pMainDock)
-	{
-		cairo_dock_emit_leave_signal (g_pMainDock);
-	}
+	cairo_dock_emit_leave_signal (CAIRO_CONTAINER (g_pMainDock));
 	
 	// on redonne le focus a l'ancienne fenetre.
 	if (myData.iPreviouslyActiveWindow != 0)
@@ -131,20 +120,26 @@
 	myData.iCloseTime = myConfig.iCloseDuration;
 	cairo_dock_launch_animation (CAIRO_CONTAINER (g_pMainDock));
 	cairo_dock_freeze_docks (FALSE);
+	
+	myData.iSessionState = 1;
 }
 
 void cd_do_exit_session (void)
 {
+	if (cd_do_session_is_off ())  // session already off
+		return;
+	
+	
+	cd_do_close_session ();
+	
+	myData.iCloseTime = 0;
+	
 	cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (g_pMainDock), CAIRO_DOCK_RENDER_DOCK, (CairoDockNotificationFunc) cd_do_render, NULL);
 	cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (g_pMainDock), CAIRO_DOCK_UPDATE_DOCK, (CairoDockNotificationFunc) cd_do_update_container, NULL);
-	cairo_dock_remove_notification_func (CAIRO_DOCK_STOP_ICON, (CairoDockNotificationFunc) cd_do_check_icon_stopped, NULL);
-	cairo_dock_remove_notification_func (CAIRO_DOCK_WINDOW_ACTIVATED, (CairoDockNotificationFunc) cd_do_check_active_dock, NULL);
-	//cairo_dock_remove_notification_func (CAIRO_DOCK_ENTER_DOCK, (CairoDockNotificationFunc) cd_do_enter_container, NULL);
-	
-	// arreter les backends...
-	
-	
-	myData.iCloseTime = 0;
+	
+	/// arreter les backends...
+	
+	
 	if (myData.pCharList != NULL)
 	{
 		cd_do_free_char_list (myData.pCharList);
@@ -179,6 +174,8 @@
 		myData.iPreviousMatchingOffset = 0;
 		myData.iCurrentMatchingOffset = 0;
 	}
+	
+	myData.iSessionState = 0;
 }
 
 
@@ -214,7 +211,8 @@
 	CDChar *pChar;
 	cairo_t *pCairoContext = cairo_dock_create_context_from_window (CAIRO_CONTAINER (g_pMainDock));
 	int iDeltaT = cairo_dock_get_animation_delta_t (g_pMainDock);
-	int i, iOffsetX=0;
+	guint i;
+	int iOffsetX=0;
 	for (i = myData.iNbValidCaracters-0; i < myData.sCurrentText->len; i++)
 	{
 		//g_print (" on charge la lettre '%c' (%d) tex:%d\n", myData.sCurrentText->str[i], i, bLoadTexture);
@@ -297,7 +295,7 @@
 	// on efface les lettres precedentes jusqu'a la derniere position validee.
 	CDChar *pChar;
 	GList *c = g_list_last (myData.pCharList), *c_prev;
-	int i;
+	guint i;
 	for (i = myData.iNbValidCaracters; i < myData.sCurrentText->len && c != NULL; i ++)
 	{
 		//g_print ("on efface '%c'\n", myData.sCurrentText->str[i]);

=== modified file 'Scooby-Do/src/applet-session.h'
--- Scooby-Do/src/applet-session.h	2009-10-05 19:27:17 +0000
+++ Scooby-Do/src/applet-session.h	2010-10-02 18:13:46 +0000
@@ -31,11 +31,9 @@
 
 void cd_do_exit_session (void);
 
-#define cd_do_session_is_waiting_for_input(...) (myData.sCurrentText != NULL)
-#define cd_do_session_is_closing(...) (myData.iCloseTime != 0)
-#define cd_do_session_is_running(...) (cd_do_session_is_waiting_for_input () || cd_do_session_is_closing ())
-#define cd_do_session_is_in_navigation_mode(...) (myData.pCharList == NULL)
-#define cd_do_session_is_in_selection_mode(...) (myData.pCharList != NUUL)
+#define cd_do_session_is_running(...) (myData.iSessionState == 2)
+#define cd_do_session_is_closing(...) (myData.iSessionState == 1)
+#define cd_do_session_is_off(...) (myData.iSessionState == 0)
 
 void cd_do_free_char (CDChar *pChar);
 void cd_do_free_char_list (GList *pCharList);

=== modified file 'Scooby-Do/src/applet-struct.h'
--- Scooby-Do/src/applet-struct.h	2010-02-14 00:51:22 +0000
+++ Scooby-Do/src/applet-struct.h	2010-10-02 18:13:46 +0000
@@ -23,30 +23,11 @@
 
 #include <cairo-dock.h>
 
-/**Le concept de ce plug-in est le suivant : 
- * - l'utilisateur l'active par la combinaison de touches pre-definie :
- *   => mode navigation : les fleches deplacent l'icone courante
- *      une lettre deplace sur la 1ere icone correspondante au mot courant
- *      TAB deplace sur l'icone suivante corespondante au mot courant
- *      la completion est automatique
- *      si aucune icone n'est trouvee, la completion elargie est utilisee.
- *   => mode recherche : les fleches deplacent parmi la liste d'icones correspondantes
- *      une lettre reduit/elargit la liste courante
- *      les icones de la liste sont affichees dans le dock principal, zoomees si necessaire
- *      completion: idem
- * - l'utilisateur appuie sur une lettre en ayant la souris dans un dock ayant le focus :
- *   => le mode navigation est active avec cette 1ere lettre
- *      seule le dock courant est pris en compte
- *      en cas de sortie du dock, la session est terminee
- *      la completion est automatique sur les icones trouvees seulement.
- * */
-
 //\___________ structure containing the applet's configuration parameters.
 struct _AppletConfig {
 	gdouble fFontSizeRatio;  // 1 <=> taille du dock
 	gboolean bTextOnTop;
 	CairoDockLabelDescription labelDescription;
-	gchar *cShortkeyNav;
 	gchar *cShortkeySearch;
 	gchar *cIconAnimation;
 	gdouble pFrameColor[4];
@@ -167,31 +148,19 @@
 
 //\___________ structure containing the applet's data, like surfaces, dialogs, results of calculation, etc.
 struct _AppletData {
+	gint iSessionState;  // 0:no session, 1: session closing, 2: session running
 	GString *sCurrentText;
-	gint iStopCount;
-	gint iNbValidCaracters;
+	guint iNbValidCaracters;
 	Window iPreviouslyActiveWindow;
-	Icon *pCurrentIcon;
-	CairoDock *pCurrentDock;
 	gint iTextWidth, iTextHeight;
 	gint iCloseTime;
 	GList *pCharList;
-	gboolean bIgnoreIconState;
 	gint iAppearanceTime;
 	
-	gint iPrevMouseX, iPrevMouseY;
-	gint iMouseX, iMouseY;
-	gint iMotionCount;
-	
-	gboolean bNavigationMode;
-	gboolean bSessionStartedAutomatically;
 	gint iPromptAnimationCount;
 	cairo_surface_t *pPromptSurface;
 	gint iPromptWidth, iPromptHeight;
 	GLuint iPromptTexture;
-	cairo_surface_t *pArrowSurface;
-	gint iArrowWidth, iArrowHeight;
-	GLuint iArrowTexture;
 	
 	GList *pMatchingIcons;
 	GList *pCurrentMatchingElement;

=== modified file 'Status-Notifier/src/applet-draw.c'
--- Status-Notifier/src/applet-draw.c	2010-09-07 00:39:20 +0000
+++ Status-Notifier/src/applet-draw.c	2010-10-02 18:13:46 +0000
@@ -62,13 +62,13 @@
 			myData.iItemSize = iSize;
 		}
 	}
-	g_print ("satus_notifier : %dx%d\n", myData.iNbLines, myData.iNbColumns);
+	//g_print ("satus_notifier : %dx%d\n", myData.iNbLines, myData.iNbColumns);
 }
 
 
 void cd_satus_notifier_draw_compact_icon (void)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	int iWidth, iHeight;
 	CD_APPLET_GET_MY_ICON_EXTENT (&iWidth, &iHeight);
 	
@@ -133,13 +133,13 @@
 
 void cd_satus_notifier_reload_compact_mode (void)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	// re-compute the grid.
 	int iPrevSize = myData.iItemSize;
 	cd_satus_notifier_compute_grid ();
 	
 	// reload surfaces if their size has changed.
-	g_print (" size: %d -> %d\n", iPrevSize, myData.iItemSize);
+	//g_print (" size: %d -> %d\n", iPrevSize, myData.iItemSize);
 	CDStatusNotifierItem *pItem;
 	GList *it;
 	for (it = myData.pItems; it != NULL; it = it->next)
@@ -172,9 +172,10 @@
 		return NULL;
 	
 	int iMouseX, iMouseY;
-	iMouseX = myContainer->iMouseX;
-	iMouseY = myContainer->iMouseY;
+	iMouseX = myContainer->iMouseX - myIcon->fDrawX;
+	iMouseY = myContainer->iMouseY - myIcon->fDrawY;
 	
+	//g_print ("%s (%d;%d)\n", __func__, iMouseX, iMouseY);
 	// get index on the grid.
 	int iWidth, iHeight;
 	CD_APPLET_GET_MY_ICON_EXTENT (&iWidth, &iHeight);
@@ -194,17 +195,17 @@
 		pItem = it->data;
 		if (pItem->pSurface != NULL && pItem->iStatus != CD_STATUS_PASSIVE)
 		{
-			j ++;
-			if (j == myData.iNbColumns)  // next line.
-			{
-				j = 0;
-				i ++;
-			}
 			if (i == line && j == col)
 			{
 				pFoundItem = pItem;
 				break;
 			}
+			j ++;
+			if (j == myData.iNbColumns)  // next line.
+			{
+				j = 0;
+				i ++;
+			}
 		}
 	}
 	

=== modified file 'Status-Notifier/src/applet-host.c'
--- Status-Notifier/src/applet-host.c	2010-09-07 00:39:20 +0000
+++ Status-Notifier/src/applet-host.c	2010-10-02 18:13:46 +0000
@@ -49,7 +49,7 @@
 	gpointer invocation_hint G_GNUC_UNUSED,
 	gpointer marshal_data)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	typedef void (*GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING) (
 		gpointer     data1,
 		gchar      *arg_1,
@@ -169,7 +169,7 @@
 static void on_new_item (DBusGProxy *proxy_watcher, const gchar *cService, CairoDockModuleInstance *myApplet)
 {
 	CD_APPLET_ENTER;
-	g_print ("%s (%s)\n", __func__, cService);
+	//g_print ("%s (%s)\n", __func__, cService);
 	
 	_add_new_item (cService, NULL, -1);  // on suppose que leur indicator-application ne mettra jamais -1 comme position.
 	
@@ -179,7 +179,7 @@
 static void on_removed_item (DBusGProxy *proxy_watcher, const gchar *cService, CairoDockModuleInstance *myApplet)
 {
 	CD_APPLET_ENTER;
-	g_print ("%s (%s)\n", __func__, cService);
+	//g_print ("%s (%s)\n", __func__, cService);
 	
 	gchar *str = strchr (cService, '/');
 	if (str)
@@ -193,7 +193,7 @@
 static void on_new_application (DBusGProxy *proxy_watcher, const gchar *cIconName, gint iPosition, const gchar *cAdress, const gchar *cObjectPath, const gchar *cIconThemePath, const gchar *cLabel, const gchar *cLabelGuide, CairoDockModuleInstance *myApplet)
 {
 	CD_APPLET_ENTER;
-	g_print ("%s (%s, %s, %s, %s, %d)\n", __func__, cAdress, cObjectPath, cIconName, cIconThemePath, iPosition);
+	//g_print ("%s (%s, %s, %s, %s, %d)\n", __func__, cAdress, cObjectPath, cIconName, cIconThemePath, iPosition);
 	
 	_add_new_item (cAdress, cObjectPath, iPosition);
 	
@@ -203,7 +203,7 @@
 static void on_removed_application (DBusGProxy *proxy_watcher, gint iPosition, CairoDockModuleInstance *myApplet)
 {
 	CD_APPLET_ENTER;
-	g_print ("%s (%d)\n", __func__, iPosition);
+	//g_print ("%s (%d)\n", __func__, iPosition);
 	
 	_remove_item (NULL, iPosition);
 	
@@ -217,7 +217,7 @@
 
 static void _on_get_applications_from_service (DBusGProxy *proxy, DBusGProxyCall *call_id, CairoDockModuleInstance *myApplet)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	CD_APPLET_ENTER;
 	myData.pGetApplicationsCall = NULL;
 	
@@ -252,7 +252,7 @@
 	GValueArray *va;
 	GValue *v;
 	CDStatusNotifierItem *pItem=NULL;
-	g_print ("%d apps in the systray\n", pApplications->len);
+	//g_print ("%d apps in the systray\n", pApplications->len);
 	for (i = 0; i < pApplications->len; i ++)
 	{
 		va = pApplications->pdata[i];
@@ -295,14 +295,14 @@
 		if (v && G_VALUE_HOLDS_STRING (v))
 			cLabelGuide = g_value_get_string (v);
 		
-		g_print (" + item {%s ; %d ; %s ; %s ; %s ; %s ; %s}\n",
+		/*g_print (" + item {%s ; %d ; %s ; %s ; %s ; %s ; %s}\n",
 			cIconName,
 			iPosition,
 			cAdress,
 			cObjectPath,
 			cIconThemePath,
 			cLabel,
-			cLabelGuide);
+			cLabelGuide);*/
 		
 		pItem = cd_satus_notifier_create_item (cAdress, cObjectPath);
 		if (! pItem)
@@ -326,7 +326,7 @@
 
 static void _cd_satus_notifier_get_indicator_application (void)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	// get the service
 	myData.pProxyIndicatorApplicationService = cairo_dock_create_new_session_proxy (
 		CD_INDICATOR_APPLICATION_ADDR,
@@ -364,7 +364,7 @@
 
 static void _on_get_applications_from_watcher (DBusGProxy *proxy, DBusGProxyCall *call_id, CairoDockModuleInstance *myApplet)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	CD_APPLET_ENTER;
 	myData.pGetApplicationsCall = NULL;
 	
@@ -408,7 +408,7 @@
 	}
 	else  // un watcher asocial comme celui d'Ubuntu, on essaye avec l'"indicator-application".
 	{
-		g_print ("this watcher is not so friendly, let's try the 'application indicator'\n");
+		//g_print ("this watcher is not so friendly, let's try the 'application indicator'\n");
 		_cd_satus_notifier_get_indicator_application ();
 	}
 	CD_APPLET_LEAVE ();
@@ -416,7 +416,7 @@
 
 static void _on_register_host (DBusGProxy *proxy, DBusGProxyCall *call_id, CairoDockModuleInstance *myApplet)
 {
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	CD_APPLET_ENTER;
 	GError *erreur = NULL;
 	gboolean bSuccess = dbus_g_proxy_end_call (proxy,
@@ -433,7 +433,7 @@
 	
 	if (bSuccess)  // il y'a un watcher.
 	{
-		g_print ("found a friendly watcher, now ask for the items...\n");
+		//g_print ("found a friendly watcher, now ask for the items...\n");
 		// get the items
 		DBusGProxy *pProxyWatcherProps = cairo_dock_create_new_session_proxy (
 			CD_STATUS_NOTIFIER_WATCHER_ADDR,
@@ -460,7 +460,7 @@
 	}
 	else  // pas de watcher, ou un asocial comme celui d'Ubuntu, on essaye avec l'"indicator-application".
 	{
-		g_print ("no friendy watcher, let's try the 'application indicator'\n");
+		//g_print ("no friendy watcher, let's try the 'application indicator'\n");
 		_cd_satus_notifier_get_indicator_application ();
 	}
 	CD_APPLET_LEAVE ();
@@ -468,7 +468,7 @@
 static void _cd_satus_notifier_register_host (void)
 {
 	// register to the watcher.
-	g_print ("registering to the watcher...\n");
+	//g_print ("registering to the watcher...\n");
 	myData.pRegisterHostCall = dbus_g_proxy_begin_call (myData.pProxyWatcher, "RegisterNotificationHost",
 		(DBusGProxyCallNotify)_on_register_host,
 		myApplet,
@@ -500,18 +500,18 @@
 	// Register the service name on the bus.
 	pid_t pid = getpid ();
 	myData.cHostName = g_strdup_printf (CD_STATUS_NOTIFIER_HOST_ADDR"-%d", pid);
-	g_print ("registering name '%s' on the bus ...\n", myData.cHostName);
+	//g_print ("registering name '%s' on the bus ...\n", myData.cHostName);
 	cairo_dock_register_service_name (myData.cHostName);
 	
 	// get the watcher.
-	g_print ("getting the watcher ...\n");
+	//g_print ("getting the watcher ...\n");
 	myData.pProxyWatcher = cairo_dock_create_new_session_proxy (
 		CD_STATUS_NOTIFIER_WATCHER_ADDR,
 		CD_STATUS_NOTIFIER_WATCHER_OBJ,
 		CD_STATUS_NOTIFIER_WATCHER_IFACE);  /// dbus_g_proxy_new_for_name_owner ?...
 	if (myData.pProxyWatcher == NULL)  // no watcher yet, let's try again in a few moment.
 	{
-		g_print ("no watcher yet, let's try again in a few moment\n");
+		//g_print ("no watcher yet, let's try again in a few moment\n");
 		myData.iSidGetWatcher = g_timeout_add (1000., (GSourceFunc)_get_watcher, myApplet);
 		return;
 	}

=== modified file 'Status-Notifier/src/applet-init.c'
--- Status-Notifier/src/applet-init.c	2010-09-07 00:39:20 +0000
+++ Status-Notifier/src/applet-init.c	2010-10-02 18:13:46 +0000
@@ -32,7 +32,7 @@
 CD_APPLET_DEFINITION (N_("Status Notifier"),
 	2, 2, 0,
 	CAIRO_DOCK_CATEGORY_APPLET_DESKTOP,
-	N_("A <b>notification area</b> for your dock\n"
+	("A <b>notification area</b> for your dock\n"
 	"Also called 'systray'.\n"
 	"It is designed to work on any desktop that supports the latest systray specifications (KDE, Gnome, etc)"),
 	"Fabounet (Fabrice Rey)")
@@ -43,6 +43,9 @@
 	if (! cairo_dock_reserve_data_slot (myApplet))
 		return;
 	
+	if (myConfig.bCompactMode)
+		CD_APPLET_SET_STATIC_ICON;
+	
 	if (myDesklet)
 	{
 		CD_APPLET_SET_DESKLET_RENDERER ("Simple");

=== modified file 'Status-Notifier/src/applet-item.c'
--- Status-Notifier/src/applet-item.c	2010-09-07 00:39:20 +0000
+++ Status-Notifier/src/applet-item.c	2010-10-02 18:13:46 +0000
@@ -140,11 +140,11 @@
 static void on_new_item_icon (DBusGProxy *proxy_item, CDStatusNotifierItem *pItem)
 {
 	CD_APPLET_ENTER;
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	
 	g_free (pItem->cIconName);
 	pItem->cIconName = cairo_dock_dbus_get_property_as_string (pItem->pProxyProps, CD_STATUS_NOTIFIER_ITEM_IFACE, "IconName");
-	g_print (" new icon : %s\n", pItem->cIconName);
+	//g_print (" new icon : %s\n", pItem->cIconName);
 	
 	if (pItem->iStatus != CD_STATUS_NEEDS_ATTENTION)
 	{
@@ -156,11 +156,11 @@
 static void on_new_item_attention_icon (DBusGProxy *proxy_item, CDStatusNotifierItem *pItem)
 {
 	CD_APPLET_ENTER;
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	
 	g_free (pItem->cAttentionIconName);
 	pItem->cAttentionIconName = cairo_dock_dbus_get_property_as_string (pItem->pProxyProps, CD_STATUS_NOTIFIER_ITEM_IFACE, "AttentionIconName");
-	g_print (" new attention icon : %s\n", pItem->cAttentionIconName);
+	//g_print (" new attention icon : %s\n", pItem->cAttentionIconName);
 	
 	if (pItem->iStatus == CD_STATUS_NEEDS_ATTENTION)
 	{
@@ -172,7 +172,7 @@
 static void on_new_item_status (DBusGProxy *proxy_item, const gchar *cStatus, CDStatusNotifierItem *pItem)
 {
 	CD_APPLET_ENTER;
-	g_print ("%s (%s)\n", __func__, cStatus);
+	//g_print ("%s (%s)\n", __func__, cStatus);
 	
 	// get the new status
 	CDStatusEnum iPrevStatus = pItem->iStatus;
@@ -213,7 +213,7 @@
 static void on_new_item_label (DBusGProxy *proxy_item, const gchar *cLabel, const gchar *cLabelGuide, CDStatusNotifierItem *pItem)
 {
 	CD_APPLET_ENTER;
-	g_print ("%s (%s, %s)\n", __func__, cLabel, cLabelGuide);
+	//g_print ("%s (%s, %s)\n", __func__, cLabel, cLabelGuide);
 	
 	g_free (pItem->cLabel);
 	pItem->cLabel = g_strdup (cLabel);
@@ -227,7 +227,7 @@
 static void on_new_item_theme_path (DBusGProxy *proxy_item, const gchar *cNewThemePath, CDStatusNotifierItem *pItem)
 {
 	CD_APPLET_ENTER;
-	g_print ("%s (%s)\n", __func__, cNewThemePath);
+	//g_print ("%s (%s)\n", __func__, cNewThemePath);
 	
 	g_free (pItem->cIconThemePath);
 	pItem->cIconThemePath = g_strdup (cNewThemePath);
@@ -241,11 +241,11 @@
 static void on_new_item_title (DBusGProxy *proxy_item, CDStatusNotifierItem *pItem)
 {
 	CD_APPLET_ENTER;
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	
 	g_free (pItem->cTitle);
 	pItem->cTitle = cairo_dock_dbus_get_property_as_string (pItem->pProxyProps, CD_STATUS_NOTIFIER_ITEM_IFACE, "Title");
-	g_print (" new title : %s\n", pItem->cTitle);
+	//g_print (" new title : %s\n", pItem->cTitle);
 	
 	//cairo_dock_set_icon_name (cTitle, pIcon, CAIRO_CONTAINER (myIcon->pSubDock));
 	
@@ -255,11 +255,11 @@
 static void on_new_item_overlay_icon (DBusGProxy *proxy_item, CDStatusNotifierItem *pItem)
 {
 	CD_APPLET_ENTER;
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	
 	g_free (pItem->cOverlayIconName);
 	pItem->cOverlayIconName = cairo_dock_dbus_get_property_as_string (pItem->pProxyProps, CD_STATUS_NOTIFIER_ITEM_IFACE, "OverlayIconName");
-	g_print (" new overlay : %s\n", pItem->cOverlayIconName);
+	//g_print (" new overlay : %s\n", pItem->cOverlayIconName);
 	
 	/*if (pIcon->pIconBuffer)
 	{
@@ -284,7 +284,7 @@
 static void on_new_item_tooltip (DBusGProxy *proxy_item, CDStatusNotifierItem *pItem)
 {
 	CD_APPLET_ENTER;
-	g_print ("%s ()\n", __func__);
+	//g_print ("%s ()\n", __func__);
 	
 	cd_free_tooltip (pItem->pToolTip);
 	pItem->pToolTip = NULL;
@@ -308,7 +308,7 @@
 	if (pItem->bInvalid)
 		return;
 	CD_APPLET_ENTER;
-	g_print ("this item (%s) was suddenly removed\n", __func__, pItem->cService);
+	//g_print ("this item (%s) was suddenly removed\n", __func__, pItem->cService);
 	
 	myData.pItems = g_list_remove (myData.pItems, pItem);
 	
@@ -356,7 +356,7 @@
 	gchar *str = strchr (cService, '/');
 	if (str)
 		*str = '\0';
-	g_print ("%s (%s)\n", __func__, cService);
+	//g_print ("%s (%s)\n", __func__, cService);
 	
 	// special case for Ubuntu indicators: we don't know their object path.
 	if (cObjectPath != NULL && strncmp (cObjectPath, CD_INDICATOR_APPLICATION_ITEM_OBJ, strlen (CD_INDICATOR_APPLICATION_ITEM_OBJ)) == 0)
@@ -377,9 +377,9 @@
 		DBUS_INTERFACE_PROPERTIES);
 	if (pProxyItemProp == NULL)
 		return NULL;
-	g_print ("owner : %s\n", dbus_g_proxy_get_bus_name (pProxyItemProp));
+	//g_print ("owner : %s\n", dbus_g_proxy_get_bus_name (pProxyItemProp));
 	
-	g_print ("getting properties ...\n");
+	//g_print ("getting properties ...\n");
 	GHashTable *hProps = cairo_dock_dbus_get_all_properties (pProxyItemProp, CD_STATUS_NOTIFIER_ITEM_IFACE);
 	if (hProps == NULL)
 		return NULL;
@@ -392,7 +392,7 @@
 	{
 		cId = g_value_get_string (v);
 	}
-	g_print ("  ID '%s'\n", cId);
+	//g_print ("  ID '%s'\n", cId);
 	
 	const gchar *cCategory = NULL;
 	v = g_hash_table_lookup (hProps, "Category");  // (ApplicationStatus, Communications, SystemServices, Hardware) -> fOrder
@@ -400,7 +400,7 @@
 	{
 		cCategory = g_value_get_string (v);
 	}
-	g_print ("  Category '%s'\n", cCategory);
+	//g_print ("  Category '%s'\n", cCategory);
 	
 	const gchar *cStatus = NULL;
 	v = g_hash_table_lookup (hProps, "Status");  // (Passive, Active, NeedsAttention) -> demands attention
@@ -408,7 +408,7 @@
 	{
 		cStatus = g_value_get_string (v);
 	}
-	g_print ("  Status '%s'\n", cStatus);
+	//g_print ("  Status '%s'\n", cStatus);
 	
 	const gchar *cIconName = NULL;
 	v = g_hash_table_lookup (hProps, "IconName");  // -> cIFileName
@@ -416,7 +416,7 @@
 	{
 		cIconName = g_value_get_string (v);
 	}
-	g_print ("  IconName '%s'\n", cIconName);
+	//g_print ("  IconName '%s'\n", cIconName);
 	
 	const gchar *cIconThemePath = NULL;
 	v = g_hash_table_lookup (hProps, "IconThemePath");
@@ -424,7 +424,7 @@
 	{
 		cIconThemePath = g_value_get_string (v);
 	}
-	g_print ("  IconThemePath '%s'\n", cIconThemePath);
+	//g_print ("  IconThemePath '%s'\n", cIconThemePath);
 	
 	const gchar *cAttentionIconName = NULL;
 	v = g_hash_table_lookup (hProps, "AttentionIconName");  // -> keep for demands of attention
@@ -432,7 +432,7 @@
 	{
 		cAttentionIconName = g_value_get_string (v);
 	}
-	g_print ("  AttentionIconName '%s'\n", cAttentionIconName);
+	//g_print ("  AttentionIconName '%s'\n", cAttentionIconName);
 	
 	// properties supported by Ubuntu.
 	const gchar *cMenuPath = NULL;
@@ -441,7 +441,7 @@
 	{
 		cMenuPath = (gchar*) g_value_get_boxed (v);
 	}
-	g_print ("  cMenuPath '%s'\n", cMenuPath);
+	//g_print ("  cMenuPath '%s'\n", cMenuPath);
 	
 	const gchar *cLabel = NULL;
 	v = g_hash_table_lookup (hProps, "XAyatanaLabel");
@@ -449,7 +449,7 @@
 	{
 		cLabel = g_value_get_string (v);
 	}
-	g_print ("  cLabel '%s'\n", cLabel);
+	//g_print ("  cLabel '%s'\n", cLabel);
 	
 	const gchar *cLabelGuide = NULL;
 	v = g_hash_table_lookup (hProps, "XAyatanaLabelGuide");
@@ -457,7 +457,7 @@
 	{
 		cLabelGuide = g_value_get_string (v);
 	}
-	g_print ("  cLabelGuide '%s'\n", cLabelGuide);
+	//g_print ("  cLabelGuide '%s'\n", cLabelGuide);
 	
 	// properties supported by KDE.
 	const gchar *cTitle = NULL;
@@ -466,7 +466,7 @@
 	{
 		cTitle = g_value_get_string (v);
 	}
-	g_print ("  Title '%s\n", cTitle);
+	//g_print ("  Title '%s\n", cTitle);
 	
 	v = g_hash_table_lookup (hProps, "WindowId");
 	guint iWindowId = 0;
@@ -474,7 +474,7 @@
 	{
 		iWindowId = g_value_get_uint (v);
 	}
-	g_print ("  WindowId '%d'\n", iWindowId);
+	//g_print ("  WindowId '%d'\n", iWindowId);
 	
 	const gchar *cOverlayIconName = NULL;
 	v = g_hash_table_lookup (hProps, "OverlayIconName");  // -> emblem
@@ -482,7 +482,7 @@
 	{
 		cOverlayIconName = g_value_get_string (v);
 	}
-	g_print ("  OverlayIconName '%s'\n", cOverlayIconName);
+	//g_print ("  OverlayIconName '%s'\n", cOverlayIconName);
 	
 	const gchar *cAttentionMovieName = NULL;
 	v = g_hash_table_lookup (hProps, "AttentionMovieName");  // -> idem
@@ -490,7 +490,7 @@
 	{
 		cAttentionMovieName = g_value_get_string (v);
 	}
-	g_print ("  AttentionMovieName '%s'\n", cAttentionMovieName);
+	//g_print ("  AttentionMovieName '%s'\n", cAttentionMovieName);
 	
 	GValueArray *pToolTipTab = NULL;
 	v = g_hash_table_lookup (hProps, "ToolTip");
@@ -532,15 +532,9 @@
 	{
 		cd_satus_notifier_add_theme_path (pItem->cIconThemePath);
 	}
-	/*if (myConfig.bCompactMode && myData.iItemSize != 0 && pItem->iStatus != CD_STATUS_PASSIVE)
-	{
-		gchar *cIconPath = cd_satus_notifier_search_item_icon_s_path (pItem);
-		if (cIconPath != NULL)
-		{
-			pItem->pSurface = cairo_dock_create_surface_from_icon (cIconPath, myData.iItemSize, myData.iItemSize);
-			g_free (cIconPath);
-		}
-	}*/
+	
+	if (pItem->cMenuPath != NULL)
+		pItem->pMenu = dbusmenu_gtkmenu_new ((gchar *)pItem->cService, (gchar *)pItem->cMenuPath);
 	
 	//\_________________ track any changes in the item.
 	// signals supported by both.

=== modified file 'Status-Notifier/src/applet-notifications.c'
--- Status-Notifier/src/applet-notifications.c	2010-09-07 00:39:20 +0000
+++ Status-Notifier/src/applet-notifications.c	2010-10-02 18:13:46 +0000
@@ -39,7 +39,7 @@
 		*x = pContainer->iWindowPositionY + (pContainer->bDirectionUp ? 0 : pContainer->iHeight);
 		*y = pContainer->iWindowPositionX + pIcon->fDrawX + pIcon->fWidth * pIcon->fScale/2;
 	}
-	g_print ("click position : %d;%d\n", *x, *y);
+	//g_print ("click position : %d;%d\n", *x, *y);
 }
 static inline gboolean _emit_click (CDStatusNotifierItem *pItem, Icon *pIcon, CairoContainer *pContainer, const gchar *cSignal)
 {
@@ -54,7 +54,7 @@
 		G_TYPE_INVALID);
 	if (erreur != NULL)
 	{
-		g_print ("method %s failed (%s)\n", cSignal, erreur->message);
+		//g_print ("method %s failed (%s)\n", cSignal, erreur->message);
 		g_error_free (erreur);
 		return FALSE;
 	}
@@ -84,13 +84,12 @@
 
 CD_APPLET_ON_CLICK_BEGIN
 	CDStatusNotifierItem *pItem = _get_item (CD_APPLET_CLICKED_ICON, CD_APPLET_CLICKED_CONTAINER);
+	//g_print ("click on item '%s'\n", pItem?pItem->cService:"none");
 	if (pItem != NULL)
 	{
 		gboolean r = _emit_click (pItem, CD_APPLET_CLICKED_ICON, CD_APPLET_CLICKED_CONTAINER, "Activate");
 		if (!r)
 		{
-			CDStatusNotifierItem *pItem = cd_satus_notifier_get_item_from_icon (CD_APPLET_CLICKED_ICON);
-			g_return_val_if_fail (pItem != NULL, CAIRO_DOCK_LET_PASS_NOTIFICATION);
 			if (pItem->cId != NULL)
 			{
 				cairo_dock_launch_command (pItem->cId);  // lancer une nouvelle fois l'appli montre sa fenetre (enfin, generalement).
@@ -121,7 +120,7 @@
 			G_TYPE_INVALID);
 		if (erreur != NULL)
 		{
-			g_print ("method %s failed (%s)\n", "Scroll", erreur->message);
+			//g_print ("method %s failed (%s)\n", "Scroll", erreur->message);
 			g_error_free (erreur);
 		}
 	}
@@ -173,7 +172,7 @@
 	if (pItemData != NULL && pItemData->pToolTip != NULL)
 	{
 		myDialogs.dialogTextDescription.bUseMarkup = TRUE;
-		g_print ("pItemData->pToolTip->cMessage : %s\n", pItemData->pToolTip->cMessage);
+		//g_print ("pItemData->pToolTip->cMessage : %s\n", pItemData->pToolTip->cMessage);
 		gchar *cText = g_strdup_printf ("<b>%s</b>\n%s", pItemData->pToolTip->cTitle, pItemData->pToolTip->cMessage);
 		gchar *cIconPath = NULL;
 		if (pItemData->pToolTip->cIconName)

=== modified file 'System-Monitor/src/applet-config.c'
--- System-Monitor/src/applet-config.c	2010-08-07 01:43:25 +0000
+++ System-Monitor/src/applet-config.c	2010-10-02 18:13:46 +0000
@@ -48,12 +48,6 @@
 	CD_CONFIG_GET_COLOR_RVB ("Configuration", "high color", myConfig.fHigholor);
 	CD_CONFIG_GET_COLOR ("Configuration", "bg color", myConfig.fBgColor);
 	
-	/*myConfig.fAlpha = CD_CONFIG_GET_DOUBLE ("Configuration", "watermark alpha");
-	if (myConfig.fAlpha != 0)
-	{
-		myConfig.cWatermarkImagePath = CD_CONFIG_GET_FILE_PATH ("Configuration", "watermark image", MY_APPLET_ICON_FILE);
-	}*/
-	
 	myConfig.iLowerLimit = CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "llt", 50);
 	myConfig.iUpperLimit = MAX (myConfig.iLowerLimit+1, CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "ult", 110));
 	myConfig.iAlertLimit = CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "alt", 100);
@@ -102,7 +96,6 @@
 	g_free (myConfig.cGThemePath);
 	g_free (myConfig.defaultTitle);
 	cairo_dock_free_label_description (myConfig.pTopTextDescription);
-	g_free (myConfig.cWatermarkImagePath);
 	g_free (myConfig.cSystemMonitorCommand);
 	g_free (myConfig.cSystemMonitorClass);
 CD_APPLET_RESET_CONFIG_END

=== modified file 'System-Monitor/src/applet-struct.h'
--- System-Monitor/src/applet-struct.h	2010-08-07 01:43:25 +0000
+++ System-Monitor/src/applet-struct.h	2010-10-02 18:13:46 +0000
@@ -34,6 +34,14 @@
 	CD_SYSMONITOR_NB_TYPES
 	} CDSysmonitorDisplayType; 
 
+typedef struct {
+	gint iLowerLimit;
+	gint iUpperLimit;
+	gint iAlertLimit;
+	gboolean bAlert;
+	gboolean bAlertSound;
+	} CDAlertParam;
+
 struct _AppletConfig {
 	gchar *defaultTitle;
 	gint iCheckInterval;
@@ -46,8 +54,6 @@
 	
 	CairoDockInfoDisplay iInfoDisplay;
 	gchar *cGThemePath;
-	gchar *cWatermarkImagePath;
-	gdouble fAlpha;
 	
 	CDSysmonitorDisplayType iDisplayType;
 	CairoDockTypeGraph iGraphType;
@@ -108,6 +114,10 @@
 	gdouble fPrevRamPercent, fPrevSwapPercent;
 	gdouble fGpuTempPercent;
 	gdouble fPrevGpuTempPercent;
+	gdouble fCpuTempPercent;
+	gdouble fPrevCpuTempPercent;
+	gdouble fFanSpeedPercent;
+	gdouble fPrevFanSpeedPercent;
 	gboolean bNeedsUpdate;
 	gint iTimerCount;
 	// end of shared memory.

=== modified file 'clock/src/CMakeLists.txt'
--- clock/src/CMakeLists.txt	2010-08-07 01:43:25 +0000
+++ clock/src/CMakeLists.txt	2010-10-02 18:13:46 +0000
@@ -4,9 +4,10 @@
 SET(cd-clock_LIB_SRCS
 	applet-struct.h
 	applet-init.c 			applet-init.h
-	applet-draw.c 			applet-draw.h
 	applet-config.c 			applet-config.h
 	applet-notifications.c 		applet-notifications.h
+	applet-draw.c 			applet-draw.h
+	applet-timer.c 			applet-timer.h
 	applet-theme.c 			applet-theme.h
 	applet-calendar.c 		applet-calendar.h
 	applet-task-editor.c 		applet-task-editor.h

=== modified file 'clock/src/applet-backend-default.c'
--- clock/src/applet-backend-default.c	2010-08-07 01:43:25 +0000
+++ clock/src/applet-backend-default.c	2010-10-02 18:13:46 +0000
@@ -45,46 +45,72 @@
 	}
 	gchar *cFile = g_strdup_printf ("%s/%s", cDirPath, "tasks.conf");
 	GKeyFile *pKeyFile = cairo_dock_open_key_file (cFile);
-	g_free (cFile);
+	
 	g_free (cDirPath);
 	if (pKeyFile == NULL)  // encore aucune taches.
+	{
+		g_free (cFile);
 		return NULL;
+	}
 	
 	gsize length=0;
 	gchar **pGroupList = g_key_file_get_groups (pKeyFile, &length);
 	if (pGroupList == NULL)
 	{
 		g_key_file_free (pKeyFile);
+		g_free (cFile);
 		return NULL;
 	}
 	
 	CDClockTask *pTask;
 	gchar *cTaskID;
 	GList *pTaskList = NULL;
+	guint iMonth = myData.currentTime.tm_mon;
+	guint iYear = myData.currentTime.tm_year + 1900;
+	guint y, m, freq;
+	gboolean bUpdateFile = FALSE;
 	guint i;
 	for (i = 0; i < length; i ++)
 	{
 		cTaskID = pGroupList[i];
+		
+		// discard tasks older than 1 year (clean the file too).
+		y = g_key_file_get_integer (pKeyFile, cTaskID, "year", NULL);
+		m = g_key_file_get_integer (pKeyFile, cTaskID, "month", NULL);
+		freq = g_key_file_get_integer (pKeyFile, cTaskID, "freq", NULL);
+		if (freq == CD_TASK_DONT_REPEAT && (iYear < y -1 || iYear == y - 1 && iMonth < m))
+		{
+			g_key_file_remove_group (pKeyFile, cTaskID, NULL);
+			bUpdateFile = TRUE;
+			g_free (cTaskID);
+			continue;
+		}
+		
+		// append the task.
 		pTask = g_new0 (CDClockTask, 1);
-		//g_print ("+ task %s\n", cTaskID);
-		
 		pTask->cID = cTaskID;
 		pTask->iDay = g_key_file_get_integer (pKeyFile, cTaskID, "day", NULL);
-		pTask->iMonth = g_key_file_get_integer (pKeyFile, cTaskID, "month", NULL);
-		pTask->iYear = g_key_file_get_integer (pKeyFile, cTaskID, "year", NULL);
+		pTask->iMonth = m;
+		pTask->iYear = y;
 		pTask->cTitle = g_key_file_get_string (pKeyFile, cTaskID, "title", NULL);
 		pTask->cText = g_key_file_get_string (pKeyFile, cTaskID, "text", NULL);
 		pTask->cTags = g_key_file_get_string (pKeyFile, cTaskID, "tags", NULL);
 		pTask->iHour = g_key_file_get_integer (pKeyFile, cTaskID, "hour", NULL);
 		pTask->iMinute = g_key_file_get_integer (pKeyFile, cTaskID, "minute", NULL);
-		pTask->iFrequency = g_key_file_get_integer (pKeyFile, cTaskID, "freq", NULL);
+		pTask->iFrequency = freq;
+		pTask->bAcknowledged = g_key_file_get_boolean (pKeyFile, cTaskID, "ack", NULL);
 		
 		pTaskList = g_list_prepend (pTaskList, pTask);
 		s_iCounter = MAX (s_iCounter, atoi (cTaskID));
 	}
 	
 	g_free (pGroupList);  // les elements sont les IDs et sont integres dans les taches.
+	
+	if (bUpdateFile)
+		cairo_dock_write_keys_to_file (pKeyFile, cFile);
+	
 	g_key_file_free (pKeyFile);
+	g_free (cFile);
 	return pTaskList;
 }
 
@@ -107,6 +133,7 @@
 	g_key_file_set_integer (pKeyFile, pTask->cID, "hour", pTask->iHour);
 	g_key_file_set_integer (pKeyFile, pTask->cID, "minute", pTask->iMinute);
 	g_key_file_set_integer (pKeyFile, pTask->cID, "freq", pTask->iFrequency);
+	g_key_file_set_boolean (pKeyFile, pTask->cID, "ack", pTask->bAcknowledged);
 	
 	cairo_dock_write_keys_to_file (pKeyFile, cFile);
 	g_free (cFile);
@@ -143,6 +170,7 @@
 	g_key_file_set_integer (pKeyFile, pTask->cID, "hour", pTask->iHour);
 	g_key_file_set_integer (pKeyFile, pTask->cID, "minute", pTask->iMinute);
 	g_key_file_set_integer (pKeyFile, pTask->cID, "freq", pTask->iFrequency);
+	g_key_file_set_boolean (pKeyFile, pTask->cID, "ack", pTask->bAcknowledged);
 	
 	cairo_dock_write_keys_to_file (pKeyFile, cFile);
 	g_free (cFile);

=== modified file 'clock/src/applet-backend-ical.c'
--- clock/src/applet-backend-ical.c	2010-08-07 01:43:25 +0000
+++ clock/src/applet-backend-ical.c	2010-10-02 18:13:46 +0000
@@ -173,7 +173,7 @@
 		pTask->iYear = liCalStartDate.year;
 		pTask->iHour = liCalStartDate.hour;
 		pTask->iMinute = liCalStartDate.minute;
-
+		
 		pTask->iFrequency = CD_TASK_DONT_REPEAT;
 		// TODO: really do the frequency management. If possible.
 		icalproperty *rrule = NULL;
@@ -191,6 +191,8 @@
 		pTask->cText = g_strdup(icalcomponent_get_description(piCalComponent));
 		pTask->cTags = g_strdup(icalcomponent_get_comment(piCalComponent));
 		
+		pTask->bAcknowledged = TRUE;  /// a recuperer si possible ...
+		
 		pTaskList = g_list_prepend (pTaskList, pTask);
 	}
 	
@@ -293,7 +295,7 @@
 
 static gboolean delete_task (CDClockTask *pTask, CairoDockModuleInstance *myApplet)
 {
-	g_print ("%s (%s)\n", __func__, pTask->cTitle);
+	//g_print ("%s (%s)\n", __func__, pTask->cTitle);
 
 	if( !_assert_data() ) return FALSE;
 	if( pTask == NULL ) return FALSE;
@@ -314,7 +316,7 @@
 
 static gboolean update_task (CDClockTask *pTask, CairoDockModuleInstance *myApplet)
 {
-	g_print ("%s (%s, '%s')\n", __func__, pTask->cTitle, pTask->cText);
+	//g_print ("%s (%s, '%s')\n", __func__, pTask->cTitle, pTask->cText);
 	//if( !delete_task (pTask, myApplet) ) return FALSE;
 	if( !create_task (pTask, myApplet) ) return FALSE;
 		

=== modified file 'clock/src/applet-calendar.c'
--- clock/src/applet-calendar.c	2010-08-07 01:43:25 +0000
+++ clock/src/applet-calendar.c	2010-10-02 18:13:46 +0000
@@ -131,6 +131,7 @@
 void cd_clock_remove_task_from_list (CDClockTask *pTask, CairoDockModuleInstance *myApplet)
 {
 	myData.pTasks = g_list_remove (myData.pTasks, pTask);
+	myData.pMissedTasks = g_list_remove (myData.pMissedTasks, pTask);
 	myData.pNextTask = cd_clock_get_next_scheduled_task (myApplet);
 	myData.pNextAnniversary = cd_clock_get_next_anniversary (myApplet);
 }
@@ -154,8 +155,10 @@
 {
 	g_list_foreach (myData.pTasks, (GFunc)cd_clock_free_task, NULL);
 	g_list_free (myData.pTasks);
+	g_list_free (myData.pMissedTasks);
 	myData.pTasks = NULL;
 	myData.pNextTask = NULL;
+	myData.pMissedTasks = NULL;
 }
 
 CDClockTask *cd_clock_get_task_by_id (const gchar *cID, CairoDockModuleInstance *myApplet)
@@ -384,6 +387,94 @@
 }
 
 
+GList *cd_clock_get_missed_tasks (CairoDockModuleInstance *myApplet)
+{
+	GList *pTaskList = NULL;
+	guint iDay = myData.currentTime.tm_mday;
+	guint iMonth = myData.currentTime.tm_mon;
+	guint iYear = myData.currentTime.tm_year + 1900;
+	guint iHour = myData.currentTime.tm_hour;
+	guint iMinute = myData.currentTime.tm_min;
+	
+	GDate* pCurrentDate = g_date_new_dmy (iDay, iMonth + 1, iYear);
+	GDate* pDate = g_date_new ();
+	guint d, m, y;
+	int iDelta;
+	CDClockTask *pTask;
+	GList *t;
+	for (t = myData.pTasks; t != NULL; t = t->next)
+	{
+		pTask = t->data;
+		if (pTask->bAcknowledged)
+			continue;
+		
+		switch (pTask->iFrequency)
+		{
+			case CD_TASK_DONT_REPEAT:
+			default:
+				d = pTask->iDay;
+				m = pTask->iMonth+1;
+				y = pTask->iYear;
+				g_date_set_dmy (pDate, d, m, y);
+				iDelta = g_date_days_between (pCurrentDate, pDate);
+			break;
+			
+			case CD_TASK_EACH_MONTH:
+				d = pTask->iDay;
+				m = iMonth+1;
+				y = iYear;
+				g_date_set_dmy (pDate, d, m, y);
+				iDelta = g_date_days_between (pCurrentDate, pDate);
+				if (iDelta > 0)  // pDate est apres pCurrentDate => on teste le mois d'avant.
+				{
+					if (iMonth > 0)
+					{
+						m = iMonth;
+						g_date_set_dmy (pDate, d, m, y);
+					}
+					else
+					{
+						m = 12;
+						y = pTask->iYear - 1;
+						g_date_set_dmy (pDate, d, m, y);
+					}
+					iDelta = g_date_days_between (pCurrentDate, pDate);
+				}
+			break;
+			
+			case CD_TASK_EACH_YEAR:
+				d = pTask->iDay;
+				m = pTask->iMonth+1;
+				y = iYear;
+				g_date_set_dmy (pDate, d, m, y);
+				iDelta = g_date_days_between (pCurrentDate, pDate);
+				//g_print ("iDelta : %d/%d/%d -> %d (%s)\n", d, m, y, iDelta, pTask->cTitle);
+				if (iDelta > 0)  // pDate est apres pCurrentDate => on teste l'annee d'avant.
+				{
+					y = iYear - 1;
+					g_date_set_dmy (pDate, d, m, y);
+					iDelta = g_date_days_between (pCurrentDate, pDate);
+				}
+			break;
+		}
+		
+		if (iDelta <= 0 && iDelta > -7)
+		{
+			if (iDelta == 0)  // today's task, check time
+			{
+				if (pTask->iHour > iHour || (pTask->iHour == iHour && pTask->iMinute > iMinute))  // it's in the future, skip it.
+					continue;
+			}
+			pTaskList = g_list_prepend (pTaskList, pTask);
+		}  // on n'arrete pas le parcours si iDelta > 7 pour prendre en compte aussi les anniv.
+	}
+	g_date_free (pCurrentDate);
+	g_date_free (pDate);
+	
+	return pTaskList;
+}
+
+
   //////////////
  // CALENDAR //
 //////////////

=== modified file 'clock/src/applet-calendar.h'
--- clock/src/applet-calendar.h	2010-08-07 01:43:25 +0000
+++ clock/src/applet-calendar.h	2010-10-02 18:13:46 +0000
@@ -52,6 +52,8 @@
 
 CDClockTask *cd_clock_get_next_anniversary (CairoDockModuleInstance *myApplet);
 
+GList *cd_clock_get_missed_tasks (CairoDockModuleInstance *myApplet);
+
 
 void cd_clock_update_calendar_marks (CairoDockModuleInstance *myApplet);
 

=== modified file 'clock/src/applet-config.c'
--- clock/src/applet-config.c	2010-09-07 00:39:20 +0000
+++ clock/src/applet-config.c	2010-10-02 18:13:46 +0000
@@ -24,6 +24,7 @@
 #include "applet-draw.h"
 #include "applet-theme.h"
 #include "applet-calendar.h"
+#include "applet-timer.h"
 #include "applet-config.h"
 
 #define CD_CLOCK_TIMEZONE_DIR "/usr/share/zoneinfo"

=== modified file 'clock/src/applet-draw.c'
--- clock/src/applet-draw.c	2010-09-07 00:39:20 +0000
+++ clock/src/applet-draw.c	2010-10-02 18:13:46 +0000
@@ -24,383 +24,19 @@
 #include <math.h>
 
 #include "applet-struct.h"
-#include "applet-config.h"
-#include "applet-digital.h" //Digital html like renderer
-#include "applet-calendar.h"
+//#include "applet-digital.h" //Digital html like renderer
 #include "applet-draw.h"
 
 #define CD_CLOCK_DATE_BUFFER_LENGTH 50
 static char s_cDateBuffer[CD_CLOCK_DATE_BUFFER_LENGTH+1];
 
-
-void cd_clock_free_alarm (CDClockAlarm *pAlarm)
-{
-	g_free (pAlarm->cMessage);
-	g_free (pAlarm);
-}
-
-static void _set_warning_repetition (int iClickedButton, GtkWidget *pInteractiveWidget, CDClockTask *pTask, CairoDialog *pDialog);
-static gboolean _task_warning (CDClockTask *pTask, const gchar *cMessage)
-{
-	cd_debug ("%s (%s)", __func__, cMessage);
-	CairoDockModuleInstance *myApplet = pTask->pApplet;
-	
-	GtkWidget *pScale = gtk_hscale_new_with_range (1, 60, 1);  // 1mn-60mn et 1 cran/mn.
-	gtk_scale_set_digits (GTK_SCALE (pScale), 0);
-	gtk_range_set_value (GTK_RANGE (pScale), pTask->iWarningDelay != 0 ? pTask->iWarningDelay : 15);  // 15mn par defaut.
-	gtk_widget_set (pScale, "width-request", CAIRO_DIALOG_MIN_SCALE_WIDTH, NULL);
-	
-	GtkWidget *pExtendedWidget = gtk_hbox_new (FALSE, 0);
-	GtkWidget *label = gtk_label_new (D_("1mn"));
-	GtkWidget *pAlign = gtk_alignment_new (1., 1., 0., 0.);
-	gtk_container_add (GTK_CONTAINER (pAlign), label);
-	gtk_box_pack_start (GTK_BOX (pExtendedWidget), pAlign, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (pExtendedWidget), pScale, FALSE, FALSE, 0);
-	label = gtk_label_new (D_("1h"));
-	pAlign = gtk_alignment_new (1., 1., 0., 0.);
-	gtk_container_add (GTK_CONTAINER (pAlign), label);
-	gtk_box_pack_start (GTK_BOX (pExtendedWidget), pAlign, FALSE, FALSE, 0);
-	
-	cairo_dock_dialog_unreference (pTask->pWarningDialog);
-	myDialogs.dialogTextDescription.bUseMarkup = TRUE;
-	pTask->pWarningDialog = cairo_dock_show_dialog_full (cMessage,
-		myIcon, myContainer,
-		(pTask->iWarningDelay != 0 ? MIN (pTask->iWarningDelay-.1, 15.) : 15) * 60e3,  // on laisse le dialogue visible le plus longtemps possible, jusqu'a 15mn.
-		MY_APPLET_SHARE_DATA_DIR"/icon-task.png",
-		pExtendedWidget,
-		(CairoDockActionOnAnswerFunc) _set_warning_repetition,
-		pTask,
-		NULL);
-	myDialogs.dialogTextDescription.bUseMarkup = FALSE;
-	
-	CD_APPLET_DEMANDS_ATTENTION (NULL, 3600);  // ~ 1h, pour si on loupe le dialogue.
-	return TRUE;
-}
-static gboolean _task_warning_repeat (CDClockTask *pTask, const gchar *cMessage)
-{
-	gchar *cText = g_strdup_printf ("%s %d:%02d\n<b>%s</b>\n %s\n\n%s",
-		D_("The following task was scheduled at"), pTask->iHour, pTask->iMinute,
-		pTask->cTitle?pTask->cTitle:D_("No title"),
-		pTask->cText?pTask->cText:"",
-		D_("Repeat this message every:"));
-	_task_warning (pTask, cText);
-	g_free (cText);
-	return TRUE;
-}
-static void _set_warning_repetition (int iClickedButton, GtkWidget *pInteractiveWidget, CDClockTask *pTask, CairoDialog *pDialog)
-{
-	cd_debug ("%s (%d)", __func__, iClickedButton);
-	GList *cl = gtk_container_get_children (GTK_CONTAINER (pInteractiveWidget));
-	g_return_if_fail (cl != NULL && cl->next != NULL);
-	GtkWidget *pScale = cl->next->data;
-	g_return_if_fail (pScale != NULL);
-	
-	int dt = gtk_range_get_value (GTK_RANGE (pScale));
-	if (dt == 0 || (iClickedButton != 0 && iClickedButton != -1))
-	{
-		if (pTask->iSidWarning != 0)
-		{
-			g_source_remove (pTask->iSidWarning);
-			pTask->iSidWarning = 0;
-		}
-	}
-	else
-	{
-		if (pTask->iSidWarning != 0 && dt != pTask->iWarningDelay)
-		{
-			g_source_remove (pTask->iSidWarning);
-			pTask->iSidWarning = 0;
-		}
-		if (pTask->iSidWarning == 0)
-		{
-			pTask->iSidWarning = g_timeout_add_seconds (dt*60, (GSourceFunc) _task_warning_repeat, pTask);
-			pTask->iWarningDelay = dt;
-		}
-	}
-	pTask->pWarningDialog = NULL;
-	CairoDockModuleInstance *myApplet = pTask->pApplet;
-	CD_APPLET_STOP_DEMANDING_ATTENTION;
-}
-
-static inline void _get_current_time (time_t epoch, CairoDockModuleInstance *myApplet)
-{
-	if (myConfig.cLocation != NULL)
-	{
-		g_setenv ("TZ", myConfig.cLocation, TRUE);
-		tzset ();
-	}
-	localtime_r (&epoch, &myData.currentTime);
-	if (myConfig.cLocation != NULL)
-	{
-		if (myData.cSystemLocation != NULL)
-			g_setenv ("TZ", myData.cSystemLocation, TRUE);
-		else
-			g_unsetenv ("TZ");
-	}
-}
-
-void cd_clock_init_time (CairoDockModuleInstance *myApplet)
-{
-	time_t epoch = (time_t) time (NULL);
-	_get_current_time (epoch, myApplet);
-}
-
-gboolean cd_clock_update_with_time (CairoDockModuleInstance *myApplet)
-{
-	CD_APPLET_ENTER;
-	//\________________ On recupere l'heure courante.
-	time_t epoch = (time_t) time (NULL);
-	_get_current_time (epoch, myApplet);
-	
-	//\________________ On change la date si necessaire.
-	int iWidth, iHeight;
-	CD_APPLET_GET_MY_ICON_EXTENT (&iWidth, &iHeight);
-	gboolean bNewDate = (myData.currentTime.tm_mday != myData.iLastCheckedDay || myData.currentTime.tm_mon != myData.iLastCheckedMonth || myData.currentTime.tm_year != myData.iLastCheckedYear);
-	if (bNewDate)
-	{
-		strftime (s_cDateBuffer, CD_CLOCK_DATE_BUFFER_LENGTH, "%a %d %b", &myData.currentTime);
-		myData.iLastCheckedDay = myData.currentTime.tm_mday;
-		myData.iLastCheckedMonth = myData.currentTime.tm_mon;
-		myData.iLastCheckedYear = myData.currentTime.tm_year;
-	}
-	if (CD_APPLET_MY_CONTAINER_IS_OPENGL && myConfig.bOldStyle && myConfig.iShowDate == CAIRO_DOCK_INFO_ON_ICON)
-	{
-		if (bNewDate || myData.iDateTexture == 0)
-		{
-			strftime (s_cDateBuffer, CD_CLOCK_DATE_BUFFER_LENGTH, "%a %d %b", &myData.currentTime);
-			
-			if (myData.iDateTexture != 0)
-				_cairo_dock_delete_texture (myData.iDateTexture);
-			
-			double fScale = (double) iWidth / (double) myData.DimensionData.width;
-			CairoDockLabelDescription labelDescription;
-			labelDescription.iSize = 10;
-			labelDescription.cFont = (gchar*)"Sans";  // on peut caster car on ne liberera rien.
-			labelDescription.iWeight = cairo_dock_get_pango_weight_from_1_9 (5);
-			labelDescription.iStyle = PANGO_STYLE_NORMAL;
-			labelDescription.fColorStart[0] = myConfig.fDateColor[0];
-			labelDescription.fColorStart[1] = myConfig.fDateColor[1];
-			labelDescription.fColorStart[2] = myConfig.fDateColor[2];
-			memcpy (&labelDescription.fColorStop[0], &labelDescription.fColorStart[0], sizeof (labelDescription.fColorStop));
-			labelDescription.fBackgroundColor[3] = 0;
-			labelDescription.bOutlined = FALSE;
-			labelDescription.iMargin = 0;
-			cairo_surface_t *pDateSurface = cairo_dock_create_surface_from_text_full (s_cDateBuffer,
-				&labelDescription,
-				fScale,
-				iWidth,
-				&myData.iDateWidth, &myData.iDateHeight,
-				NULL, NULL);
-			myData.iDateWidth *= fScale;
-			myData.iDateHeight *= fScale;
-			//g_print ("date : %dx%d\n", myData.iDateWidth, myData.iDateHeight);
-			myData.iDateTexture = cairo_dock_create_texture_from_surface (pDateSurface);
-			cairo_surface_destroy (pDateSurface);
-		}
-	}
-	if (bNewDate && myConfig.iShowDate == CAIRO_DOCK_INFO_ON_LABEL)
-	{
-		CD_APPLET_SET_NAME_FOR_MY_ICON (s_cDateBuffer);
-	}
-	
-	//\________________ On dessine avec cette heure.
-	myData.iSmoothAnimationStep = 0;
-	if (myConfig.bOldStyle)
-	{
-		if (CD_APPLET_MY_CONTAINER_IS_OPENGL)
-			cd_clock_render_analogic_to_texture (myApplet, iWidth, iHeight, &myData.currentTime, 0.);
-		else
-			cd_clock_draw_analogic (myApplet, iWidth, iHeight, &myData.currentTime);
-	}
-	else
-	{
-		cd_clock_draw_text (myApplet, iWidth, iHeight, &myData.currentTime);
-		if (CD_APPLET_MY_CONTAINER_IS_OPENGL)  // on ne sait pas bien dessiner du texte, donc on le fait en cairo, et on transfere tout sur notre texture.
-			cairo_dock_update_icon_texture (myIcon);
-	}
-	
-	if (myDock && ! CD_APPLET_MY_CONTAINER_IS_OPENGL)  // les reflets pour cairo.
-	{
-		CD_APPLET_UPDATE_REFLECT_ON_MY_ICON;
-	}
-	
-	//\________________ On redessine notre icone.
-	CD_APPLET_REDRAW_MY_ICON;
-	
-	//\________________ On teste les alarmes et les taches.
-	if (!myConfig.bShowSeconds || myData.currentTime.tm_min != myData.iLastCheckedMinute)  // un g_timeout de 1min ne s'effectue pas forcement a exectement 1 minute d'intervalle, et donc pourrait "sauter" la minute de l'alarme, d'ou le test sur bShowSeconds dans le cas ou l'applet ne verifie que chaque minute.
-	{
-		myData.iLastCheckedMinute = myData.currentTime.tm_min;
-		
-		// les alarmes.
-		CDClockAlarm *pAlarm;
-		guint i;
-		for (i = 0; i < myConfig.pAlarms->len; i ++)
-		{
-			pAlarm = g_ptr_array_index (myConfig.pAlarms, i);
-			
-			if (myData.currentTime.tm_hour == pAlarm->iHour && myData.currentTime.tm_min == pAlarm->iMinute)
-			{
-				gboolean bShowAlarm = FALSE, bRemoveAlarm = FALSE;
-				if (pAlarm->iDayOfWeek > 0)
-				{
-					if (pAlarm->iDayOfWeek == 1)
-						bShowAlarm = TRUE;
-					else if (pAlarm->iDayOfWeek - 1 == myData.currentTime.tm_wday)
-						bShowAlarm = TRUE;
-					else if (myData.currentTime.tm_wday == 0 || myData.currentTime.tm_wday == 6)  // week-end
-					{
-						if (pAlarm->iDayOfWeek == 9)
-							bShowAlarm = TRUE;
-					}
-					else if (pAlarm->iDayOfWeek == 8)
-						bShowAlarm = TRUE;
-				}
-				else if (pAlarm->iDayOfMonth > 0)
-					bShowAlarm = (pAlarm->iDayOfMonth - 1 == myData.currentTime.tm_mday);
-				else  // c'est une alarme qui ne se repete pas.
-				{
-					bShowAlarm = TRUE;
-					bRemoveAlarm = TRUE;
-				}
-				
-				if (bShowAlarm)
-				{
-					cd_message ("Dring ! %s", pAlarm->cMessage);
-					cairo_dock_show_temporary_dialog (pAlarm->cMessage, myIcon, myContainer, 60e3);