Merge lp:~cairo-dock-team/ubuntu/quantal/cairo-dock/3.0.2 into lp:ubuntu/quantal/cairo-dock

[Matthieu Baerts]

Hello,

The Cairo-Dock team proposes a new "bug-fix" version of their Cairo-Dock packages.

This is the Upstream ChangeLog:
* 3.0.0 -> 3.0.1:
   - Dialog: fixed a bug where the dock could auto-hide when a modal dialog
      was raised
   - Dialog: fixed a crash with gcc-4.7: the local variable can be corrupted
      due to optimisations
   - Fixed a bug where the dock didn't accept clicks when the mouse touches
      the screen edge (with auto-hide)
   - Added a compilation option to not force the display of icons in menus
      (design request but disable by default)
   - Fixed a bug where the hidden dock background color was not updated
      properly
   - Class-Manager: fixed a bug with Windows applications whose name is in
      upper case (.EXE)
   - GUI: use cairo_dock_get_xwindow_class to link a programm with a launcher
   - French translations: fixed 2 small errors
* 3.0.1 -> 3.0.2:
   - Main GUI: Fixed a crash when hovering group buttons too quickly
   - Main GUI: The dialog and preview didn't appear when hovering the button
   - Accelerators: On recent distro, 'Control' key is now called 'Primary'
   - Icon Mgr: Added a mutex because of occasional crashes with
      gtk_icon_theme_lookup_icon
   - Icon Mgr: Don't call a 'change-icon' callback when clicking or scrolling
      on an icon, and trigger an unneeded animation on the icon
   - Dock Mgr: Avoid emitting an 'enter' event when not needed
   - Class Mgr: Fixed 2 typos (special case for kdesu and not kdes)
   - Class Mgr: Remove launching options (%U) in quick-list Exec command
      (LP: #1002691)
   - Dialogues: Prevent closing the dialog unexpectedly when clicking on it,
      if the click is actually inside the interactive widget
   - Background: When set to 'always visible', applets' background couldn't
      be turned off
   - Added a workaround for the Unity-panel which has a wrong window type
   - po: Updated translations

This branch should be ready to be pushed on lp:ubuntu/cairo-dock (except the UNRELEASED version in debian/changelog)
This version compiles fine on Quantal (and older) and has been tested: https://launchpad.net/~matttbe/+archive/experimental-debian-build/+sourcepub/2516739/+listing-archive-extra

**@ ubuntu-devs**
Do you think it's possible to upload this version in Precise-Update? (simply because it's a bug-fix version and Precise is a LTS version)

Thank you for your help! ;)

PS: Don't forget our plug-ins ( LP: #1014804 )

[Luke Yelavich (themuso)]

When attempting to merge your branch into lp:ubuntu/cairo-dock, I still get 2 conflicts:

luke@acapella:~/Ubuntu/quantal/bzr/cairo-dock/cairo-dock$ bzr conflicts
Text conflict in src/gldit/cairo-dock-callbacks.c
Text conflict in src/gldit/cairo-dock-dock-factory.c

Did you branch against the latest changes in the lp:ubuntu/cairo-dock package, or have I missed something?

Thanks for your work.

review: Needs Fixing

[Matthieu Baerts (matttbe)]

> Did you branch against the latest changes in the lp:ubuntu/cairo-dock package
Yes of course (as you can see here above, we only have the rev 27 as unmerged rev and the rev 26 has the same rev ID).

But I confirm this bug... This is strange because I only used bzr merge-upstream.
Note that on rev 26, there is a patch which was applied but the diff seems correct except that if you have a look to the conflict, it seems the previous patched was unapplied before merging...

[Matthieu Baerts (matttbe)]

If I remove all patches and then use bzr merge-upstream (lp:~cairo-dock-team/ubuntu/quantal/cairo-dock/3.0.2-1), I still have the same problem :-/

Note that you can use the .OTHER files if you want to manually fix the conflicts but it seems there is also a conflict in src/gldit/cairo-dock-keybinder.h (it should be unmodified)
I resolve conflicts in lp:~cairo-dock-team/ubuntu/quantal/cairo-dock/3.0.2-without-conflict
I guess you can directly use 'bzr pull lp:~cairo-dock-team/ubuntu/quantal/cairo-dock/3.0.2-without-conflict'

[Matthieu Baerts (matttbe)]

@Luke: it seems you've to use 'bzr pull' because I've done the merge then you shouldn't have to do it again (according to jelmer on irc)

[Andrew Starr-Bochicchio (andrewsomething)]

Uploaded. Thanks for your work and your patience with the bzr issues!

I'll try to get to the plugins package latter today (or tomorrow if I don't have time).

review: Approve

[Matthieu Baerts (matttbe)]

@Andrew and Luke: thank you for your help!

=== removed directory '.pc/01-bzr_dock-s_menu.patch'
=== removed directory '.pc/01-bzr_dock-s_menu.patch/src'
=== removed directory '.pc/01-bzr_dock-s_menu.patch/src/gldit'
=== removed file '.pc/01-bzr_dock-s_menu.patch/src/gldit/cairo-dock-callbacks.c'
--- .pc/01-bzr_dock-s_menu.patch/src/gldit/cairo-dock-callbacks.c	2012-04-25 01:29:46 +0000
+++ .pc/01-bzr_dock-s_menu.patch/src/gldit/cairo-dock-callbacks.c	1970-01-01 00:00:00 +0000
@@ -1,1760 +0,0 @@
-/**
-* This file is a part of the Cairo-Dock project
-*
-* Copyright : (C) see the 'copyright' file.
-* E-mail    : see the 'copyright' file.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 3
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <math.h>
-#include <sys/time.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h> 
-#include <cairo.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#include <gdk/gdkx.h>
-
-#include <GL/gl.h>
-#include <GL/glu.h>
-
-#include "cairo-dock-draw.h"
-#include "cairo-dock-animations.h"
-#include "cairo-dock-image-buffer.h"
-#include "cairo-dock-module-factory.h"
-#include "cairo-dock-icon-factory.h"
-#include "cairo-dock-icon-facility.h"
-#include "cairo-dock-applications-manager.h"
-#include "cairo-dock-application-facility.h"
-#include "cairo-dock-desktop-file-factory.h"
-#include "cairo-dock-launcher-manager.h"
-#include "cairo-dock-config.h"
-#include "cairo-dock-container.h"
-#include "cairo-dock-dock-facility.h"
-#include "cairo-dock-notifications.h"
-#include "cairo-dock-dialog-manager.h"
-#include "cairo-dock-log.h"
-#include "cairo-dock-dock-manager.h"
-#include "cairo-dock-keybinder.h"
-#include "cairo-dock-draw-opengl.h"
-#include "cairo-dock-opengl.h"
-#include "cairo-dock-flying-container.h"
-#include "cairo-dock-animations.h"
-#include "cairo-dock-backends-manager.h"
-#include "cairo-dock-class-manager.h"
-#include "cairo-dock-X-manager.h"
-#include "cairo-dock-X-utilities.h"
-#include "cairo-dock-X-manager.h"
-#include "cairo-dock-data-renderer.h"  // cairo_dock_refresh_data_renderer
-#include "cairo-dock-callbacks.h"
-
-extern CairoDockDesktopGeometry g_desktopGeometry;
-extern CairoDockHidingEffect *g_pHidingBackend;
-extern CairoDockHidingEffect *g_pKeepingBelowBackend;
-extern CairoDockGLConfig g_openglConfig;
-
-static Icon *s_pIconClicked = NULL;  // pour savoir quand on deplace une icone a la souris. Dangereux si l'icone se fait effacer en cours ...
-static int s_iClickX, s_iClickY;  // coordonnees du clic dans le dock, pour pouvoir initialiser le deplacement apres un seuil.
-static int s_iSidShowSubDockDemand = 0;
-static int s_iSidActionOnDragHover = 0;
-static CairoDock *s_pDockShowingSubDock = NULL;  // on n'accede pas a son contenu, seulement l'adresse.
-static CairoDock *s_pSubDockShowing = NULL;  // on n'accede pas a son contenu, seulement l'adresse.
-static CairoFlyingContainer *s_pFlyingContainer = NULL;
-static int s_iFirstClickX=0, s_iFirstClickY=0;  // for double-click.
-
-extern CairoDock *g_pMainDock;  // pour le raise-on-shortcut
-
-extern gboolean g_bUseOpenGL;
-
-static gboolean s_bHideAfterShortcut = FALSE;
-static gboolean s_bFrozenDock = FALSE;
-static gboolean s_bIconDragged = FALSE;
-
-static gboolean _check_mouse_outside (CairoDock *pDock);
-
-static gboolean _mouse_is_really_outside (CairoDock *pDock)
-{
-	/**return (pDock->container.iMouseX <= 0
-		|| pDock->container.iMouseX >= pDock->container.iWidth
-		|| (pDock->container.bDirectionUp ?
-			(pDock->container.iMouseY > pDock->container.iHeight
-			|| pDock->container.iMouseY <= (pDock->fMagnitudeMax != 0 ? 0 : pDock->container.iHeight - pDock->iMinDockHeight))
-			: (pDock->container.iMouseY < 0
-			||
-		pDock->container.iMouseY >= (pDock->fMagnitudeMax != 0 ? pDock->container.iHeight : pDock->iMinDockHeight))));*/
-	double x1, x2, y1, y2;
-	if (pDock->iInputState == CAIRO_DOCK_INPUT_ACTIVE)
-	{
-		x1 = 0;
-		x2 = pDock->container.iWidth;
-		if (pDock->container.bDirectionUp)
-		{
-			///y1 = (pDock->fMagnitudeMax != 0 ? 0 : pDock->container.iHeight - pDock->iMinDockHeight);
-			y1 = pDock->container.iHeight - pDock->iActiveHeight;
-			y2 = pDock->container.iHeight;
-		}
-		else
-		{
-			y1 = 0;
-			///y2 = (pDock->fMagnitudeMax != 0 ? pDock->container.iHeight : pDock->iMinDockHeight);
-			y2 = pDock->iActiveHeight;
-		}
-	}
-	else if (pDock->iInputState == CAIRO_DOCK_INPUT_AT_REST)
-	{
-		x1 = (pDock->container.iWidth - pDock->iMinDockWidth) / 2;
-		x2 = (pDock->container.iWidth + pDock->iMinDockWidth) / 2;
-		if (pDock->container.bDirectionUp)
-		{
-			y1 = pDock->container.iHeight - pDock->iMinDockHeight;
-			y2 = pDock->container.iHeight;
-		}
-		else
-		{
-			y1 = 0;
-			y2 = pDock->iMinDockHeight;
-		}		
-	}
-	else  // hidden
-		return TRUE;
-	if (pDock->container.iMouseX <= x1
-	|| pDock->container.iMouseX >= x2)
-		return TRUE;
-	if (pDock->container.iMouseY <= y1
-	|| pDock->container.iMouseY >= y2)
-		return TRUE;	
-	
-	return FALSE;
-}
-#define CD_CLICK_ZONE 5
-
-void cairo_dock_freeze_docks (gboolean bFreeze)
-{
-	s_bFrozenDock = bFreeze;
-}
-
-gboolean cairo_dock_render_dock_notification (gpointer pUserData, CairoDock *pDock, cairo_t *pCairoContext)
-{
-	if (! pCairoContext)  // on n'a pas mis le rendu cairo ici a cause du rendu optimise.
-	{
-		glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | (pDock->pRenderer->bUseStencil && g_openglConfig.bStencilBufferAvailable ? GL_STENCIL_BUFFER_BIT : 0));
-		gldi_glx_apply_desktop_background (CAIRO_CONTAINER (pDock));
-		
-		if (pDock->fHideOffset != 0 && g_pHidingBackend != NULL && g_pHidingBackend->pre_render_opengl)
-			g_pHidingBackend->pre_render_opengl (pDock, pDock->fHideOffset);
-		
-		if (pDock->iFadeCounter != 0 && g_pKeepingBelowBackend != NULL && g_pKeepingBelowBackend->pre_render_opengl)
-			g_pKeepingBelowBackend->pre_render_opengl (pDock, (double) pDock->iFadeCounter / myBackendsParam.iHideNbSteps);
-		
-		pDock->pRenderer->render_opengl (pDock);
-		
-		if (pDock->fHideOffset != 0 && g_pHidingBackend != NULL && g_pHidingBackend->post_render_opengl)
-			g_pHidingBackend->post_render_opengl (pDock, pDock->fHideOffset);
-		
-		if (pDock->iFadeCounter != 0 && g_pKeepingBelowBackend != NULL && g_pKeepingBelowBackend->post_render_opengl)
-			g_pKeepingBelowBackend->post_render_opengl (pDock, (double) pDock->iFadeCounter / myBackendsParam.iHideNbSteps);
-	}
-	return CAIRO_DOCK_LET_PASS_NOTIFICATION;
-}
-
-gboolean cairo_dock_on_expose (GtkWidget *pWidget,
-#if (GTK_MAJOR_VERSION < 3)
-	GdkEventExpose *pExpose,
-#else
-	cairo_t *ctx,
-#endif
-	CairoDock *pDock)
-{
-	GdkRectangle area;
-	#if (GTK_MAJOR_VERSION < 3)
-	memcpy (&area, &pExpose->area, sizeof (GdkRectangle));
-	#else
-	double x1, x2, y1, y2;
-	cairo_clip_extents (ctx, &x1, &y1, &x2, &y2);
-	area.x = x1;
-	area.y = y1;
-	area.width = x2 - x1;
-	area.height = y2 - y1;  /// or the opposite ?...
-	#endif
-	//g_print ("%s ((%d;%d) %dx%d)\n", __func__, area.x, area.y, area.width, area.height);
-	
-	//\________________ OpenGL rendering
-	if (g_bUseOpenGL && pDock->pRenderer->render_opengl != NULL)
-	{
-		if (! gldi_glx_begin_draw_container_full (CAIRO_CONTAINER (pDock), FALSE))  // FALSE to keep the color buffer (motion-blur).
-			return FALSE;
-		
-		if (area.x + area.y != 0)
-		{
-			glEnable (GL_SCISSOR_TEST);  // ou comment diviser par 4 l'occupation CPU !
-			glScissor ((int) area.x,
-				(int) (pDock->container.bIsHorizontal ? pDock->container.iHeight : pDock->container.iWidth) -
-					area.y - area.height,  // lower left corner of the scissor box.
-				(int) area.width,
-				(int) area.height);
-		}
-		
-		if (cairo_dock_is_loading ())
-		{
-			// on laisse transparent
-		}
-		else if (cairo_dock_is_hidden (pDock) && (g_pHidingBackend == NULL || !g_pHidingBackend->bCanDisplayHiddenDock))
-		{
-			cairo_dock_render_hidden_dock_opengl (pDock);
-		}
-		else
-		{
-			cairo_dock_notify_on_object (pDock, NOTIFICATION_RENDER, pDock, NULL);
-		}
-		glDisable (GL_SCISSOR_TEST);
-		
-		gldi_glx_end_draw_container (CAIRO_CONTAINER (pDock));
-		
-		return FALSE ;
-	}
-	
-	//\________________ Cairo optimized rendering
-	if (area.x + area.y != 0)  // x et/ou y sont > 0.
-	{
-		if (! cairo_dock_is_hidden (pDock) || (g_pHidingBackend != NULL && g_pHidingBackend->bCanDisplayHiddenDock))  // if the dock is invisible, we don't use the optimized rendering (for always-visible icons for instance)
-		{
-			cairo_t *pCairoContext = cairo_dock_create_drawing_context_on_area (CAIRO_CONTAINER (pDock), &area, NULL);
-			
-			if (pDock->fHideOffset != 0 && g_pHidingBackend != NULL && g_pHidingBackend->pre_render)
-				g_pHidingBackend->pre_render (pDock, pDock->fHideOffset, pCairoContext);
-			
-			if (pDock->iFadeCounter != 0 && g_pKeepingBelowBackend != NULL && g_pKeepingBelowBackend->pre_render)
-				g_pKeepingBelowBackend->pre_render (pDock, (double) pDock->iFadeCounter / myBackendsParam.iHideNbSteps, pCairoContext);
-			
-			if (pDock->pRenderer->render_optimized != NULL)
-				pDock->pRenderer->render_optimized (pCairoContext, pDock, &area);
-			else
-				pDock->pRenderer->render (pCairoContext, pDock);
-			
-			if (pDock->fHideOffset != 0 && g_pHidingBackend != NULL && g_pHidingBackend->post_render)
-				g_pHidingBackend->post_render (pDock, pDock->fHideOffset, pCairoContext);
-		
-			if (pDock->iFadeCounter != 0 && g_pKeepingBelowBackend != NULL && g_pKeepingBelowBackend->post_render)
-				g_pKeepingBelowBackend->post_render (pDock, (double) pDock->iFadeCounter / myBackendsParam.iHideNbSteps, pCairoContext);
-			
-			cairo_dock_notify_on_object (pDock, NOTIFICATION_RENDER, pDock, pCairoContext);
-			
-			cairo_destroy (pCairoContext);
-			return FALSE;
-		}
-		
-	}
-	
-	//\________________ Cairo rendering
-	cairo_t *pCairoContext = cairo_dock_create_drawing_context_on_container (CAIRO_CONTAINER (pDock));
-	
-	if (cairo_dock_is_loading ())  // transparent pendant le chargement.
-	{
-		
-	}
-	else if (cairo_dock_is_hidden (pDock) && (g_pHidingBackend == NULL || !g_pHidingBackend->bCanDisplayHiddenDock))
-	{
-		cairo_dock_render_hidden_dock (pCairoContext, pDock);
-	}
-	else
-	{
-		if (pDock->fHideOffset != 0 && g_pHidingBackend != NULL && g_pHidingBackend->pre_render)
-			g_pHidingBackend->pre_render (pDock, pDock->fHideOffset, pCairoContext);
-		
-		if (pDock->iFadeCounter != 0 && g_pKeepingBelowBackend != NULL && g_pKeepingBelowBackend->pre_render)
-			g_pKeepingBelowBackend->pre_render (pDock, (double) pDock->iFadeCounter / myBackendsParam.iHideNbSteps, pCairoContext);
-		
-		pDock->pRenderer->render (pCairoContext, pDock);
-		
-		if (pDock->fHideOffset != 0 && g_pHidingBackend != NULL && g_pHidingBackend->post_render)
-			g_pHidingBackend->post_render (pDock, pDock->fHideOffset, pCairoContext);
-		
-		if (pDock->iFadeCounter != 0 && g_pKeepingBelowBackend != NULL && g_pKeepingBelowBackend->post_render)
-			g_pKeepingBelowBackend->post_render (pDock, (double) pDock->iFadeCounter / myBackendsParam.iHideNbSteps, pCairoContext);
-		
-		cairo_dock_notify_on_object (pDock, NOTIFICATION_RENDER, pDock, pCairoContext);
-	}
-	
-	cairo_destroy (pCairoContext);
-	return FALSE;
-}
-
-
-static gboolean _emit_leave_signal_delayed (CairoDock *pDock)
-{
-	cairo_dock_emit_leave_signal (CAIRO_CONTAINER (pDock));
-	pDock->iSidLeaveDemand = 0;
-	return FALSE;
-}
-static gboolean _cairo_dock_show_sub_dock_delayed (CairoDock *pDock)
-{
-	s_iSidShowSubDockDemand = 0;
-	s_pDockShowingSubDock = NULL;
-	s_pSubDockShowing = NULL;
-	Icon *icon = cairo_dock_get_pointed_icon (pDock->icons);
-	//g_print ("%s (%x, %x)", __func__, icon, icon ? icon->pSubDock:0);
-	if (icon != NULL && icon->pSubDock != NULL)
-		cairo_dock_show_subdock (icon, pDock);
-
-	return FALSE;
-}
-static void _search_icon (Icon *icon, CairoContainer *pContainer, gpointer *data)
-{
-	if (icon == data[0])
-		data[1] = icon;
-}
-static gboolean _cairo_dock_action_on_drag_hover (Icon *pIcon)
-{
-	gpointer data[2] = {pIcon, NULL};
-	cairo_dock_foreach_icons_in_docks ((CairoDockForeachIconFunc)_search_icon, data);  // on verifie que l'icone ne s'est pas faite effacee entre-temps.
-	pIcon = data[1];
-	if (pIcon && pIcon->iface.action_on_drag_hover)
-		pIcon->iface.action_on_drag_hover (pIcon);
-	s_iSidActionOnDragHover = 0;
-	return FALSE;
-}
-void cairo_dock_on_change_icon (Icon *pLastPointedIcon, Icon *pPointedIcon, CairoDock *pDock)
-{
-	//g_print ("%s (%s -> %s)\n", __func__, pLastPointedIcon?pLastPointedIcon->cName:"none", pPointedIcon?pPointedIcon->cName:"none");
-	//cd_debug ("on change d'icone dans %x (-> %s)", pDock, (pPointedIcon != NULL ? pPointedIcon->cName : "rien"));
-	if (s_iSidShowSubDockDemand != 0 && pDock == s_pDockShowingSubDock)
-	{
-		//cd_debug ("on annule la demande de montrage de sous-dock");
-		g_source_remove (s_iSidShowSubDockDemand);
-		s_iSidShowSubDockDemand = 0;
-		s_pDockShowingSubDock = NULL;
-		s_pSubDockShowing = NULL;
-	}
-	
-	// take action when dragging something onto an icon
-	if (s_iSidActionOnDragHover != 0)
-	{
-		//cd_debug ("on annule la demande de montrage d'appli");
-		g_source_remove (s_iSidActionOnDragHover);
-		s_iSidActionOnDragHover = 0;
-	}
-	
-	if (pDock->bIsDragging && pPointedIcon && pPointedIcon->iface.action_on_drag_hover)
-	{
-		s_iSidActionOnDragHover = g_timeout_add (600, (GSourceFunc) _cairo_dock_action_on_drag_hover, pPointedIcon);
-	}
-	
-	// replace dialogs
-	cairo_dock_refresh_all_dialogs (FALSE);
-	
-	// hide the sub-dock of the previous pointed icon
-	if (pLastPointedIcon != NULL && pLastPointedIcon->pSubDock != NULL)  // on a quitte une icone ayant un sous-dock.
-	{
-		CairoDock *pSubDock = pLastPointedIcon->pSubDock;
-		if (gldi_container_is_visible (CAIRO_CONTAINER (pSubDock)))  // le sous-dock est visible, on retarde son cachage.
-		{
-			//g_print ("on cache %s en changeant d'icone\n", pLastPointedIcon->cName);
-			if (pSubDock->iSidLeaveDemand == 0)
-			{
-				//g_print ("  on retarde le cachage du dock de %dms\n", MAX (myDocksParam.iLeaveSubDockDelay, 330));
-				pSubDock->iSidLeaveDemand = g_timeout_add (MAX (myDocksParam.iLeaveSubDockDelay, 300), (GSourceFunc) _emit_leave_signal_delayed, (gpointer) pSubDock);  // on force le retard meme si iLeaveSubDockDelay est a 0, car lorsqu'on entre dans un sous-dock, il arrive frequemment qu'on glisse hors de l'icone qui pointe dessus, et c'est tres desagreable d'avoir le dock qui se ferme avant d'avoir pu entre dedans.
-			}
-		}
-	}
-	
-	// show the sub-dock of the current pointed icon
-	if (pPointedIcon != NULL && pPointedIcon->pSubDock != NULL && (! myDocksParam.bShowSubDockOnClick || CAIRO_DOCK_IS_APPLI (pPointedIcon) || pDock->bIsDragging))  // on entre sur une icone ayant un sous-dock.
-	{
-		// if we were leaving the sub-dock, cancel that.
-		if (pPointedIcon->pSubDock->iSidLeaveDemand != 0)
-		{
-			g_source_remove (pPointedIcon->pSubDock->iSidLeaveDemand);
-			pPointedIcon->pSubDock->iSidLeaveDemand = 0;
-		}
-		// and show the sub-dock, possibly with a delay.
-		if (myDocksParam.iShowSubDockDelay > 0)
-		{
-			if (s_iSidShowSubDockDemand != 0)
-				g_source_remove (s_iSidShowSubDockDemand);
-			s_iSidShowSubDockDemand = g_timeout_add (myDocksParam.iShowSubDockDelay, (GSourceFunc) _cairo_dock_show_sub_dock_delayed, pDock);  // we can't be showing more than 1 sub-dock, so this timeout can be global to all docks.
-			s_pDockShowingSubDock = pDock;
-			s_pSubDockShowing = pPointedIcon->pSubDock;
-		}
-		else
-			cairo_dock_show_subdock (pPointedIcon, pDock);
-	}
-	
-	// notify everybody
-	if (pPointedIcon != NULL && ! CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pPointedIcon))
-	{
-		gboolean bStartAnimation = FALSE;
-		cairo_dock_notify_on_object (pDock, NOTIFICATION_ENTER_ICON, pPointedIcon, pDock, &bStartAnimation);
-		
-		if (bStartAnimation)
-		{
-			pPointedIcon->iAnimationState = CAIRO_DOCK_STATE_MOUSE_HOVERED;
-			cairo_dock_launch_animation (CAIRO_CONTAINER (pDock));
-		}
-	}
-}
-
-
-void cairo_dock_stop_icon_glide (CairoDock *pDock)
-{
-	Icon *icon;
-	GList *ic;
-	for (ic = pDock->icons; ic != NULL; ic = ic->next)
-	{
-		icon = ic->data;
-		icon->fGlideOffset = 0;
-		icon->iGlideDirection = 0;
-	}
-}
-static void _cairo_dock_make_icon_glide (Icon *pPointedIcon, Icon *pMovingicon, CairoDock *pDock)
-{
-	Icon *icon;
-	GList *ic;
-	for (ic = pDock->icons; ic != NULL; ic = ic->next)
-	{
-		icon = ic->data;
-		if (icon == pMovingicon)
-			continue;
-		//if (pDock->container.iMouseX > s_pMovingicon->fDrawXAtRest + s_pMovingicon->fWidth * s_pMovingicon->fScale /2)  // on a deplace l'icone a droite.  // fDrawXAtRest
-		if (pMovingicon->fXAtRest < pPointedIcon->fXAtRest)  // on a deplace l'icone a droite.
-		{
-			//g_print ("%s : %.2f / %.2f ; %.2f / %d (%.2f)\n", icon->cName, icon->fXAtRest, pMovingicon->fXAtRest, icon->fDrawX, pDock->container.iMouseX, icon->fGlideOffset);
-			if (icon->fXAtRest > pMovingicon->fXAtRest && icon->fDrawX < pDock->container.iMouseX + 5 && icon->fGlideOffset == 0)  // icone entre l'icone deplacee et le curseur.
-			{
-				//g_print ("  %s glisse vers la gauche\n", icon->cName);
-				icon->iGlideDirection = -1;
-			}
-			else if (icon->fXAtRest > pMovingicon->fXAtRest && icon->fDrawX > pDock->container.iMouseX && icon->fGlideOffset != 0)
-			{
-				//g_print ("  %s glisse vers la droite\n", icon->cName);
-				icon->iGlideDirection = 1;
-			}
-			else if (icon->fXAtRest < pMovingicon->fXAtRest && icon->fGlideOffset > 0)
-			{
-				//g_print ("  %s glisse en sens inverse vers la gauche\n", icon->cName);
-				icon->iGlideDirection = -1;
-			}
-		}
-		else
-		{
-			double fMaxScale = (icon->fHeight != 0 ? (pDock->container.bIsHorizontal ? icon->iImageHeight : icon->iImageWidth) / icon->fHeight : 1.);
-			//g_print ("deplacement de %s vers la gauche (%.2f / %d)\n", icon->cName, icon->fDrawX + icon->fWidth * fMaxScale + myIconsParam.iIconGap, pDock->container.iMouseX);
-			if (icon->fXAtRest < pMovingicon->fXAtRest && icon->fDrawX + icon->fWidth * fMaxScale + myIconsParam.iIconGap >= pDock->container.iMouseX && icon->fGlideOffset == 0)  // icone entre l'icone deplacee et le curseur.
-			{
-				//g_print ("  %s glisse vers la droite\n", icon->cName);
-				icon->iGlideDirection = 1;
-			}
-			else if (icon->fXAtRest < pMovingicon->fXAtRest && icon->fDrawX + icon->fWidth * fMaxScale + myIconsParam.iIconGap <= pDock->container.iMouseX && icon->fGlideOffset != 0)
-			{
-				//g_print ("  %s glisse vers la gauche\n", icon->cName);
-				icon->iGlideDirection = -1;
-			}
-			else if (icon->fXAtRest > pMovingicon->fXAtRest && icon->fGlideOffset < 0)
-			{
-				//g_print ("  %s glisse en sens inverse vers la droite\n", icon->cName);
-				icon->iGlideDirection = 1;
-			}
-		}
-	}
-}
-gboolean cairo_dock_on_motion_notify (GtkWidget* pWidget,
-	GdkEventMotion* pMotion,
-	CairoDock *pDock)
-{
-	static double fLastTime = 0;
-	if (s_bFrozenDock && pMotion != NULL && pMotion->time != 0)
-		return FALSE;
-	if (pDock->bMenuVisible)
-		return FALSE;
-	Icon *pPointedIcon=NULL, *pLastPointedIcon = cairo_dock_get_pointed_icon (pDock->icons);
-	int iLastMouseX = pDock->container.iMouseX;
-	//g_print ("%s (%.2f;%.2f, %d)\n", __func__, pMotion->x, pMotion->y, pDock->iInputState);
-	
-	if (pMotion != NULL)
-	{
-		//g_print ("%s (%d,%d) (%d, %.2fms, bAtBottom:%d; bIsShrinkingDown:%d)\n", __func__, (int) pMotion->x, (int) pMotion->y, pMotion->is_hint, pMotion->time - fLastTime, pDock->bAtBottom, pDock->bIsShrinkingDown);
-		//\_______________ On deplace le dock si ALT est enfoncee.
-		if ((pMotion->state & GDK_MOD1_MASK) && (pMotion->state & GDK_BUTTON1_MASK))
-		{
-			if (pDock->container.bIsHorizontal)
-			{
-				pDock->container.iWindowPositionX = pMotion->x_root - pDock->container.iMouseX;
-				pDock->container.iWindowPositionY = pMotion->y_root - pDock->container.iMouseY;
-				gtk_window_move (GTK_WINDOW (pWidget),
-					pDock->container.iWindowPositionX,
-					pDock->container.iWindowPositionY);
-			}
-			else
-			{
-				pDock->container.iWindowPositionX = pMotion->y_root - pDock->container.iMouseX;
-				pDock->container.iWindowPositionY = pMotion->x_root - pDock->container.iMouseY;
-				gtk_window_move (GTK_WINDOW (pWidget),
-					pDock->container.iWindowPositionY,
-					pDock->container.iWindowPositionX);
-			}
-			gdk_device_get_state (pMotion->device, pMotion->window, NULL, NULL);
-			return FALSE;
-		}
-		
-		//\_______________ On recupere la position de la souris.
-		if (pDock->container.bIsHorizontal)
-		{
-			pDock->container.iMouseX = (int) pMotion->x;
-			pDock->container.iMouseY = (int) pMotion->y;
-		}
-		else
-		{
-			pDock->container.iMouseX = (int) pMotion->y;
-			pDock->container.iMouseY = (int) pMotion->x;
-		}
-		
-		//\_______________ On tire l'icone volante.
-		if (s_pFlyingContainer != NULL && ! pDock->container.bInside)
-		{
-			cairo_dock_drag_flying_container (s_pFlyingContainer, pDock);
-		}
-		
-		//\_______________ On elague le flux des MotionNotify, sinon X en envoie autant que le permet le CPU !
-		if (pMotion->time != 0 && pMotion->time - fLastTime < myBackendsParam.fRefreshInterval && s_pIconClicked == NULL)
-		{
-			gdk_device_get_state (pMotion->device, pMotion->window, NULL, NULL);
-			return FALSE;
-		}
-		
-		//\_______________ On recalcule toutes les icones et on redessine.
-		pPointedIcon = cairo_dock_calculate_dock_icons (pDock);
-		//g_print ("pPointedIcon: %s\n", pPointedIcon?pPointedIcon->cName:"none");
-		gtk_widget_queue_draw (pWidget);
-		fLastTime = pMotion->time;
-		
-		//\_______________ On tire l'icone cliquee.
-		if (s_pIconClicked != NULL && s_pIconClicked->iAnimationState != CAIRO_DOCK_STATE_REMOVE_INSERT && ! myDocksParam.bLockIcons && ! myDocksParam.bLockAll && (fabs (pMotion->x - s_iClickX) > CD_CLICK_ZONE || fabs (pMotion->y - s_iClickY) > CD_CLICK_ZONE) && ! pDock->bPreventDraggingIcons)
-		{
-			s_bIconDragged = TRUE;
-			s_pIconClicked->iAnimationState = CAIRO_DOCK_STATE_FOLLOW_MOUSE;
-			//pDock->fAvoidingMouseMargin = .5;
-			pDock->iAvoidingMouseIconType = s_pIconClicked->iGroup;  // on pourrait le faire lors du clic aussi.
-			s_pIconClicked->fScale = cairo_dock_get_icon_max_scale (s_pIconClicked);
-			s_pIconClicked->fDrawX = pDock->container.iMouseX  - s_pIconClicked->fWidth * s_pIconClicked->fScale / 2;
-			s_pIconClicked->fDrawY = pDock->container.iMouseY - s_pIconClicked->fHeight * s_pIconClicked->fScale / 2 ;
-			s_pIconClicked->fAlpha = 0.75;
-		}
-
-		//gdk_event_request_motions (pMotion);  // ce sera pour GDK 2.12.
-		gdk_device_get_state (pMotion->device, pMotion->window, NULL, NULL);  // pour recevoir d'autres MotionNotify.
-	}
-	else  // cas d'un drag and drop.
-	{
-		//g_print ("motion on drag\n");
-		//\_______________ On recupere la position de la souris.
-		gldi_container_update_mouse_position (CAIRO_CONTAINER (pDock));
-		
-		//\_______________ On recalcule toutes les icones et on redessine.
-		pPointedIcon = cairo_dock_calculate_dock_icons (pDock);
-		gtk_widget_queue_draw (pWidget);
-		
-		pDock->fAvoidingMouseMargin = .25;  // on peut dropper entre 2 icones ...
-		pDock->iAvoidingMouseIconType = CAIRO_DOCK_LAUNCHER;  // ... seulement entre 2 icones du groupe "lanceurs".
-	}
-	
-	//\_______________ On gere le changement d'icone.
-	gboolean bStartAnimation = FALSE;
-	if (pPointedIcon != pLastPointedIcon)
-	{
-		cairo_dock_on_change_icon (pLastPointedIcon, pPointedIcon, pDock);
-		
-		if (pPointedIcon != NULL && s_pIconClicked != NULL && s_pIconClicked->iGroup == pPointedIcon->iGroup && ! myDocksParam.bLockIcons && ! myDocksParam.bLockAll && ! pDock->bPreventDraggingIcons)
-		{
-			_cairo_dock_make_icon_glide (pPointedIcon, s_pIconClicked, pDock);
-			bStartAnimation = TRUE;
-		}
-	}
-	
-	//\_______________ On notifie tout le monde.
-	cairo_dock_notify_on_object (pDock, NOTIFICATION_MOUSE_MOVED, pDock, &bStartAnimation);
-	if (bStartAnimation)
-		cairo_dock_launch_animation (CAIRO_CONTAINER (pDock));
-	
-	return FALSE;
-}
-
-gboolean cairo_dock_on_leave_dock_notification2 (gpointer data, CairoDock *pDock, gboolean *bStartAnimation)
-{
-	//\_______________ On gere le drag d'une icone hors du dock.
-	if (s_pIconClicked != NULL
-	&& (CAIRO_DOCK_ICON_TYPE_IS_LAUNCHER (s_pIconClicked)
-		|| CAIRO_DOCK_ICON_TYPE_IS_CONTAINER (s_pIconClicked)
-		|| (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (s_pIconClicked) && s_pIconClicked->cDesktopFileName)
-		|| CAIRO_DOCK_IS_DETACHABLE_APPLET (s_pIconClicked))
-	&& s_pFlyingContainer == NULL
-	&& ! myDocksParam.bLockIcons
-	&& ! myDocksParam.bLockAll
-	&& ! pDock->bPreventDraggingIcons)
-	{
-		cd_debug ("on a sorti %s du dock (%d;%d) / %dx%d", s_pIconClicked->cName, pDock->container.iMouseX, pDock->container.iMouseY, pDock->container.iWidth, pDock->container.iHeight);
-		
-		//if (! cairo_dock_hide_child_docks (pDock))  // on quitte si on entre dans un sous-dock, pour rester en position "haute".
-		//	return ;
-		
-		CairoDock *pOriginDock = cairo_dock_search_dock_from_name (s_pIconClicked->cParentDockName);
-		g_return_val_if_fail (pOriginDock != NULL, TRUE);
-		if (pOriginDock == pDock && _mouse_is_really_outside (pDock))  // ce test est la pour parer aux WM deficients mentaux comme KWin qui nous font sortir/rentrer lors d'un clic.
-		{
-			cd_debug (" on detache l'icone");
-			pOriginDock->bIconIsFlyingAway = TRUE;
-			gchar *cParentDockName = s_pIconClicked->cParentDockName;
-			s_pIconClicked->cParentDockName = NULL;
-			cairo_dock_detach_icon_from_dock (s_pIconClicked, pOriginDock);
-			s_pIconClicked->cParentDockName = cParentDockName;  // we keep the parent dock name, to be able to re-insert it. we'll have to remove it when the icon is dropped.
-			cairo_dock_update_dock_size (pOriginDock);
-			cairo_dock_stop_icon_glide (pOriginDock);
-			
-			s_pFlyingContainer = cairo_dock_create_flying_container (s_pIconClicked, pOriginDock);
-			//g_print ("- s_pIconClicked <- NULL\n");
-			s_pIconClicked = NULL;
-			if (pDock->iRefCount > 0 || pDock->bAutoHide)  // pour garder le dock visible.
-			{
-				return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
-			}
-		}
-	}
-	else if (s_pFlyingContainer != NULL && s_pFlyingContainer->pIcon != NULL && pDock->iRefCount > 0)  // on evite les bouclages.
-	{
-		CairoDock *pOriginDock = cairo_dock_search_dock_from_name (s_pFlyingContainer->pIcon->cParentDockName);
-		if (pOriginDock == pDock)
-			return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
-	}
-	return CAIRO_DOCK_LET_PASS_NOTIFICATION;
-}
-gboolean cairo_dock_on_leave_dock_notification (gpointer data, CairoDock *pDock, gboolean *bStartAnimation)
-{
-	//\_______________ Arrive ici, on est sorti du dock.
-	pDock->container.bInside = FALSE;
-	pDock->iAvoidingMouseIconType = -1;
-	pDock->fAvoidingMouseMargin = 0;
-	
-	//\_______________ On cache ses sous-docks.
-	if (! cairo_dock_hide_child_docks (pDock))  // on quitte si l'un des sous-docks reste visible (on est entre dedans), pour rester en position "haute".
-		return TRUE;
-	
-	if (s_iSidShowSubDockDemand != 0 && (pDock->iRefCount == 0 || s_pSubDockShowing == pDock))  // si ce dock ou l'un des sous-docks etait programme pour se montrer, on annule.
-	{
-		g_source_remove (s_iSidShowSubDockDemand);
-		s_iSidShowSubDockDemand = 0;
-		s_pDockShowingSubDock = NULL;
-		s_pSubDockShowing = NULL;
-	}
-	
-	//g_print ("%s (%d, %d)\n", __func__, pDock->iRefCount, pDock->bMenuVisible);
-	
-	//\_______________ On quitte si le menu est leve, pour rester en position haute.
-	if (pDock->bMenuVisible)
-		return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
-	
-	//\_______________ On gere le drag d'une icone hors du dock.
-	if (s_pIconClicked != NULL
-	&& (CAIRO_DOCK_ICON_TYPE_IS_LAUNCHER (s_pIconClicked)
-		|| CAIRO_DOCK_ICON_TYPE_IS_CONTAINER (s_pIconClicked)
-		|| (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (s_pIconClicked) && s_pIconClicked->cDesktopFileName && pDock->iMaxDockHeight > 30)  // if the dock is narrow (like a panel), prevent from dragging separators outside of the dock. TODO: maybe we need a parameter in the view...
-		|| CAIRO_DOCK_IS_DETACHABLE_APPLET (s_pIconClicked))
-	&& s_pFlyingContainer == NULL
-	&& ! myDocksParam.bLockIcons
-	&& ! myDocksParam.bLockAll
-	&& ! pDock->bPreventDraggingIcons)
-	{
-		cd_debug ("on a sorti %s du dock (%d;%d) / %dx%d", s_pIconClicked->cName, pDock->container.iMouseX, pDock->container.iMouseY, pDock->container.iWidth, pDock->container.iHeight);
-		
-		//if (! cairo_dock_hide_child_docks (pDock))  // on quitte si on entre dans un sous-dock, pour rester en position "haute".
-		//	return ;
-		
-		CairoDock *pOriginDock = cairo_dock_search_dock_from_name (s_pIconClicked->cParentDockName);
-		g_return_val_if_fail (pOriginDock != NULL, TRUE);
-		if (pOriginDock == pDock && _mouse_is_really_outside (pDock))  // ce test est la pour parer aux WM deficients mentaux comme KWin qui nous font sortir/rentrer lors d'un clic.
-		{
-			cd_debug (" on detache l'icone");
-			pOriginDock->bIconIsFlyingAway = TRUE;
-			gchar *cParentDockName = s_pIconClicked->cParentDockName;
-			s_pIconClicked->cParentDockName = NULL;
-			cairo_dock_detach_icon_from_dock (s_pIconClicked, pOriginDock);
-			s_pIconClicked->cParentDockName = cParentDockName;  // we keep the parent dock name, to be able to re-insert it. we'll have to remove it when the icon is dropped.
-			cairo_dock_update_dock_size (pOriginDock);
-			cairo_dock_stop_icon_glide (pOriginDock);
-			
-			s_pFlyingContainer = cairo_dock_create_flying_container (s_pIconClicked, pOriginDock);
-			//g_print ("- s_pIconClicked <- NULL\n");
-			s_pIconClicked = NULL;
-			if (pDock->iRefCount > 0 || pDock->bAutoHide)  // pour garder le dock visible.
-			{
-				return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
-			}
-		}
-	}
-	else if (s_pFlyingContainer != NULL && s_pFlyingContainer->pIcon != NULL && pDock->iRefCount > 0)  // on evite les bouclages.
-	{
-		CairoDock *pOriginDock = cairo_dock_search_dock_from_name (s_pFlyingContainer->pIcon->cParentDockName);
-		if (pOriginDock == pDock)
-			return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
-	}
-	
-	//\_______________ On lance l'animation du dock.
-	if (pDock->iRefCount == 0)
-	{
-		//g_print ("%s (auto-hide:%d)\n", __func__, pDock->bAutoHide);
-		if (pDock->bAutoHide)
-		{
-			///pDock->fFoldingFactor = (myBackendsParam.bAnimateOnAutoHide ? 0.001 : 0.);
-			cairo_dock_start_hiding (pDock);
-		}
-	}
-	else if (pDock->icons != NULL)
-	{
-		pDock->fFoldingFactor = (myDocksParam.bAnimateSubDock ? 0.001 : 0.);
-		Icon *pIcon = cairo_dock_search_icon_pointing_on_dock (pDock, NULL);
-		//g_print ("'%s' se replie\n", pIcon?pIcon->cName:"none");
-		cairo_dock_notify_on_object (pIcon, NOTIFICATION_UNFOLD_SUBDOCK, pIcon);
-	}
-	//g_print ("start shrinking\n");
-	cairo_dock_start_shrinking (pDock);  // on commence a faire diminuer la taille des icones.
-	return CAIRO_DOCK_LET_PASS_NOTIFICATION;
-}
-
-
-gboolean cairo_dock_on_leave_notify (GtkWidget* pWidget, GdkEventCrossing* pEvent, CairoDock *pDock)
-{
-	//g_print ("%s (bInside:%d; iState:%d; iRefCount:%d)\n", __func__, pDock->container.bInside, pDock->iInputState, pDock->iRefCount);
-	//\_______________ On tire le dock => on ignore le signal.
-	if (pEvent != NULL && (pEvent->state & GDK_MOD1_MASK) && (pEvent->state & GDK_BUTTON1_MASK))
-	{
-		return FALSE;
-	}
-	
-	//\_______________ On ignore les signaux errones venant d'un WM buggue (Kwin) ou meme de X (changement de bureau).
-	//if (pEvent)
-	//	//g_print ("leave event: %d;%d; %d;%d; %d; %d\n", (int)pEvent->x, (int)pEvent->y, (int)pEvent->x_root, (int)pEvent->y_root, pEvent->mode, pEvent->detail);
-	if (pEvent && (pEvent->x != 0 ||  pEvent->y != 0 || pEvent->x_root != 0 || pEvent->y_root != 0))  // strange leave events occur (detail = GDK_NOTIFY_NONLINEAR, nil coordinates); let's ignore them!
-	{
-		if (pDock->container.bIsHorizontal)
-		{
-			pDock->container.iMouseX = pEvent->x;
-			pDock->container.iMouseY = pEvent->y;
-		}
-		else
-		{
-			pDock->container.iMouseX = pEvent->y;
-			pDock->container.iMouseY = pEvent->x;
-		}
-	}
-	else
-	{
-		//g_print ("forced leave event: %d;%d\n", pDock->container.iMouseX, pDock->container.iMouseY);
-	}
-	if (pEvent && !_mouse_is_really_outside(pDock))  // check that the mouse is really outside (only if the request comes from the Window Manager; this is to work around buggy WM like KWin).
-	{
-		//g_print ("not really outside (%d;%d ; %d/%d)\n", pDock->container.iMouseX, pDock->container.iMouseY, pDock->iMaxDockHeight, pDock->iMinDockHeight);
-		if (pDock->iSidTestMouseOutside == 0 && pEvent)  // si l'action induit un changement de bureau, ou une appli qui bloque le focus (gksu), X envoit un signal de sortie alors qu'on est encore dans le dock, et donc n'en n'envoit plus lorsqu'on en sort reellement. On teste donc pendant qques secondes apres l'evenement.
-		{
-			//g_print ("start checking mouse\n");
-			pDock->iSidTestMouseOutside = g_timeout_add (500, (GSourceFunc)_check_mouse_outside, pDock);
-		}
-		//g_print ("mouse: %d;%d\n", pDock->container.iMouseX, pDock->container.iMouseY);
-		return FALSE;
-	}
-	
-	//\_______________ On retarde la sortie.
-	if (pEvent != NULL)  // sortie naturelle.
-	{
-		if (pDock->iSidLeaveDemand == 0)  // pas encore de demande de sortie.
-		{
-			if (pDock->iRefCount == 0)  // cas du main dock : on retarde si on pointe sur un sous-dock (pour laisser le temps au signal d'entree dans le sous-dock d'etre traite) ou si l'on a l'auto-hide.
-			{
-				//g_print (" leave event : %.1f;%.1f (%dx%d)\n", pEvent->x, pEvent->y, pDock->container.iWidth, pDock->container.iHeight);
-				Icon *pPointedIcon = cairo_dock_get_pointed_icon (pDock->icons);
-				if (pPointedIcon != NULL && pPointedIcon->pSubDock != NULL && gldi_container_is_visible (CAIRO_CONTAINER (pPointedIcon->pSubDock)))
-				{
-					//g_print ("  on retarde la sortie du dock de %dms\n", MAX (myDocksParam.iLeaveSubDockDelay, 330));
-					pDock->iSidLeaveDemand = g_timeout_add (MAX (myDocksParam.iLeaveSubDockDelay, 250), (GSourceFunc) _emit_leave_signal_delayed, (gpointer) pDock);
-					return TRUE;
-				}
-				else if (pDock->bAutoHide)
-				{
-					const int delay = 0;  // 250
-					if (delay != 0)  /// maybe try to se if we leaved the dock frankly, or just by a few pixels...
-					{
-						//g_print (" delay the leave event by %dms\n", delay);
-						pDock->iSidLeaveDemand = g_timeout_add (250, (GSourceFunc) _emit_leave_signal_delayed, (gpointer) pDock);
-						return TRUE;
-					}
-				}
-			}
-			else/** if (myDocksParam.iLeaveSubDockDelay != 0)*/  // cas d'un sous-dock : on retarde le cachage.
-			{
-				//g_print ("  on retarde la sortie du sous-dock de %dms\n", myDocksParam.iLeaveSubDockDelay);
-				pDock->iSidLeaveDemand = g_timeout_add (MAX (myDocksParam.iLeaveSubDockDelay, 50), (GSourceFunc) _emit_leave_signal_delayed, (gpointer) pDock);
-				return TRUE;
-			}
-		}
-		else  // deja une sortie en attente.
-		{
-			//g_print ("une sortie est deja programmee\n");
-			return TRUE;
-		}
-	}  // sinon c'est nous qui avons explicitement demande cette sortie, donc on continue.
-	
-	if (pDock->iSidTestMouseOutside != 0)
-	{
-		//g_print ("stop checking mouse (leave)\n");
-		g_source_remove (pDock->iSidTestMouseOutside);
-		pDock->iSidTestMouseOutside = 0;
-	}
-	
-	gboolean bStartAnimation = FALSE;
-	cairo_dock_notify_on_object (pDock, NOTIFICATION_LEAVE_DOCK, pDock, &bStartAnimation);
-	if (bStartAnimation)
-		cairo_dock_launch_animation (CAIRO_CONTAINER (pDock));
-	
-	return TRUE;
-}
-
-gboolean cairo_dock_on_enter_notification (gpointer pData, CairoDock *pDock, gboolean *bStartAnimation)
-{
-	// si on rentre avec une icone volante, on la met dedans.
-	if (s_pFlyingContainer != NULL)
-	{
-		Icon *pFlyingIcon = s_pFlyingContainer->pIcon;
-		if (pDock != pFlyingIcon->pSubDock)  // on evite les boucles.
-		{
-			struct timeval tv;
-			int r = gettimeofday (&tv, NULL);
-			double t = tv.tv_sec + tv.tv_usec * 1e-6;
-			if (t - s_pFlyingContainer->fCreationTime > 1)  // on empeche le cas ou enlever l'icone fait augmenter le ratio du dock, et donc sa hauteur, et nous fait rentrer dedans des qu'on sort l'icone.
-			{
-				cd_debug ("on remet l'icone volante dans un dock (dock d'origine : %s)\n", pFlyingIcon->cParentDockName);
-				cairo_dock_free_flying_container (s_pFlyingContainer);
-				cairo_dock_stop_icon_animation (pFlyingIcon);
-				cairo_dock_insert_icon_in_dock (pFlyingIcon, pDock, CAIRO_DOCK_ANIMATE_ICON);
-				s_pFlyingContainer = NULL;
-				pDock->bIconIsFlyingAway = FALSE;
-			}
-		}
-	}
-	
-	return CAIRO_DOCK_LET_PASS_NOTIFICATION;
-}
-gboolean cairo_dock_on_enter_notify (GtkWidget* pWidget, GdkEventCrossing* pEvent, CairoDock *pDock)
-{
-	//g_print ("%s (bIsMainDock : %d; bInside:%d; state:%d; iMagnitudeIndex:%d; input shape:%x; event:%p)\n", __func__, pDock->bIsMainDock, pDock->container.bInside, pDock->iInputState, pDock->iMagnitudeIndex, pDock->pShapeBitmap, pEvent);
-	if (! cairo_dock_entrance_is_allowed (pDock))
-	{
-		cd_message ("* entree non autorisee");
-		return FALSE;
-	}
-	
-	// stop les timers.
-	if (pDock->iSidLeaveDemand != 0)
-	{
-		g_source_remove (pDock->iSidLeaveDemand);
-		pDock->iSidLeaveDemand = 0;
-	}
-	if (s_iSidShowSubDockDemand != 0)  // gere un cas tordu mais bien reel.
-	{
-		g_source_remove (s_iSidShowSubDockDemand);
-		s_iSidShowSubDockDemand = 0;
-	}
-	if (pDock->iSidHideBack != 0)
-	{
-		//g_print ("remove hide back timeout\n");
-		g_source_remove (pDock->iSidHideBack);
-		pDock->iSidHideBack = 0;
-	}
-	if (pDock->iSidTestMouseOutside != 0)
-	{
-		//g_print ("stop checking mouse (enter)\n");
-		g_source_remove (pDock->iSidTestMouseOutside);
-		pDock->iSidTestMouseOutside = 0;
-	}
-	
-	// input shape desactivee, le dock devient actif.
-	if ((pDock->pShapeBitmap || pDock->pHiddenShapeBitmap) && pDock->iInputState != CAIRO_DOCK_INPUT_ACTIVE)
-	{
-		//g_print ("+++ input shape active on enter\n");
-		cairo_dock_set_input_shape_active (pDock);
-	}
-	pDock->iInputState = CAIRO_DOCK_INPUT_ACTIVE;
-	
-	// si on etait deja dedans, ou qu'on etait cense l'etre, on relance juste le grossissement.
-	/**if (pDock->container.bInside || pDock->bIsHiding)
-	{
-		pDock->container.bInside = TRUE;
-		cairo_dock_start_growing (pDock);
-		if (pDock->bIsHiding || cairo_dock_is_hidden (pDock))  // on (re)monte.
-		{
-			cd_debug ("  on etait deja dedans\n");
-			cairo_dock_start_showing (pDock);
-		}
-		return FALSE;
-	}*/
-	
-	pDock->container.bInside = TRUE;
-	
-	// animation d'entree.
-	gboolean bStartAnimation = FALSE;
-	cairo_dock_notify_on_object (pDock, NOTIFICATION_ENTER_DOCK, pDock, &bStartAnimation);
-	if (bStartAnimation)
-		cairo_dock_launch_animation (CAIRO_CONTAINER (pDock));
-	
-	pDock->fDecorationsOffsetX = 0;
-	cairo_dock_stop_quick_hide ();
-	
-	if (s_pIconClicked != NULL)  // on pourrait le faire a chaque motion aussi.
-	{
-		pDock->iAvoidingMouseIconType = s_pIconClicked->iGroup;
-		pDock->fAvoidingMouseMargin = .5;  /// inutile il me semble ...
-	}
-	
-	// si on rentre avec une icone volante, on la met dedans.
-	if (s_pFlyingContainer != NULL)
-	{
-		Icon *pFlyingIcon = s_pFlyingContainer->pIcon;
-		if (pDock != pFlyingIcon->pSubDock)  // on evite les boucles.
-		{
-			struct timeval tv;
-			int r = gettimeofday (&tv, NULL);
-			double t = tv.tv_sec + tv.tv_usec * 1e-6;
-			if (t - s_pFlyingContainer->fCreationTime > 1)  // on empeche le cas ou enlever l'icone fait augmenter le ratio du dock, et donc sa hauteur, et nous fait rentrer dedans des qu'on sort l'icone.
-			{
-				//g_print ("on remet l'icone volante dans un dock (dock d'origine : %s)\n", pFlyingIcon->cParentDockName);
-				cairo_dock_free_flying_container (s_pFlyingContainer);
-				cairo_dock_stop_icon_animation (pFlyingIcon);
-				// reinsert the icon where it was dropped, not at its original position.
-				Icon *icon = cairo_dock_get_pointed_icon (pDock->icons);  // get the pointed icon before we insert the icon, since the inserted icon will be the pointed one!
-				//g_print (" pointed icon: %s\n", icon?icon->cName:"none");
-				cairo_dock_insert_icon_in_dock (pFlyingIcon, pDock, CAIRO_DOCK_ANIMATE_ICON);
-				if (icon != NULL && cairo_dock_get_icon_order (icon) == cairo_dock_get_icon_order (pFlyingIcon))
-				{
-					cairo_dock_move_icon_after_icon (pDock, pFlyingIcon, icon);
-				}
-				s_pFlyingContainer = NULL;
-				pDock->bIconIsFlyingAway = FALSE;
-			}
-		}
-	}
-	
-	// si on etait derriere, on repasse au premier plan.
-	if (pDock->iVisibility == CAIRO_DOCK_VISI_KEEP_BELOW && pDock->bIsBelow && pDock->iRefCount == 0)
-	{
-		cairo_dock_pop_up (pDock);
-	}
-	
-	// si on etait cache (entierement ou partiellement), on montre.
-	if ((pDock->bIsHiding || cairo_dock_is_hidden (pDock)) && pDock->iRefCount == 0)
-	{
-		//g_print ("  on commence a monter\n");
-		cairo_dock_start_showing (pDock);  // on a mis a jour la zone d'input avant, sinon la fonction le ferait, ce qui serait inutile.
-	}
-	
-	// since we've just entered the dock, the pointed icon has changed from none to the current one.
-	if (pEvent != NULL)
-	{
-		// update the mouse coordinates
-		if (pDock->container.bIsHorizontal)
-		{
-			pDock->container.iMouseX = (int) pEvent->x;
-			pDock->container.iMouseY = (int) pEvent->y;
-		}
-		else
-		{
-			pDock->container.iMouseX = (int) pEvent->y;
-			pDock->container.iMouseY = (int) pEvent->x;
-		}
-		// then compute the icons (especially the pointed one).
-		Icon *icon = cairo_dock_calculate_dock_icons (pDock);  // returns the pointed icon
-		// trigger the change to trigger the animation and sub-dock popup
-		if (icon != NULL)
-		{
-			cairo_dock_on_change_icon (NULL, icon, pDock);  // we were out of the dock, so there is no previous pointed icon.
-		}
-	}
-	// on lance le grossissement.
-	cairo_dock_start_growing (pDock);
-	
-	return TRUE;
-}
-
-
-gboolean cairo_dock_on_key_release (GtkWidget *pWidget,
-	GdkEventKey *pKey,
-	CairoDock *pDock)
-{
-	cd_debug ("on a appuye sur une touche (%d/%d)", pKey->keyval, pKey->hardware_keycode);
-	if (pKey->type == GDK_KEY_PRESS)
-	{
-		cairo_dock_notify_on_object (pDock, NOTIFICATION_KEY_PRESSED, pDock, pKey->keyval, pKey->state, pKey->string, pKey->hardware_keycode);
-	}
-	else if (pKey->type == GDK_KEY_RELEASE)
-	{
-		//g_print ("release : pKey->keyval = %d\n", pKey->keyval);
-		if ((pKey->state & GDK_MOD1_MASK) && pKey->keyval == 0)  // On relache la touche ALT, typiquement apres avoir fait un ALT + clique gauche + deplacement.
-		{
-			if (pDock->iRefCount == 0 && pDock->iVisibility != CAIRO_DOCK_VISI_SHORTKEY)
-				cairo_dock_write_root_dock_gaps (pDock);
-		}
-	}
-	return TRUE;
-}
-
-
-static gboolean _double_click_delay_over (Icon *icon)
-{
-	CairoDock *pDock = cairo_dock_search_dock_from_name (icon->cParentDockName);
-	if (pDock)
-	{
-		pDock->container.iMouseX = s_iFirstClickX;
-		pDock->container.iMouseY = s_iFirstClickY;
-		cairo_dock_notify_on_object (pDock, NOTIFICATION_CLICK_ICON, icon, pDock, GDK_BUTTON1_MASK);
-		if (pDock->bIsMainDock && pDock->iVisibility == CAIRO_DOCK_VISI_SHORTKEY)
-			s_bHideAfterShortcut = TRUE;
-		
-		cairo_dock_start_icon_animation (icon, pDock);
-	}
-	icon->bIsDemandingAttention = FALSE;  // on considere que si l'utilisateur clique sur l'icone, c'est qu'il a pris acte de la notification.
-	icon->iSidDoubleClickDelay = 0;
-	return FALSE;
-}
-static gboolean _check_mouse_outside (CairoDock *pDock)  // ce test est principalement fait pour detecter les cas ou X nous envoit un signal leave errone alors qu'on est dedans (=> sortie refusee, bInside reste a TRUE), puis du coup ne nous en envoit pas de leave lorsqu'on quitte reellement le dock.
-{
-	//g_print ("%s (%d, %d, %d)\n", __func__, pDock->bIsShrinkingDown, pDock->iMagnitudeIndex, pDock->container.bInside);
-	if (pDock->bIsShrinkingDown || pDock->iMagnitudeIndex == 0 || ! pDock->container.bInside)  // cas triviaux : si le dock est deja retrecit, ou qu'on est deja plus dedans, on peut quitter.
-	{
-		pDock->iSidTestMouseOutside = 0;
-		return FALSE;
-	}
-	
-	gldi_container_update_mouse_position (CAIRO_CONTAINER (pDock));
-	//g_print (" -> (%d, %d)\n", pDock->container.iMouseX, pDock->container.iMouseY);
-	
-	cairo_dock_calculate_dock_icons (pDock);  // pour faire retrecir le dock si on n'est pas dedans, merci X de nous faire sortir du dock alors que la souris est toujours dedans :-/
-	return TRUE;
-}
-gboolean cairo_dock_on_button_press (GtkWidget* pWidget, GdkEventButton* pButton, CairoDock *pDock)
-{
-	//g_print ("+ %s (%d/%d, %x)\n", __func__, pButton->type, pButton->button, pWidget);
-	if (pDock->container.bIsHorizontal)  // utile ?
-	{
-		pDock->container.iMouseX = (int) pButton->x;
-		pDock->container.iMouseY = (int) pButton->y;
-	}
-	else
-	{
-		pDock->container.iMouseX = (int) pButton->y;
-		pDock->container.iMouseY = (int) pButton->x;
-	}
-
-	Icon *icon = cairo_dock_get_pointed_icon (pDock->icons);
-	if (pButton->button == 1)  // clic gauche.
-	{
-		//g_print ("+ left click\n");
-		switch (pButton->type)
-		{
-			case GDK_BUTTON_RELEASE :
-				//g_print ("+ GDK_BUTTON_RELEASE (%d/%d sur %s/%s)\n", pButton->state, GDK_CONTROL_MASK | GDK_MOD1_MASK, icon ? icon->cName : "personne", icon ? icon->cCommand : "");  // 272 = 100010000
-				if (pDock->container.bIgnoreNextReleaseEvent)
-				{
-					pDock->container.bIgnoreNextReleaseEvent = FALSE;
-					s_pIconClicked = NULL;
-					s_bIconDragged = FALSE;
-					return TRUE;
-				}
-				
-				if ( ! (pButton->state & GDK_MOD1_MASK))
-				{
-					if (s_pIconClicked != NULL)
-					{
-						cd_debug ("activate %s (%s)", s_pIconClicked->cName, icon ? icon->cName : "none");
-						s_pIconClicked->iAnimationState = CAIRO_DOCK_STATE_REST;  // stoppe les animations de suivi du curseur.
-						pDock->iAvoidingMouseIconType = -1;
-						cairo_dock_stop_icon_glide (pDock);
-					}
-					if (icon != NULL && ! CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon) && icon == s_pIconClicked)  // released the button on the clicked icon => trigger the CLICK signal.
-					{
-						s_pIconClicked = NULL;  // il faut le faire ici au cas ou le clic induirait un dialogue bloquant qui nous ferait sortir du dock par exemple.
-						//g_print ("+ click on '%s' (%s)\n", icon->cName, icon->cCommand);
-						if (! s_bIconDragged)  // on ignore le drag'n'drop sur elle-meme.
-						{
-							if (icon->iNbDoubleClickListeners > 0)
-							{
-								if (icon->iSidDoubleClickDelay == 0)  // 1er release.
-								{
-									icon->iSidDoubleClickDelay = g_timeout_add (CD_DOUBLE_CLICK_DELAY, (GSourceFunc)_double_click_delay_over, icon);
-									s_iFirstClickX = pDock->container.iMouseX;  // the mouse can move between the first and the second clicks; since the event is triggered when the second click occurs, the coordinates may be wrong -> we have to remember the position of the first click.
-									s_iFirstClickY = pDock->container.iMouseY;
-								}
-							}
-							else
-							{
-								cairo_dock_notify_on_object (pDock, NOTIFICATION_CLICK_ICON, icon, pDock, pButton->state);
-								if (pDock->bIsMainDock && pDock->iVisibility == CAIRO_DOCK_VISI_SHORTKEY)
-									s_bHideAfterShortcut = TRUE;
-								
-								cairo_dock_start_icon_animation (icon, pDock);
-								icon->bIsDemandingAttention = FALSE;  // on considere que si l'utilisateur clique sur l'icone, c'est qu'il a pris acte de la notification.
-							}
-						}
-					}
-					else if (s_pIconClicked != NULL && icon != NULL && icon != s_pIconClicked && ! myDocksParam.bLockIcons && ! myDocksParam.bLockAll && ! pDock->bPreventDraggingIcons)  // released the icon on another one.
-					{
-						//g_print ("deplacement de %s\n", s_pIconClicked->cName);
-						CairoDock *pOriginDock = CAIRO_DOCK (cairo_dock_search_container_from_icon (s_pIconClicked));
-						if (pOriginDock != NULL && pDock != pOriginDock)
-						{
-							cairo_dock_detach_icon_from_dock (s_pIconClicked, pOriginDock);
-							///cairo_dock_update_dock_size (pOriginDock);
-							
-							cairo_dock_update_icon_s_container_name (s_pIconClicked, icon->cParentDockName);
-							
-							cairo_dock_insert_icon_in_dock (s_pIconClicked, pDock, CAIRO_DOCK_ANIMATE_ICON);
-						}
-						
-						Icon *prev_icon, *next_icon;
-						if (icon->fXAtRest > s_pIconClicked->fXAtRest)
-						{
-							prev_icon = icon;
-							next_icon = cairo_dock_get_next_icon (pDock->icons, icon);
-						}
-						else
-						{
-							prev_icon = cairo_dock_get_previous_icon (pDock->icons, icon);
-							next_icon = icon;
-						}
-						if (icon->iGroup != s_pIconClicked->iGroup
-						&& (prev_icon == NULL || prev_icon->iGroup != s_pIconClicked->iGroup)
-						&& (next_icon == NULL || next_icon->iGroup != s_pIconClicked->iGroup))
-						{
-							s_pIconClicked = NULL;
-							return FALSE;
-						}
-						//g_print ("deplacement de %s\n", s_pIconClicked->cName);
-						///if (prev_icon != NULL && prev_icon->iGroup != s_pIconClicked->iGroup)  // the previous icon is in a different group -> we'll be at the beginning of our group.
-						///	prev_icon = NULL;  // => move to the beginning of the group/dock
-						cairo_dock_move_icon_after_icon (pDock, s_pIconClicked, prev_icon);
-
-						pDock->pRenderer->calculate_icons (pDock);
-
-						if (! CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (s_pIconClicked))
-						{
-							cairo_dock_request_icon_animation (s_pIconClicked, CAIRO_CONTAINER (pDock), "bounce", 2);
-						}
-						gtk_widget_queue_draw (pDock->container.pWidget);
-					}
-					
-					if (s_pFlyingContainer != NULL)
-					{
-						cd_debug ("on relache l'icone volante");
-						if (pDock->container.bInside)
-						{
-							//g_print ("  on la remet dans son dock d'origine\n");
-							Icon *pFlyingIcon = s_pFlyingContainer->pIcon;
-							cairo_dock_free_flying_container (s_pFlyingContainer);
-							cairo_dock_stop_marking_icon_as_following_mouse (pFlyingIcon);
-							cairo_dock_stop_icon_animation (pFlyingIcon);
-							// reinsert the icon where it was dropped, not at its original position.
-							Icon *icon = cairo_dock_get_pointed_icon (pDock->icons);  // get the pointed icon before we insert the icon, since the inserted icon will be the pointed one!
-							cairo_dock_insert_icon_in_dock (pFlyingIcon, pDock, CAIRO_DOCK_ANIMATE_ICON);
-							if (icon != NULL && cairo_dock_get_icon_order (icon) == cairo_dock_get_icon_order (pFlyingIcon))
-							{
-								cairo_dock_move_icon_after_icon (pDock, pFlyingIcon, icon);
-							}
-						}
-						else
-						{
-							Icon *pFlyingIcon = s_pFlyingContainer->pIcon;
-							g_free (pFlyingIcon->cParentDockName);  // we have to remove it ourselves here, since we kept this data.
-							pFlyingIcon->cParentDockName = NULL;
-							cairo_dock_terminate_flying_container (s_pFlyingContainer);  // supprime ou detache l'icone, l'animation se terminera toute seule.
-						}
-						s_pFlyingContainer = NULL;
-						pDock->bIconIsFlyingAway = FALSE;
-						cairo_dock_stop_icon_glide (pDock);
-					}
-					/// a implementer ...
-					///cairo_dock_notify_on_object (CAIRO_CONTAINER (pDock), CAIRO_DOCK_RELEASE_ICON, icon, pDock);
-				}
-				else
-				{
-					if (pDock->iRefCount == 0 && pDock->iVisibility != CAIRO_DOCK_VISI_SHORTKEY)
-						cairo_dock_write_root_dock_gaps (pDock);
-				}
-				//g_print ("- apres clic : s_pIconClicked <- NULL\n");
-				s_pIconClicked = NULL;
-				s_bIconDragged = FALSE;
-			break ;
-			
-			case GDK_BUTTON_PRESS :
-				if ( ! (pButton->state & GDK_MOD1_MASK))
-				{
-					//g_print ("+ clic sur %s (%.2f)!\n", icon ? icon->cName : "rien", icon ? icon->fInsertRemoveFactor : 0.);
-					s_iClickX = pButton->x;
-					s_iClickY = pButton->y;
-					if (icon && ! cairo_dock_icon_is_being_removed (icon) && ! CAIRO_DOCK_IS_AUTOMATIC_SEPARATOR (icon))
-					{
-						s_pIconClicked = icon;  // on ne definit pas l'animation FOLLOW_MOUSE ici , on le fera apres le 1er mouvement, pour eviter que l'icone soit dessinee comme tel quand on clique dessus alors que le dock est en train de jouer une animation (ca provoque un flash desagreable).
-						cd_debug ("clicked on %s", icon->cName);
-					}
-					else
-						s_pIconClicked = NULL;
-				}
-			break ;
-
-			case GDK_2BUTTON_PRESS :
-				if (icon && ! cairo_dock_icon_is_being_removed (icon))
-				{
-					if (icon->iSidDoubleClickDelay != 0)
-					{
-						g_source_remove (icon->iSidDoubleClickDelay);
-						icon->iSidDoubleClickDelay = 0;
-					}
-					cairo_dock_notify_on_object (pDock, NOTIFICATION_DOUBLE_CLICK_ICON, icon, pDock);
-					if (icon->iNbDoubleClickListeners > 0)
-						pDock->container.bIgnoreNextReleaseEvent = TRUE;
-				}
-			break ;
-
-			default :
-			break ;
-		}
-	}
-	else if (pButton->button == 3 && pButton->type == GDK_BUTTON_PRESS)  // clique droit.
-	{
-		GtkWidget *menu = cairo_dock_build_menu (icon, CAIRO_CONTAINER (pDock));  // genere un CAIRO_DOCK_BUILD_CONTAINER_MENU et CAIRO_DOCK_BUILD_ICON_MENU.
-		
-		cairo_dock_popup_menu_on_icon (menu, icon, CAIRO_CONTAINER (pDock));
-	}
-	else if (pButton->button == 2 && pButton->type == GDK_BUTTON_PRESS)  // clique milieu.
-	{
-		if (icon && ! cairo_dock_icon_is_being_removed (icon))
-		{
-			cairo_dock_notify_on_object (pDock, NOTIFICATION_MIDDLE_CLICK_ICON, icon, pDock);
-		}
-	}
-
-	return FALSE;
-}
-
-
-gboolean cairo_dock_on_scroll (GtkWidget* pWidget, GdkEventScroll* pScroll, CairoDock *pDock)
-{
-	if (pScroll->direction != GDK_SCROLL_UP && pScroll->direction != GDK_SCROLL_DOWN)  // on degage les scrolls horizontaux.
-	{
-		return FALSE;
-	}
-	Icon *icon = cairo_dock_get_pointed_icon (pDock->icons);  // can be NULL
-	cairo_dock_notify_on_object (pDock, NOTIFICATION_SCROLL_ICON, icon, pDock, pScroll->direction);
-	
-	return FALSE;
-}
-
-
-gboolean cairo_dock_on_configure (GtkWidget* pWidget, GdkEventConfigure* pEvent, CairoDock *pDock)
-{
-	//g_print ("%s (%p, main dock : %d) : (%d;%d) (%dx%d)\n", __func__, pDock, pDock->bIsMainDock, pEvent->x, pEvent->y, pEvent->width, pEvent->height);
-	// set the new actual size of the container
-	gint iNewWidth, iNewHeight, iNewX, iNewY;
-	if (pDock->container.bIsHorizontal)
-	{
-		iNewWidth = pEvent->width;
-		iNewHeight = pEvent->height;
-		
-		iNewX = pEvent->x;
-		iNewY = pEvent->y;
-	}
-	else
-	{
-		iNewWidth = pEvent->height;
-		iNewHeight = pEvent->width;
-		
-		iNewX = pEvent->y;
-		iNewY = pEvent->x;
-	}
-	
-	gboolean bSizeUpdated = (iNewWidth != pDock->container.iWidth || iNewHeight != pDock->container.iHeight);
-	gboolean bIsNowSized = (pDock->container.iWidth == 1 && pDock->container.iHeight == 1 && bSizeUpdated);
-	gboolean bPositionUpdated = (pDock->container.iWindowPositionX != iNewX || pDock->container.iWindowPositionY != iNewY);
-	pDock->container.iWidth = iNewWidth;
-	pDock->container.iHeight = iNewHeight;
-	pDock->container.iWindowPositionX = iNewX;
-	pDock->container.iWindowPositionY = iNewY;
-	
-	if (pDock->container.iWidth == 1 && pDock->container.iHeight == 1)  // the X window has not yet reached its size.
-	{
-		return FALSE;
-	}
-	
-	// if the size has changed, also update everything that depends on it.
-	if (bSizeUpdated)  // changement de taille
-	{
-		// update mouse relative position inside the window
-		gldi_container_update_mouse_position (CAIRO_CONTAINER (pDock));
-		if (pDock->container.iMouseX < 0 || pDock->container.iMouseX > pDock->container.iWidth)  // utile ?
-			pDock->container.iMouseX = 0;
-		
-		// update the input shape (it has been calculated in the function that made the resize)
-		cairo_dock_update_input_shape (pDock);
-		if (pDock->pHiddenShapeBitmap != NULL && pDock->iInputState == CAIRO_DOCK_INPUT_HIDDEN)
-		{
-			//g_print ("+++ input shape hidden on configure\n");
-			cairo_dock_set_input_shape_hidden (pDock);
-		}
-		else if (pDock->pShapeBitmap != NULL && pDock->iInputState == CAIRO_DOCK_INPUT_AT_REST)
-		{
-			//g_print ("+++ input shape at rest on configure\n");
-			cairo_dock_set_input_shape_at_rest (pDock);
-		}
-		else if (pDock->iInputState == CAIRO_DOCK_INPUT_ACTIVE)
-		{
-			//g_print ("+++ input shape active on configure\n");
-			cairo_dock_set_input_shape_active (pDock);
-		}
-		
-		// update the GL context
-		if (g_bUseOpenGL)
-		{
-			if (! gldi_glx_make_current (CAIRO_CONTAINER (pDock)))
-				return FALSE;
-			
-			cairo_dock_set_ortho_view (CAIRO_CONTAINER (pDock));
-			
-			glClearAccum (0., 0., 0., 0.);
-			glClear (GL_ACCUM_BUFFER_BIT);
-			
-			if (pDock->iRedirectedTexture != 0)
-			{
-				_cairo_dock_delete_texture (pDock->iRedirectedTexture);
-				pDock->iRedirectedTexture = cairo_dock_create_texture_from_raw_data (NULL, pEvent->width, pEvent->height);
-			}
-		}
-		
-		cairo_dock_calculate_dock_icons (pDock);
-		//g_print ("configure size\n");
-		cairo_dock_trigger_set_WM_icons_geometry (pDock);  // changement de position ou de taille du dock => on replace les icones.
-		
-		cairo_dock_replace_all_dialogs ();
-		
-		if (bIsNowSized && g_bUseOpenGL)  // in OpenGL, 
-		{
-			Icon *icon;
-			GList *ic;
-			for (ic = pDock->icons; ic != NULL; ic = ic->next)
-			{
-				icon = ic->data;
-				if (icon->bDamaged)
-				{
-					//g_print ("#### icon %s is damaged\n", icon->cName);
-					icon->bDamaged = FALSE;
-					if (cairo_dock_get_icon_data_renderer (icon) != NULL)
-					{
-						cairo_dock_refresh_data_renderer (icon, CAIRO_CONTAINER (pDock), NULL);  // no cairo context in OpenGL
-					}
-					else if (icon->iSubdockViewType != 0)
-					{
-						cairo_dock_draw_subdock_content_on_icon (icon, pDock);
-					}
-					else if (CAIRO_DOCK_IS_APPLET (icon))
-					{
-						cairo_dock_reload_module_instance (icon->pModuleInstance, FALSE);  // easy but safe way to redraw the icon properly.
-					}
-					else  // if we don't know how thie icon should be drawn, just reload it.
-					{
-						cairo_dock_load_icon_image (icon, CAIRO_CONTAINER (pDock));
-					}
-				}
-			}
-		}
-	}
-	else if (bPositionUpdated)  // changement de position.
-	{
-		//g_print ("configure x,y\n");
-		cairo_dock_trigger_set_WM_icons_geometry (pDock);  // changement de position de la fenetre du dock => on replace les icones.
-		
-		cairo_dock_replace_all_dialogs ();
-	}
-	
-	if (pDock->iRefCount == 0 && (bSizeUpdated || bPositionUpdated))
-	{
-		if (pDock->iVisibility == CAIRO_DOCK_VISI_AUTO_HIDE_ON_OVERLAP)
-		{
-			Icon *pActiveAppli = cairo_dock_get_current_active_icon ();
-			if (_cairo_dock_appli_is_on_our_way (pActiveAppli, pDock))  // la fenetre active nous gene.
-			{
-				if (!cairo_dock_is_temporary_hidden (pDock))
-					cairo_dock_activate_temporary_auto_hide (pDock);
-			}
-			else
-			{
-				if (cairo_dock_is_temporary_hidden (pDock))
-					cairo_dock_deactivate_temporary_auto_hide (pDock);
-			}
-		}
-		else if (pDock->iVisibility == CAIRO_DOCK_VISI_AUTO_HIDE_ON_OVERLAP_ANY)
-		{
-			if (cairo_dock_search_window_overlapping_dock (pDock) != NULL)
-			{
-				if (!cairo_dock_is_temporary_hidden (pDock))
-					cairo_dock_activate_temporary_auto_hide (pDock);
-			}
-			else
-			{
-				if (cairo_dock_is_temporary_hidden (pDock))
-					cairo_dock_deactivate_temporary_auto_hide (pDock);
-			}
-		}
-	}
-	
-	gtk_widget_queue_draw (pWidget);
-	
-	return FALSE;
-}
-
-
-
-static gboolean s_bWaitForData = FALSE;
-static gboolean s_bCouldDrop = FALSE;
-
-void cairo_dock_on_drag_data_received (GtkWidget *pWidget, GdkDragContext *dc, gint x, gint y, GtkSelectionData *selection_data, guint info, guint time, CairoDock *pDock)
-{
-	cd_debug ("%s (%dx%d, %d, %d)", __func__, x, y, time, pDock->container.bInside);
-	if (cairo_dock_is_hidden (pDock))  // X ne semble pas tenir compte de la zone d'input pour dropper les trucs...
-		return ;
-	//\_________________ On recupere l'URI.
-	gchar *cReceivedData = (gchar *)gtk_selection_data_get_data (selection_data);
-	g_return_if_fail (cReceivedData != NULL);
-	int length = strlen (cReceivedData);
-	if (cReceivedData[length-1] == '\n')
-		cReceivedData[--length] = '\0';  // on vire le retour chariot final.
-	if (cReceivedData[length-1] == '\r')
-		cReceivedData[--length] = '\0';
-	
-	if (s_bWaitForData)
-	{
-		s_bWaitForData = FALSE;
-		gdk_drag_status (dc, GDK_ACTION_COPY, time);
-		cd_debug ("drag info : <%s>\n", cReceivedData);
-		pDock->iAvoidingMouseIconType = CAIRO_DOCK_LAUNCHER;
-		if (g_str_has_suffix (cReceivedData, ".desktop")/** || g_str_has_suffix (cReceivedData, ".sh")*/)
-			pDock->fAvoidingMouseMargin = .5;  // on ne sera jamais dessus.
-		else
-			pDock->fAvoidingMouseMargin = .25;
-		return ;
-	}
-	
-	//\_________________ On arrete l'animation.
-	//cairo_dock_stop_marking_icons (pDock);
-	pDock->iAvoidingMouseIconType = -1;
-	pDock->fAvoidingMouseMargin = 0;
-	
-	//\_________________ On arrete le timer.
-	if (s_iSidActionOnDragHover != 0)
-	{
-		//cd_debug ("on annule la demande de montrage d'appli");
-		g_source_remove (s_iSidActionOnDragHover);
-		s_iSidActionOnDragHover = 0;
-	}
-	
-	//\_________________ On calcule la position a laquelle on l'a lache.
-	cd_debug (">>> cReceivedData : '%s' (%d/%d)", cReceivedData, s_bCouldDrop, pDock->bCanDrop);
-	/* icon => drop on icon
-	no icon => if order undefined: drop on dock; else: drop between 2 icons.*/
-	Icon *pPointedIcon = NULL;
-	double fOrder;
-	if (s_bCouldDrop)  // can drop on the dock
-	{
-		cd_debug ("drop between icons");
-		if (myDocksParam.bLockIcons || myDocksParam.bLockAll)  // locked, can't add anything.
-		{
-			gtk_drag_finish (dc, FALSE, FALSE, time);
-			return ;
-		}
-		
-		pPointedIcon = NULL;
-		fOrder = 0;
-		
-		// try to guess where we dropped.
-		int iDropX = (pDock->container.bIsHorizontal ? x : y);
-		Icon *pNeighboorIcon;
-		Icon *icon;
-		GList *ic;
-		for (ic = pDock->icons; ic != NULL; ic = ic->next)
-		{
-			icon = ic->data;
-			if (icon->bPointed)
-			{
-				if (iDropX < icon->fDrawX + icon->fWidth * icon->fScale/2)  // on the left side of the icon
-				{
-					pNeighboorIcon = (ic->prev != NULL ? ic->prev->data : NULL);
-					fOrder = (pNeighboorIcon != NULL ? (icon->fOrder + pNeighboorIcon->fOrder) / 2 : icon->fOrder - 1);
-				}
-				else  // on the right side of the icon
-				{
-					pNeighboorIcon = (ic->next != NULL ? ic->next->data : NULL);
-					fOrder = (pNeighboorIcon != NULL ? (icon->fOrder + pNeighboorIcon->fOrder) / 2 : icon->fOrder + 1);
-				}
-				break;
-			}
-		}
-	}
-	else  // drop on an icon or nowhere.
-	{
-		pPointedIcon = cairo_dock_get_pointed_icon (pDock->icons);
-		fOrder = CAIRO_DOCK_LAST_ORDER;
-		if (pPointedIcon == NULL && ! g_str_has_suffix (cReceivedData, ".desktop"))  // no icon => abort, but .desktop are always added
-		{
-			cd_debug ("drop nowhere");
-			gtk_drag_finish (dc, FALSE, FALSE, time);
-			return;
-		}
-	}
-	cd_debug ("drop on %s (%.2f)", pPointedIcon?pPointedIcon->cName:"dock", fOrder);
-	/**int iDropX = (pDock->container.bIsHorizontal ? x : y);
-	Icon *pNeighboorIcon = NULL;
-	Icon *icon;
-	GList *ic;
-	for (ic = pDock->icons; ic != NULL; ic = ic->next)
-	{
-		icon = ic->data;
-		if (icon->bPointed)
-		{
-			//g_print ("On pointe sur %s\n", icon->cName);
-			pPointedIcon = icon;
-			double fMargin;  /// deviendra obsolete si le drag-received fonctionne.
-			if (g_str_has_suffix (cReceivedData, ".desktop"))  // si c'est un .desktop, on l'ajoute.
-			{
-				if (myDocksParam.bLockIcons || myDocksParam.bLockAll)
-				{
-					gtk_drag_finish (dc, FALSE, FALSE, time);
-					return ;
-				}
-				fMargin = 0.5;  // on ne sera jamais dessus.
-				///fMargin = 0.25;
-			}
-			else  // sinon on le lance si on est sur l'icone, et on l'ajoute autrement.
-				fMargin = 0.25;
-			cd_debug ("%d > %.2f", iDropX, icon->fX + icon->fWidth * icon->fScale * (1 - fMargin));
-			cd_debug ("%d < %.2f", iDropX, icon->fX + icon->fWidth * icon->fScale * fMargin);
-			if (iDropX > icon->fX + icon->fWidth * icon->fScale * (1 - fMargin))  // on est apres.
-			{
-				if (myDocksParam.bLockIcons || myDocksParam.bLockAll)
-				{
-					gtk_drag_finish (dc, FALSE, FALSE, time);
-					return ;
-				}
-				pNeighboorIcon = (ic->next != NULL ? ic->next->data : NULL);
-				fOrder = (pNeighboorIcon != NULL ? (icon->fOrder + pNeighboorIcon->fOrder) / 2 : icon->fOrder + 1);
-			}
-			else if (iDropX < icon->fX + icon->fWidth * icon->fScale * fMargin)  // on est avant.
-			{
-				if (myDocksParam.bLockIcons || myDocksParam.bLockAll)
-				{
-					gtk_drag_finish (dc, FALSE, FALSE, time);
-					return ;
-				}
-				pNeighboorIcon = (ic->prev != NULL ? ic->prev->data : NULL);
-				fOrder = (pNeighboorIcon != NULL ? (icon->fOrder + pNeighboorIcon->fOrder) / 2 : icon->fOrder - 1);
-			}
-			else  // on est dessus.
-			{
-				fOrder = CAIRO_DOCK_LAST_ORDER;
-			}
-		}
-	}*/
-	
-	cairo_dock_notify_drop_data (cReceivedData, pPointedIcon, fOrder, CAIRO_CONTAINER (pDock));
-	
-	gtk_drag_finish (dc, TRUE, FALSE, time);
-}
-
-gboolean cairo_dock_on_drag_drop (GtkWidget *pWidget, GdkDragContext *dc, gint x, gint y, guint time, CairoDock *pDock)
-{
-	cd_message ("%s (%dx%d, %d)", __func__, x, y, time);
-	GdkAtom target = gtk_drag_dest_find_target (pWidget, dc, NULL);
-	gtk_drag_get_data (pWidget, dc, target, time);
-	return TRUE;  // in a drop zone.
-}
-
-
-gboolean cairo_dock_on_drag_motion (GtkWidget *pWidget, GdkDragContext *dc, gint x, gint y, guint time, CairoDock *pDock)
-{
-	cd_debug ("%s (%d;%d, %d)", __func__, x, y, time);
-	
-	//\_________________ On simule les evenements souris habituels.
-	if (! pDock->bIsDragging)
-	{
-		cd_debug ("start dragging");
-		pDock->bIsDragging = TRUE;
-		
-		/*GdkAtom gdkAtom = gdk_drag_get_selection (dc);
-		Atom xAtom = gdk_x11_atom_to_xatom (gdkAtom);
-		Window Xid = GDK_WINDOW_XID (dc->source_window);
-		cd_debug (" <%s>\n", cairo_dock_get_property_name_on_xwindow (Xid, xAtom));*/
-		
-		gboolean bStartAnimation = FALSE;
-		cairo_dock_notify_on_object (pDock, NOTIFICATION_START_DRAG_DATA, pDock, &bStartAnimation);
-		if (bStartAnimation)
-			cairo_dock_launch_animation (CAIRO_CONTAINER (pDock));
-		
-		/*pDock->iAvoidingMouseIconType = -1;
-		
-		GdkAtom target = gtk_drag_dest_find_target (pWidget, dc, NULL);
-		if (target == GDK_NONE)
-			gdk_drag_status (dc, 0, time);
-		else
-		{
-			gtk_drag_get_data (pWidget, dc, target, time);
-			s_bWaitForData = TRUE;
-			cd_debug ("get-data envoye\n");
-		}*/
-		
-		cairo_dock_on_enter_notify (pWidget, NULL, pDock);  // ne sera effectif que la 1ere fois a chaque entree dans un dock.
-	}
-	else
-	{
-		//g_print ("move dragging\n");
-		cairo_dock_on_motion_notify (pWidget, NULL, pDock);
-	}
-	
-	int X, Y;
-	if (pDock->container.bIsHorizontal)
-	{
-		X = x - pDock->container.iWidth/2;
-		Y = y;
-	}
-	else
-	{
-		Y = x;
-		X = y - pDock->container.iWidth/2;
-	}
-	int w, h;
-	Icon *icon = cairo_dock_get_pointed_icon (pDock->icons);
-	if (pDock->iInputState == CAIRO_DOCK_INPUT_AT_REST)
-	{
-		w = pDock->iMinDockWidth;
-		h = pDock->iMinDockHeight;
-		
-		if (X <= -w/2 || X >= w/2)
-			return FALSE;  // on n'accepte pas le drop.
-		if (pDock->container.bDirectionUp)
-		{
-			if (Y < pDock->container.iHeight - h || Y >= pDock->container.iHeight)
-				return FALSE;  // on n'accepte pas le drop.
-		}
-		else
-		{
-			if (Y < 0 || Y > h)
-				return FALSE;  // on n'accepte pas le drop.
-		}
-	}
-	else if (pDock->iInputState == CAIRO_DOCK_INPUT_HIDDEN)
-	{
-		return FALSE;  // on n'accepte pas le drop.
-	}
-	
-	//g_print ("take the drop\n");
-	gdk_drag_status (dc, GDK_ACTION_COPY, time);
-	return TRUE;  // on accepte le drop.
-}
-
-void cairo_dock_on_drag_leave (GtkWidget *pWidget, GdkDragContext *dc, guint time, CairoDock *pDock)
-{
-	//g_print ("stop dragging 1\n");
-	Icon *icon = cairo_dock_get_pointed_icon (pDock->icons);
-	if ((icon && icon->pSubDock) || pDock->iRefCount > 0)  // on retarde l'evenement, car il arrive avant le leave-event, et donc le sous-dock se cache avant qu'on puisse y entrer.
-	{
-		cd_debug (">>> on attend...");
-		while (gtk_events_pending ())  // on laisse le temps au signal d'entree dans le sous-dock d'etre traite, de facon a avoir un start-dragging avant de quitter cette fonction.
-			gtk_main_iteration ();
-		cd_debug (">>> pDock->container.bInside : %d", pDock->container.bInside);
-	}
-	//g_print ("stop dragging 2\n");
-	s_bWaitForData = FALSE;
-	pDock->bIsDragging = FALSE;
-	s_bCouldDrop = pDock->bCanDrop;
-	pDock->bCanDrop = FALSE;
-	//cairo_dock_stop_marking_icons (pDock);
-	pDock->iAvoidingMouseIconType = -1;
-	
-	// emit a leave-event signal, since we don't get one if we leave the window too quickly (!)
-	if (pDock->iSidLeaveDemand == 0)
-	{
-		pDock->iSidLeaveDemand = g_timeout_add (MAX (myDocksParam.iLeaveSubDockDelay, 330), (GSourceFunc) _emit_leave_signal_delayed, (gpointer) pDock);  // emit with a delay, so that we can leave and enter the dock for a few ms without making it hide.
-	}
-	// emulate a motion event so that the mouse position is up-to-date (which is not the case if we leave the window too quickly).
-	cairo_dock_on_motion_notify (pWidget, NULL, pDock);
-}
-
-
-static void _cairo_dock_show_dock_at_mouse (CairoDock *pDock)
-{
-	g_return_if_fail (pDock != NULL);
-	gldi_container_update_mouse_position (CAIRO_CONTAINER (pDock));
-	
-	///pDock->iGapX = pDock->container.iWindowPositionX + iMouseX - g_desktopGeometry.iScreenWidth[pDock->container.bIsHorizontal] * pDock->fAlign;
-	///pDock->iGapY = (pDock->container.bDirectionUp ? g_desktopGeometry.iScreenHeight[pDock->container.bIsHorizontal] - (pDock->container.iWindowPositionY + iMouseY) : pDock->container.iWindowPositionY + iMouseY);
-	pDock->iGapX = pDock->container.iWindowPositionX + pDock->container.iMouseX - (g_desktopGeometry.iScreenWidth[pDock->container.bIsHorizontal] - pDock->container.iWidth) * pDock->fAlign - pDock->container.iWidth/2 - pDock->iScreenOffsetX;
-	pDock->iGapY = (pDock->container.bDirectionUp ? g_desktopGeometry.iScreenHeight[pDock->container.bIsHorizontal] - (pDock->container.iWindowPositionY + pDock->container.iMouseY) : pDock->container.iWindowPositionY + pDock->container.iMouseY) - pDock->iScreenOffsetY;
-	cd_debug (" => %d;%d", g_pMainDock->iGapX, g_pMainDock->iGapY);
-	
-	int iNewPositionX, iNewPositionY;
-	cairo_dock_get_window_position_at_balance (pDock,
-		pDock->container.iWidth, pDock->container.iHeight,
-		&iNewPositionX, &iNewPositionY);
-	cd_debug (" ==> %d;%d", iNewPositionX, iNewPositionY);
-	if (iNewPositionX < 0)
-		iNewPositionX = 0;
-	else if (iNewPositionX + pDock->container.iWidth > g_desktopGeometry.iScreenWidth[pDock->container.bIsHorizontal])
-		iNewPositionX = g_desktopGeometry.iScreenWidth[pDock->container.bIsHorizontal] - pDock->container.iWidth;
-	
-	if (iNewPositionY < 0)
-		iNewPositionY = 0;
-	else if (iNewPositionY + pDock->container.iHeight > g_desktopGeometry.iScreenHeight[pDock->container.bIsHorizontal])
-		iNewPositionY = g_desktopGeometry.iScreenHeight[pDock->container.bIsHorizontal] - pDock->container.iHeight;
-	
-	gtk_window_move (GTK_WINDOW (pDock->container.pWidget),
-		(pDock->container.bIsHorizontal ? iNewPositionX : iNewPositionY),
-		(pDock->container.bIsHorizontal ? iNewPositionY : iNewPositionX));
-	gtk_widget_show (pDock->container.pWidget);
-}
-void cairo_dock_raise_from_shortcut (const char *cKeyShortcut, gpointer data)
-{
-	if (gldi_container_is_visible (CAIRO_CONTAINER (g_pMainDock)))
-	{
-		gtk_widget_hide (g_pMainDock->container.pWidget);
-	}
-	else
-	{
-		_cairo_dock_show_dock_at_mouse (g_pMainDock);
-	}
-	if (g_pMainDock->iVisibility != CAIRO_DOCK_VISI_SHORTKEY)  // could happen if we set the shortkey outside of the Visibility module.
-		g_pMainDock->iVisibility == CAIRO_DOCK_VISI_SHORTKEY;
-	s_bHideAfterShortcut = FALSE;
-}
-
-void cairo_dock_hide_after_shortcut (void)
-{
-	if (s_bHideAfterShortcut && gldi_container_is_visible (CAIRO_CONTAINER (g_pMainDock)))
-	{
-		gtk_widget_hide (g_pMainDock->container.pWidget);
-		s_bHideAfterShortcut = FALSE;
-	}
-}

=== removed file '.pc/01-bzr_dock-s_menu.patch/src/gldit/cairo-dock-dock-factory.c'
--- .pc/01-bzr_dock-s_menu.patch/src/gldit/cairo-dock-dock-factory.c	2012-04-25 01:29:46 +0000
+++ .pc/01-bzr_dock-s_menu.patch/src/gldit/cairo-dock-dock-factory.c	1970-01-01 00:00:00 +0000
@@ -1,1255 +0,0 @@
-/**
-* This file is a part of the Cairo-Dock project
-*
-* Copyright : (C) see the 'copyright' file.
-* E-mail    : see the 'copyright' file.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 3
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <math.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <glib/gstdio.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-
-#include <cairo.h>
-
-#include <X11/extensions/Xrender.h>
-#include <X11/extensions/shape.h>
-#include <GL/gl.h> 
-#include <GL/glu.h> 
-#include <GL/glx.h> 
-
-#include "cairo-dock-draw.h"
-#include "cairo-dock-applications-manager.h"
-#include "cairo-dock-image-buffer.h"
-#include "cairo-dock-module-factory.h"
-#include "cairo-dock-callbacks.h"
-#include "cairo-dock-icon-factory.h"
-#include "cairo-dock-icon-facility.h"
-#include "cairo-dock-separator-manager.h"
-#include "cairo-dock-launcher-manager.h"
-#include "cairo-dock-backends-manager.h"  // myBackendsParam.fSubDockSizeRatio
-#include "cairo-dock-X-utilities.h"
-#include "cairo-dock-log.h"
-#include "cairo-dock-application-facility.h"  // cairo_dock_detach_appli
-#include "cairo-dock-dialog-manager.h"  // cairo_dock_replace_all_dialogs
-#include "cairo-dock-keyfile-utilities.h"
-#include "cairo-dock-dock-manager.h"
-#include "cairo-dock-notifications.h"
-#include "cairo-dock-class-manager.h"
-#include "cairo-dock-animations.h"
-#include "cairo-dock-container.h"
-#include "cairo-dock-desktop-file-factory.h"
-#include "cairo-dock-themes-manager.h"
-#include "cairo-dock-gui-manager.h"
-#include "cairo-dock-dock-facility.h"
-#include "cairo-dock-desktop-file-factory.h"
-#include "cairo-dock-draw-opengl.h"
-#include "cairo-dock-opengl.h"
-#include "cairo-dock-dock-factory.h"
-
-extern gchar *g_cCurrentLaunchersPath;
-
-extern CairoDockGLConfig g_openglConfig;
-extern CairoDockHidingEffect *g_pHidingBackend;
-extern gboolean g_bUseOpenGL;
-
-
-static gboolean _cairo_dock_grow_up (CairoDock *pDock)
-{
-	//g_print ("%s (%d ; %2f ; bInside:%d)\n", __func__, pDock->iMagnitudeIndex, pDock->fFoldingFactor, pDock->container.bInside);
-	
-	pDock->iMagnitudeIndex += myBackendsParam.iGrowUpInterval;
-	if (pDock->iMagnitudeIndex > CAIRO_DOCK_NB_MAX_ITERATIONS)
-		pDock->iMagnitudeIndex = CAIRO_DOCK_NB_MAX_ITERATIONS;
-
-	if (pDock->fFoldingFactor != 0)
-	{
-		int iAnimationDeltaT = cairo_dock_get_animation_delta_t (pDock);
-		pDock->fFoldingFactor -= (double) iAnimationDeltaT / myBackendsParam.iUnfoldingDuration;
-		if (pDock->fFoldingFactor < 0)
-			pDock->fFoldingFactor = 0;
-	}
-	
-	gldi_container_update_mouse_position (CAIRO_CONTAINER (pDock));
-	
-	Icon *pLastPointedIcon = cairo_dock_get_pointed_icon (pDock->icons);
-	Icon *pPointedIcon = cairo_dock_calculate_dock_icons (pDock);
-	if (! pDock->bIsGrowingUp)
-		return FALSE;
-	
-	if (pLastPointedIcon != pPointedIcon && pDock->container.bInside)
-		cairo_dock_on_change_icon (pLastPointedIcon, pPointedIcon, pDock);
-
-	if (pDock->iMagnitudeIndex == CAIRO_DOCK_NB_MAX_ITERATIONS && pDock->fFoldingFactor == 0)  // fin de grossissement et de depliage.
-	{
-		/// TODO: check doing this in update_dock_size directly...
-		/**if (pDock->bWMIconsNeedUpdate)
-		{
-			cairo_dock_trigger_set_WM_icons_geometry (pDock);
-			pDock->bWMIconsNeedUpdate = FALSE;
-		}*/
-		
-		cairo_dock_replace_all_dialogs ();
-		return FALSE;
-	}
-	else
-		return TRUE;
-}
-
-static gboolean _cairo_dock_shrink_down (CairoDock *pDock)
-{
-	//g_print ("%s (%d, %f, %f)\n", __func__, pDock->iMagnitudeIndex, pDock->fFoldingFactor, pDock->fDecorationsOffsetX);
-	//\_________________ On fait decroitre la magnitude du dock.
-	int iPrevMagnitudeIndex = pDock->iMagnitudeIndex;
-	pDock->iMagnitudeIndex -= myBackendsParam.iShrinkDownInterval;
-	if (pDock->iMagnitudeIndex < 0)
-		pDock->iMagnitudeIndex = 0;
-	
-	//\_________________ On replie le dock.
-	if (pDock->fFoldingFactor != 0 && pDock->fFoldingFactor != 1)
-	{
-		int iAnimationDeltaT = cairo_dock_get_animation_delta_t (pDock);
-		pDock->fFoldingFactor += (double) iAnimationDeltaT / myBackendsParam.iUnfoldingDuration;
-		if (pDock->fFoldingFactor > 1)
-			pDock->fFoldingFactor = 1;
-	}
-	
-	//\_________________ On remet les decorations a l'equilibre.
-	pDock->fDecorationsOffsetX *= .8;
-	if (fabs (pDock->fDecorationsOffsetX) < 3)
-		pDock->fDecorationsOffsetX = 0.;
-	
-	//\_________________ On recupere la position de la souris manuellement (car a priori on est hors du dock).
-	gldi_container_update_mouse_position (CAIRO_CONTAINER (pDock));  // ce n'est pas le motion_notify qui va nous donner des coordonnees en dehors du dock, et donc le fait d'etre dedans va nous faire interrompre le shrink_down et re-grossir, du coup il faut le faire ici. L'inconvenient, c'est que quand on sort par les cotes, il n'y a soudain plus d'icone pointee, et donc le dock devient tout plat subitement au lieu de le faire doucement. Heureusement j'ai trouve une astuce. ^_^
-	
-	//\_________________ On recalcule les icones.
-	///if (iPrevMagnitudeIndex != 0)
-	{
-		cairo_dock_calculate_dock_icons (pDock);
-		if (! pDock->bIsShrinkingDown)
-			return FALSE;
-		
-		///cairo_dock_replace_all_dialogs ();
-	}
-
-	if (pDock->iMagnitudeIndex == 0 && (pDock->fFoldingFactor == 0 || pDock->fFoldingFactor == 1))  // on est arrive en bas.
-	{
-		//g_print ("equilibre atteint (%d)\n", pDock->container.bInside);
-		if (! pDock->container.bInside)  // on peut etre hors des icones sans etre hors de la fenetre.
-		{
-			//g_print ("rideau !\n");
-			
-			//\__________________ On repasse derriere si on etait devant.
-			if (pDock->iVisibility == CAIRO_DOCK_VISI_KEEP_BELOW && ! pDock->bIsBelow)
-				cairo_dock_pop_down (pDock);
-			
-			//\__________________ On se redimensionne en taille normale.
-			if (! pDock->bAutoHide && pDock->iRefCount == 0 && ! pDock->bMenuVisible)  // fin de shrink sans auto-hide => taille normale.
-			{
-				//g_print ("taille normale (%x; %d)\n", pDock->pShapeBitmap , pDock->iInputState);
-				if (pDock->pShapeBitmap && pDock->iInputState != CAIRO_DOCK_INPUT_AT_REST)
-				{
-					//g_print ("+++ input shape at rest on end shrinking\n");
-					cairo_dock_set_input_shape_at_rest (pDock);
-					pDock->iInputState = CAIRO_DOCK_INPUT_AT_REST;
-					///cairo_dock_replace_all_dialogs ();
-				}
-			}
-			
-			//\__________________ On se cache si sous-dock.
-			if (pDock->iRefCount > 0)
-			{
-				//g_print ("on cache ce sous-dock en sortant par lui\n");
-				gtk_widget_hide (pDock->container.pWidget);
-				cairo_dock_hide_parent_dock (pDock);
-			}
-			cairo_dock_hide_after_shortcut ();
-		}
-		else
-		{
-			cairo_dock_calculate_dock_icons (pDock);  // relance le grossissement si on est dedans.
-		}
-		if (!pDock->bIsGrowingUp)
-			cairo_dock_replace_all_dialogs ();
-		return (!pDock->bIsGrowingUp && (pDock->fDecorationsOffsetX != 0 || (pDock->fFoldingFactor != 0 && pDock->fFoldingFactor != 1)));
-	}
-	else
-	{
-		return (!pDock->bIsGrowingUp);
-	}
-}
-
-static gboolean _cairo_dock_hide (CairoDock *pDock)
-{
-	//g_print ("%s (%d, %.2f, %.2f)\n", __func__, pDock->iMagnitudeIndex, pDock->fHideOffset, pDock->fPostHideOffset);
-	
-	if (pDock->fHideOffset < 1)  // the hiding animation is running.
-	{
-		pDock->fHideOffset += 1./myBackendsParam.iHideNbSteps;
-		if (pDock->fHideOffset > .99)  // fin d'anim.
-		{
-			pDock->fHideOffset = 1;
-			
-			//g_print ("on arrete le cachage\n");
-			gboolean bVisibleIconsPresent = FALSE;
-			Icon *pIcon;
-			GList *ic;
-			for (ic = pDock->icons; ic != NULL; ic = ic->next)
-			{
-				pIcon = ic->data;
-				if (pIcon->fInsertRemoveFactor != 0)  // on accelere l'animation d'apparition/disparition.
-				{
-					if (pIcon->fInsertRemoveFactor > 0)
-						pIcon->fInsertRemoveFactor = 0.05;
-					else
-						pIcon->fInsertRemoveFactor = - 0.05;
-				}
-				
-				if (! pIcon->bIsDemandingAttention && ! pIcon->bAlwaysVisible)
-					cairo_dock_stop_icon_animation (pIcon);  // s'il y'a une autre animation en cours, on l'arrete.
-				else
-					bVisibleIconsPresent = TRUE;
-			}
-			
-			pDock->pRenderer->calculate_icons (pDock);
-			///pDock->fFoldingFactor = (myBackendsParam.bAnimateOnAutoHide ? .99 : 0.);  // on arme le depliage.
-			cairo_dock_allow_entrance (pDock);
-			
-			cairo_dock_replace_all_dialogs ();
-			
-			if (bVisibleIconsPresent)  // il y'a des icones a montrer progressivement, on reste dans la boucle.
-			{
-				pDock->fPostHideOffset = 0.05;
-				return TRUE;
-			}
-			else
-			{
-				pDock->fPostHideOffset = 1;  // pour que les icones demandant l'attention plus tard soient visibles.
-				return FALSE;
-			}
-		}
-	}
-	else if (pDock->fPostHideOffset > 0 && pDock->fPostHideOffset < 1)  // the post-hiding animation is running.
-	{
-		pDock->fPostHideOffset += 1./myBackendsParam.iHideNbSteps;
-		if (pDock->fPostHideOffset > .99)
-		{
-			pDock->fPostHideOffset = 1.;
-			return FALSE;
-		}
-	}
-	else  // else no hiding animation is running.
-		return FALSE;
-	return TRUE;
-}
-
-static gboolean _cairo_dock_show (CairoDock *pDock)
-{
-	pDock->fHideOffset -= 1./myBackendsParam.iUnhideNbSteps;
-	if (pDock->fHideOffset < 0.01)
-	{
-		pDock->fHideOffset = 0;
-		cairo_dock_allow_entrance (pDock);
-		cairo_dock_replace_all_dialogs ();  // we need it here so that a modal dialog is replaced when the dock unhides (else it would stay behind).
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static gboolean _cairo_dock_handle_inserting_removing_icons (CairoDock *pDock)
-{
-	gboolean bRecalculateIcons = FALSE;
-	GList* ic = pDock->icons, *next_ic;
-	Icon *pIcon;
-	while (ic != NULL)
-	{
-		pIcon = ic->data;
-		next_ic = ic->next;
-		if (pIcon->fInsertRemoveFactor == (gdouble)0.05)
-		{
-			gboolean bIsAppli = CAIRO_DOCK_IS_NORMAL_APPLI (pIcon);
-			if (bIsAppli && pIcon->iLastCheckTime != -1)  // c'est une icone d'appli non vieille qui disparait, elle s'est probablement cachee => on la detache juste.
-			{
-				cd_message ("cette (%s) appli est toujours valide, on la detache juste", pIcon->cName);
-				pIcon->fInsertRemoveFactor = 0.;  // on le fait avant le reload, sinon l'icone n'est pas rechargee.
-				if (!pIcon->bIsHidden && myTaskbarParam.bHideVisibleApplis)  // on lui remet l'image normale qui servira d'embleme lorsque l'icone sera inseree a nouveau dans le dock.
-					cairo_dock_reload_icon_image (pIcon, CAIRO_CONTAINER (pDock));
-				pDock = cairo_dock_detach_appli (pIcon);
-				if (pDock == NULL)  // the dock has been destroyed (empty class sub-dock).
-				{
-					cairo_dock_free_icon (pIcon);
-					return FALSE;
-				}
-			}
-			else
-			{
-				cd_message (" - %s va etre supprimee", pIcon->cName);
-				cairo_dock_remove_icon_from_dock (pDock, pIcon);  // enleve le separateur automatique avec; supprime le .desktop et le sous-dock des lanceurs; stoppe les applets; marque le theme.
-				
-				if (pIcon->cClass != NULL && pDock == cairo_dock_get_class_subdock (pIcon->cClass))  // appli icon in its class sub-dock => destroy the class sub-dock if it becomes empty (we don't want an empty sub-dock).
-				{
-					gboolean bEmptyClassSubDock = cairo_dock_check_class_subdock_is_empty (pDock, pIcon->cClass);
-					if (bEmptyClassSubDock)
-					{
-						cairo_dock_free_icon (pIcon);
-						return FALSE;
-					}
-				}
-				
-				cairo_dock_free_icon (pIcon);
-			}
-		}
-		else if (pIcon->fInsertRemoveFactor == (gdouble)-0.05)
-		{
-			pIcon->fInsertRemoveFactor = 0;  // cela n'arrete pas l'animation, qui peut se poursuivre meme apres que l'icone ait atteint sa taille maximale.
-			bRecalculateIcons = TRUE;
-		}
-		else if (pIcon->fInsertRemoveFactor != 0)
-		{
-			bRecalculateIcons = TRUE;
-		}
-		ic = next_ic;
-	}
-	
-	if (bRecalculateIcons)
-		cairo_dock_calculate_dock_icons (pDock);
-	return TRUE;
-}
-
-static gboolean _cairo_dock_dock_animation_loop (CairoContainer *pContainer)
-{
-	CairoDock *pDock = CAIRO_DOCK (pContainer);
-	gboolean bContinue = FALSE;
-	gboolean bUpdateSlowAnimation = FALSE;
-	pContainer->iAnimationStep ++;
-	if (pContainer->iAnimationStep * pContainer->iAnimationDeltaT >= CAIRO_DOCK_MIN_SLOW_DELTA_T)
-	{
-		bUpdateSlowAnimation = TRUE;
-		pContainer->iAnimationStep = 0;
-		pContainer->bKeepSlowAnimation = FALSE;
-	}
-	
-	if (pDock->bIsShrinkingDown)
-	{
-		pDock->bIsShrinkingDown = _cairo_dock_shrink_down (pDock);
-		cairo_dock_redraw_container (CAIRO_CONTAINER (pDock));
-		bContinue |= pDock->bIsShrinkingDown;
-	}
-	if (pDock->bIsGrowingUp)
-	{
-		pDock->bIsGrowingUp = _cairo_dock_grow_up (pDock);
-		cairo_dock_redraw_container (CAIRO_CONTAINER (pDock));
-		bContinue |= pDock->bIsGrowingUp;
-	}
-	if (pDock->bIsHiding)
-	{
-		//g_print ("le dock se cache\n");
-		pDock->bIsHiding = _cairo_dock_hide (pDock);
-		gtk_widget_queue_draw (pContainer->pWidget);  // on n'utilise pas cairo_dock_redraw_container, sinon a la derniere iteration, le dock etant cache, la fonction ne le redessine pas.
-		bContinue |= pDock->bIsHiding;
-	}
-	if (pDock->bIsShowing)
-	{
-		pDock->bIsShowing = _cairo_dock_show (pDock);
-		cairo_dock_redraw_container (CAIRO_CONTAINER (pDock));
-		bContinue |= pDock->bIsShowing;
-	}
-	//g_print (" => %d, %d\n", pDock->bIsShrinkingDown, pDock->bIsGrowingUp);
-	
-	double fDockMagnitude = cairo_dock_calculate_magnitude (pDock->iMagnitudeIndex);
-	gboolean bIconIsAnimating;
-	gboolean bNoMoreDemandingAttention = FALSE;
-	Icon *icon;
-	GList *ic;
-	for (ic = pDock->icons; ic != NULL; ic = ic->next)
-	{
-		icon = ic->data;
-		
-		icon->fDeltaYReflection = 0;
-		if (myIconsParam.fAlphaAtRest != 1)
-			icon->fAlpha = fDockMagnitude + myIconsParam.fAlphaAtRest * (1 - fDockMagnitude);
-		
-		bIconIsAnimating = FALSE;
-		if (bUpdateSlowAnimation)
-		{
-			cairo_dock_notify_on_object (icon, NOTIFICATION_UPDATE_ICON_SLOW, icon, pDock, &bIconIsAnimating);
-			pContainer->bKeepSlowAnimation |= bIconIsAnimating;
-		}
-		cairo_dock_notify_on_object (icon, NOTIFICATION_UPDATE_ICON, icon, pDock, &bIconIsAnimating);
-		
-		if ((icon->bIsDemandingAttention || icon->bAlwaysVisible) && cairo_dock_is_hidden (pDock))  // animation d'une icone demandant l'attention dans un dock cache => on force le dessin qui normalement ne se fait pas.
-		{
-			gtk_widget_queue_draw (pContainer->pWidget);
-		}
-		
-		bContinue |= bIconIsAnimating;
-		if (! bIconIsAnimating)
-		{
-			icon->iAnimationState = CAIRO_DOCK_STATE_REST;
-			if (icon->bIsDemandingAttention)
-			{
-				icon->bIsDemandingAttention = FALSE;
-				bNoMoreDemandingAttention = TRUE;
-			}
-		}
-	}
-	bContinue |= pContainer->bKeepSlowAnimation;
-	
-	if (pDock->iVisibility == CAIRO_DOCK_VISI_KEEP_BELOW && bNoMoreDemandingAttention && ! pDock->bIsBelow && ! pContainer->bInside)
-	{
-		//g_print ("plus de raison d'etre devant\n");
-		cairo_dock_pop_down (pDock);
-	}
-	
-	if (! _cairo_dock_handle_inserting_removing_icons (pDock))
-	{
-		cd_debug ("ce dock n'a plus de raison d'etre");
-		return FALSE;
-	}
-	
-	if (bUpdateSlowAnimation)
-	{
-		cairo_dock_notify_on_object (pDock, NOTIFICATION_UPDATE_SLOW, pDock, &pContainer->bKeepSlowAnimation);
-	}
-	cairo_dock_notify_on_object (pDock, NOTIFICATION_UPDATE, pDock, &bContinue);
-	
-	if (! bContinue && ! pContainer->bKeepSlowAnimation)
-	{
-		pContainer->iSidGLAnimation = 0;
-		return FALSE;
-	}
-	else
-		return TRUE;
-}
-
-static gboolean _on_dock_destroyed (GtkWidget *menu, CairoContainer *pContainer);
-static void _on_menu_deactivated (GtkMenuShell *menu, CairoDock *pDock)
-{
-	//g_print ("\n+++ %s ()\n\n", __func__);
-	g_return_if_fail (CAIRO_DOCK_IS_DOCK (pDock));
-	pDock->bMenuVisible = FALSE;
-	cairo_dock_emit_leave_signal (CAIRO_CONTAINER (pDock));
-}
-static void _on_menu_destroyed (GtkWidget *menu, CairoDock *pDock)
-{
-	//g_print ("\n+++ %s ()\n\n", __func__);
-	cairo_dock_remove_notification_func_on_object (pDock,
-		NOTIFICATION_DESTROY,
-		(CairoDockNotificationFunc) _on_dock_destroyed,
-		menu);
-}
-static gboolean _on_dock_destroyed (GtkWidget *menu, CairoContainer *pContainer)
-{
-	//g_print ("\n+++ %s ()\n\n", __func__);
-	g_signal_handlers_disconnect_matched
-		(menu,
-		G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA,
-		0,
-		0,
-		NULL,
-		_on_menu_deactivated,
-		pContainer);
-	g_signal_handlers_disconnect_matched
-		(menu,
-		G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA,
-		0,
-		0,
-		NULL,
-		_on_menu_destroyed,
-		pContainer);
-}
-static void _setup_menu (CairoContainer *pContainer, Icon *pIcon, GtkWidget *pMenu)
-{
-	// keep the dock visible
-	CAIRO_DOCK (pContainer)->bMenuVisible = TRUE;
-	
-	// connect signals
-	if (g_signal_handler_find (pMenu,
-		G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA,
-		0,
-		0,
-		NULL,
-		_on_menu_deactivated,
-		pContainer) == 0)  // on evite de connecter 2 fois ce signal, donc la fonction est appelable plusieurs fois sur un meme menu.
-	{
-		// when the menu is deactivated, hide the dock back if necessary.
-		g_signal_connect (G_OBJECT (pMenu),
-			"deactivate",
-			G_CALLBACK (_on_menu_deactivated),
-			pContainer);
-		// when the menu is destroyed, remove the 'destroyed' notification on the dock.
-		g_signal_connect (G_OBJECT (pMenu),
-			"destroy",
-			G_CALLBACK (_on_menu_destroyed),
-			pContainer);
-		// when the dock is destroyed, remove the 2 signals on the menu.
-		cairo_dock_register_notification_on_object (pContainer,
-			NOTIFICATION_DESTROY,
-			(CairoDockNotificationFunc) _on_dock_destroyed,
-			CAIRO_DOCK_RUN_AFTER, pMenu);  // the menu can stay alive even if the container disappear, so we need to ensure we won't call the callbacks then.
-	}
-}
-
-
-CairoDock *cairo_dock_new_dock (void)
-{
-	//\__________________ On cree un dock.
-	CairoDock *pDock = g_new0 (CairoDock, 1);
-	pDock->container.iType = CAIRO_DOCK_TYPE_DOCK;
-	
-	pDock->iRefCount = 0;  // c'est un dock racine par defaut.
-	pDock->iAvoidingMouseIconType = -1;
-	pDock->fFlatDockWidth = - myIconsParam.iIconGap;
-	///pDock->container.iMouseX = -1; // utile ?
-	///pDock->container.iMouseY = -1;
-	pDock->fMagnitudeMax = 1.;
-	pDock->fPostHideOffset = 1.;
-	pDock->iInputState = CAIRO_DOCK_INPUT_AT_REST;  // le dock est cree au repos. La zone d'input sera mis en place lors du configure.
-	
-	pDock->container.iface.animation_loop = _cairo_dock_dock_animation_loop;
-	pDock->container.iface.setup_menu = _setup_menu;
-	
-	//\__________________ On cree la fenetre GTK.
-	GtkWidget *pWindow = cairo_dock_init_container (CAIRO_CONTAINER (pDock));
-	///cairo_dock_install_notifications_on_object (pDock, NB_NOTIFICATIONS_DOCKS);
-	gldi_object_set_manager (GLDI_OBJECT (pDock), GLDI_MANAGER (&myDocksMgr));
-	gtk_container_set_border_width (GTK_CONTAINER (pWindow), 0);
-	gtk_window_set_gravity (GTK_WINDOW (pWindow), GDK_GRAVITY_STATIC);
-	gtk_window_set_type_hint (GTK_WINDOW (pWindow), GDK_WINDOW_TYPE_HINT_DOCK);
-	gtk_window_set_title (GTK_WINDOW (pWindow), "cairo-dock");
-	
-	
-	cairo_dock_register_notification_on_object (pDock,
-		NOTIFICATION_RENDER,
-		(CairoDockNotificationFunc) cairo_dock_render_dock_notification,
-		CAIRO_DOCK_RUN_FIRST, NULL);
-	
-	//\__________________ On connecte les evenements a la fenetre.
-	gtk_widget_add_events (pWindow,
-		GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK |
-		GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
-		GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
-	
-	g_signal_connect (G_OBJECT (pWindow),
-		#if (GTK_MAJOR_VERSION < 3)
-		"expose-event",
-		#else
-		"draw",
-		#endif
-		G_CALLBACK (cairo_dock_on_expose),
-		pDock);
-	g_signal_connect (G_OBJECT (pWindow),
-		"configure-event",
-		G_CALLBACK (cairo_dock_on_configure),
-		pDock);
-	g_signal_connect (G_OBJECT (pWindow),
-		"key-release-event",
-		G_CALLBACK (cairo_dock_on_key_release),
-		pDock);
-	g_signal_connect (G_OBJECT (pWindow),
-		"key-press-event",
-		G_CALLBACK (cairo_dock_on_key_release),
-		pDock);
-	g_signal_connect (G_OBJECT (pWindow),
-		"button-press-event",
-		G_CALLBACK (cairo_dock_on_button_press),
-		pDock);
-	g_signal_connect (G_OBJECT (pWindow),
-		"button-release-event",
-		G_CALLBACK (cairo_dock_on_button_press),
-		pDock);
-	g_signal_connect (G_OBJECT (pWindow),
-		"scroll-event",
-		G_CALLBACK (cairo_dock_on_scroll),
-		pDock);
-	g_signal_connect (G_OBJECT (pWindow),
-		"motion-notify-event",
-		G_CALLBACK (cairo_dock_on_motion_notify),
-		pDock);
-	g_signal_connect (G_OBJECT (pWindow),
-		"enter-notify-event",
-		G_CALLBACK (cairo_dock_on_enter_notify),
-		pDock);
-	g_signal_connect (G_OBJECT (pWindow),
-		"leave-notify-event",
-		G_CALLBACK (cairo_dock_on_leave_notify),
-		pDock);
-	gldi_container_enable_drop (CAIRO_CONTAINER (pDock),
-		G_CALLBACK (cairo_dock_on_drag_data_received),
-		pDock);
-	g_signal_connect (G_OBJECT (pWindow),
-		"drag-motion",
-		G_CALLBACK (cairo_dock_on_drag_motion),
-		pDock);
-	g_signal_connect (G_OBJECT (pWindow),
-		"drag-leave",
-		G_CALLBACK (cairo_dock_on_drag_leave),
-		pDock);
-	/*g_signal_connect (G_OBJECT (pWindow),
-		"drag-drop",
-		G_CALLBACK (cairo_dock_on_drag_drop),
-		pDock);*/
-
-	gtk_window_get_size (GTK_WINDOW (pWindow), &pDock->container.iWidth, &pDock->container.iHeight);  // ca n'est que la taille initiale allouee par GTK.
-	gtk_widget_show_all (pWindow);
-	#if (GTK_MAJOR_VERSION < 3)
-	gdk_window_set_back_pixmap (pWindow->window, NULL, FALSE);
-	#else
-	gdk_window_set_background_pattern (gldi_container_get_gdk_window (CAIRO_CONTAINER (pDock)), NULL);
-	#endif
-	return pDock;
-}
-
-void cairo_dock_free_dock (CairoDock *pDock)
-{
-	if (pDock->iSidUnhideDelayed != 0)
-		g_source_remove (pDock->iSidUnhideDelayed);
-	if (pDock->iSidHideBack != 0)
-		g_source_remove (pDock->iSidHideBack);
-	if (pDock->iSidMoveResize != 0)
-		g_source_remove (pDock->iSidMoveResize);
-	if (pDock->iSidLeaveDemand != 0)
-		g_source_remove (pDock->iSidLeaveDemand);
-	if (pDock->iSidUpdateWMIcons != 0)
-		g_source_remove (pDock->iSidUpdateWMIcons);
-	if (pDock->iSidLoadBg != 0)
-		g_source_remove (pDock->iSidLoadBg);
-	if (pDock->iSidDestroyEmptyDock != 0)
-		g_source_remove (pDock->iSidDestroyEmptyDock);
-	if (pDock->iSidTestMouseOutside != 0)
-		g_source_remove (pDock->iSidTestMouseOutside);
-	if (pDock->iSidUpdateDockSize != 0)
-		g_source_remove (pDock->iSidUpdateDockSize);
-	
-	GList *icons = pDock->icons;
-	pDock->icons = NULL;  // remove the icons first, to avoid any use of 'icons' in the 'destroy' callbacks.
-	g_list_foreach (icons, (GFunc) cairo_dock_free_icon, NULL);
-	g_list_free (icons);
-	
-	if (pDock->pShapeBitmap != NULL)
-		gldi_shape_destroy (pDock->pShapeBitmap);
-	
-	if (pDock->pHiddenShapeBitmap != NULL)
-		gldi_shape_destroy (pDock->pHiddenShapeBitmap);
-	
-	if (pDock->pActiveShapeBitmap != NULL)
-		gldi_shape_destroy (pDock->pActiveShapeBitmap);
-	
-	if (pDock->pRenderer != NULL && pDock->pRenderer->free_data != NULL)
-	{
-		pDock->pRenderer->free_data (pDock);
-	}
-	
-	g_free (pDock->cRendererName);
-	
-	g_free (pDock->cBgImagePath);
-	cairo_dock_unload_image_buffer (&pDock->backgroundBuffer);
-	
-	if (pDock->iFboId != 0)
-		glDeleteFramebuffersEXT (1, &pDock->iFboId);
-	if (pDock->iRedirectedTexture != 0)
-		_cairo_dock_delete_texture (pDock->iRedirectedTexture);
-	
-	cairo_dock_finish_container (CAIRO_CONTAINER (pDock));  // -> NOTIFICATION_DESTROY
-	
-	g_free (pDock);
-}
-
-void cairo_dock_make_sub_dock (CairoDock *pDock, CairoDock *pParentDock, const gchar *cRendererName)
-{
-	//\__________________ set sub-dock flag
-	pDock->iRefCount = 1;
-	gtk_window_set_title (GTK_WINDOW (pDock->container.pWidget), "cairo-dock-sub");
-	
-	//\__________________ set the orientation relatively to the parent dock
-	pDock->container.bIsHorizontal = pParentDock->container.bIsHorizontal;
-	pDock->container.bDirectionUp = pParentDock->container.bDirectionUp;
-	pDock->iScreenOffsetX = pParentDock->iScreenOffsetX;
-	pDock->iScreenOffsetY = pParentDock->iScreenOffsetY;
-	
-	//\__________________ set a renderer
-	cairo_dock_set_renderer (pDock, cRendererName);
-	
-	//\__________________ update the icons size and the ratio.
-	double fPrevRatio = pDock->container.fRatio;
-	pDock->container.fRatio = MIN (pDock->container.fRatio, myBackendsParam.fSubDockSizeRatio);
-	pDock->iIconSize = pParentDock->iIconSize;
-	
-	Icon *icon;
-	GList *ic;
-	pDock->fFlatDockWidth = - myIconsParam.iIconGap;
-	for (ic = pDock->icons; ic != NULL; ic = ic->next)
-	{
-		icon = ic->data;
-		icon->fWidth = icon->fHeight = icon->iImageWidth = icon->iImageHeight = 0;  // no request
-		cairo_dock_set_icon_size_in_dock (pDock, icon);
-		pDock->fFlatDockWidth += icon->fWidth + myIconsParam.iIconGap;
-	}
-	pDock->iMaxIconHeight *= pDock->container.fRatio / fPrevRatio;
-	
-	//\__________________ remove any input shape
-	if (pDock->pShapeBitmap != NULL)
-	{
-		gldi_shape_destroy (pDock->pShapeBitmap);
-		pDock->pShapeBitmap = NULL;
-		if (pDock->iInputState != CAIRO_DOCK_INPUT_ACTIVE)
-		{
-			cairo_dock_set_input_shape_active (pDock);
-			pDock->iInputState = CAIRO_DOCK_INPUT_ACTIVE;
-		}
-	}
-	
-	//\__________________ hide the dock
-	pDock->bAutoHide = FALSE;
-	gtk_widget_hide (pDock->container.pWidget);
-	
-	///cairo_dock_update_dock_size (pDock);
-}
-
-
-void cairo_dock_insert_icon_in_dock_full (Icon *icon, CairoDock *pDock, gboolean bAnimated, gboolean bInsertSeparator, GCompareFunc pCompareFunc)
-{
-	//g_print ("%s (%s)\n", __func__, icon->cName);
-	g_return_if_fail (icon != NULL);
-	if (g_list_find (pDock->icons, icon) != NULL)  // elle est deja dans ce dock.
-		return ;
-	if (icon->pContainer != NULL)
-	{
-		cd_warning ("This icon (%s) is already inside a container !", icon->cName);
-	}
-
-	//\______________ On regarde si on doit inserer un separateur.
-	gboolean bSeparatorNeeded = FALSE;
-	if (bInsertSeparator && ! CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon))
-	{
-		Icon *pSameTypeIcon = cairo_dock_get_first_icon_of_group (pDock->icons, icon->iGroup);
-		if (pSameTypeIcon == NULL && pDock->icons != NULL)
-		{
-			bSeparatorNeeded = TRUE;
-			//g_print ("separateur necessaire\n");
-		}
-	}
-
-	//\______________ On insere l'icone a sa place dans la liste.
-	if (icon->fOrder == CAIRO_DOCK_LAST_ORDER)
-	{
-		Icon *pLastIcon = cairo_dock_get_last_icon_of_order (pDock->icons, icon->iGroup);
-		if (pLastIcon != NULL)
-			icon->fOrder = pLastIcon->fOrder + 1;
-		else
-			icon->fOrder = 1;
-	}
-	
-	if (pCompareFunc == NULL)
-		pCompareFunc = (GCompareFunc) cairo_dock_compare_icons_order;
-	pDock->icons = g_list_insert_sorted (pDock->icons,
-		icon,
-		pCompareFunc);
-	cairo_dock_set_icon_container (icon, pDock);
-	
-	//\______________ set the icon size, now that it's inside a container.
-	int wi = icon->iImageWidth, hi = icon->iImageHeight;
-	cairo_dock_set_icon_size_in_dock (pDock, icon);
-	
-	if (wi != icon->iImageWidth || hi != icon->iImageHeight)  // if size has changed, reload the buffers
-		cairo_dock_trigger_load_icon_buffers (icon);
-	
-	pDock->fFlatDockWidth += myIconsParam.iIconGap + icon->fWidth;
-	if (! CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon))
-		pDock->iMaxIconHeight = MAX (pDock->iMaxIconHeight, icon->fHeight);
-
-	//\______________ On insere un separateur si necessaire.
-	if (bSeparatorNeeded)
-	{
-		// insert a separator after if needed
-		Icon *pNextIcon = cairo_dock_get_next_icon (pDock->icons, icon);
-		if (pNextIcon != NULL && ! CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pNextIcon))
-		{
-			int iSeparatorGroup = cairo_dock_get_icon_order (icon) +
-				(cairo_dock_get_icon_order (icon) == cairo_dock_get_icon_order (pNextIcon) ? 0 : 1);  // for separators, group = order.
-			double fOrder = (cairo_dock_get_icon_order (icon) == cairo_dock_get_icon_order (pNextIcon) ? (icon->fOrder + pNextIcon->fOrder) / 2 : 0);
-			cairo_dock_insert_automatic_separator_in_dock (iSeparatorGroup, fOrder, pNextIcon->cParentDockName, pDock);
-		}
-		
-		// insert a separator before if needed
-		Icon *pPrevIcon = cairo_dock_get_previous_icon (pDock->icons, icon);
-		if (pPrevIcon != NULL && ! CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pPrevIcon))
-		{
-			int iSeparatorGroup = cairo_dock_get_icon_order (icon) -
-				(cairo_dock_get_icon_order (icon) == cairo_dock_get_icon_order (pPrevIcon) ? 0 : 1);  // for separators, group = order.
-			double fOrder = (cairo_dock_get_icon_order (icon) == cairo_dock_get_icon_order (pPrevIcon) ? (icon->fOrder + pPrevIcon->fOrder) / 2 : 0);
-			cairo_dock_insert_automatic_separator_in_dock (iSeparatorGroup, fOrder, pPrevIcon->cParentDockName, pDock);
-		}
-	}
-	
-	//\______________ On effectue les actions demandees.
-	if (bAnimated)
-	{
-		if (cairo_dock_animation_will_be_visible (pDock))
-			icon->fInsertRemoveFactor = - 0.95;
-		else
-			icon->fInsertRemoveFactor = - 0.05;
-		cairo_dock_launch_animation (CAIRO_CONTAINER (pDock));
-	}
-	else
-		icon->fInsertRemoveFactor = 0.;
-	
-	cairo_dock_trigger_update_dock_size (pDock);
-	
-	if (pDock->iRefCount != 0 && ! CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon))  // on prevoit le redessin de l'icone pointant sur le sous-dock.
-	{
-		cairo_dock_trigger_redraw_subdock_content (pDock);
-	}
-	
-	if (icon->pSubDock != NULL)
-		cairo_dock_synchronize_one_sub_dock_orientation (icon->pSubDock, pDock, TRUE);
-	
-	//\______________ Notify everybody.
-	cairo_dock_notify_on_object (pDock, NOTIFICATION_INSERT_ICON, icon, pDock);
-}
-
-
-static gboolean _destroy_empty_dock (CairoDock *pDock)
-{
-	const gchar *cDockName = cairo_dock_search_dock_name (pDock);  // safe meme si le dock n'existe plus.
-	g_return_val_if_fail (cDockName != NULL, FALSE);  // si NULL, cela signifie que le dock n'existe plus, donc on n'y touche pas. Ce cas ne devrait jamais arriver, c'est de la pure parano.
-	
-	if (pDock->bIconIsFlyingAway)
-		return TRUE;
-	pDock->iSidDestroyEmptyDock = 0;
-	if (pDock->icons == NULL && pDock->iRefCount == 0 && ! pDock->bIsMainDock)  // le dock est toujours a detruire.
-	{
-		cd_debug ("The dock '%s' is empty. No icon, no dock.", cDockName);
-		cairo_dock_destroy_dock (pDock, cDockName);
-	}
-	return FALSE;
-}
-gboolean cairo_dock_detach_icon_from_dock_full (Icon *icon, CairoDock *pDock, gboolean bCheckUnusedSeparator)
-{
-	if (pDock == NULL)
-		return FALSE;
-	if (icon->pContainer == NULL)
-	{
-		cd_warning ("This icon (%s) is already not inside a container !", icon->cName);  // not a big deal, just print that for debug.
-	}
-	
-	//\___________________ On trouve l'icone et ses 2 voisins.
-	GList *prev_ic = NULL, *ic, *next_ic;
-	Icon *pPrevIcon = NULL, *pNextIcon = NULL;
-	for (ic = pDock->icons; ic != NULL; ic = ic->next)
-	{
-		if (ic -> data == icon)
-		{
-			prev_ic = ic->prev;
-			next_ic = ic->next;
-			if (prev_ic)
-				pPrevIcon = prev_ic->data;
-			if (next_ic)
-				pNextIcon = next_ic->data;
-			break;
-		}
-	}
-	if (ic == NULL)  // elle est deja detachee.
-		return FALSE;
-	
-	cd_message ("%s (%s)", __func__, icon->cName);
-	g_free (icon->cParentDockName);
-	icon->cParentDockName = NULL;
-	cairo_dock_set_icon_container (icon, NULL);
-	
-	//\___________________ On stoppe ses animations.
-	cairo_dock_stop_icon_animation (icon);
-	
-	//\___________________ On desactive sa miniature.
-	if (icon->Xid != 0)
-	{
-		//cd_debug ("on desactive la miniature de %s (Xid : %lx)", icon->cName, icon->Xid);
-		cairo_dock_set_xicon_geometry (icon->Xid, 0, 0, 0, 0);
-	}
-	
-	//\___________________ On l'enleve de la liste.
-	pDock->icons = g_list_delete_link (pDock->icons, ic);
-	ic = NULL;
-	pDock->fFlatDockWidth -= icon->fWidth + myIconsParam.iIconGap;
-	
-	//\___________________ On enleve le separateur si c'est la derniere icone de son type.
-	if (bCheckUnusedSeparator && ! CAIRO_DOCK_IS_AUTOMATIC_SEPARATOR (icon))
-	{
-		if ((pPrevIcon == NULL || CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pPrevIcon)) && CAIRO_DOCK_IS_AUTOMATIC_SEPARATOR (pNextIcon))
-		{
-			pDock->icons = g_list_delete_link (pDock->icons, next_ic);
-			next_ic = NULL;
-			pDock->fFlatDockWidth -= pNextIcon->fWidth + myIconsParam.iIconGap;
-			cairo_dock_free_icon (pNextIcon);
-			pNextIcon = NULL;
-		}
-		if ((pNextIcon == NULL || CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pNextIcon)) && CAIRO_DOCK_IS_AUTOMATIC_SEPARATOR (pPrevIcon))
-		{
-			pDock->icons = g_list_delete_link (pDock->icons, prev_ic);
-			prev_ic = NULL;
-			pDock->fFlatDockWidth -= pPrevIcon->fWidth + myIconsParam.iIconGap;
-			cairo_dock_free_icon (pPrevIcon);
-			pPrevIcon = NULL;
-		}
-	}
-	
-	//\___________________ Cette icone realisait peut-etre le max des hauteurs, comme on l'enleve on recalcule ce max.
-	Icon *pOtherIcon;
-	if (icon->fHeight >= pDock->iMaxIconHeight)
-	{
-		pDock->iMaxIconHeight = 0;
-		for (ic = pDock->icons; ic != NULL; ic = ic->next)
-		{
-			pOtherIcon = ic->data;
-			if (! CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pOtherIcon))
-			{
-				pDock->iMaxIconHeight = MAX (pDock->iMaxIconHeight, pOtherIcon->fHeight);
-				if (pOtherIcon->fHeight == icon->fHeight)  // on sait qu'on n'ira pas plus haut.
-					break;
-			}
-		}
-	}
-
-	//\___________________ On la remet a la taille normale en vue d'une reinsertion quelque part.
-	icon->fWidth /= pDock->container.fRatio;
-	icon->fHeight /= pDock->container.fRatio;
-	
-	//\___________________ On prevoit le redessin de l'icone pointant sur le sous-dock.
-	if (pDock->iRefCount != 0 && ! CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon))
-	{
-		cairo_dock_trigger_redraw_subdock_content (pDock);
-	}
-	
-	//\___________________ On prevoit la destruction du dock si c'est un dock principal qui devient vide.
-	if (pDock->iRefCount == 0 && pDock->icons == NULL && ! pDock->bIsMainDock)  // on supprime les docks principaux vides.
-	{
-		if (pDock->iSidDestroyEmptyDock == 0)
-			pDock->iSidDestroyEmptyDock = g_idle_add ((GSourceFunc) _destroy_empty_dock, pDock);  // on ne passe pas le nom du dock en parametre, car le dock peut se faire renommer (improbable, mais bon).
-	}
-	else
-	{
-		cairo_dock_trigger_update_dock_size (pDock);
-	}
-	
-	//\___________________ Notify everybody.
-	icon->fInsertRemoveFactor = 0.;
-	cairo_dock_notify_on_object (pDock, NOTIFICATION_REMOVE_ICON, icon, pDock);
-	
-	return TRUE;
-}
-void cairo_dock_remove_icon_from_dock_full (CairoDock *pDock, Icon *icon, gboolean bCheckUnusedSeparator)
-{
-	g_return_if_fail (icon != NULL);
-	
-	//\___________________ On detache l'icone du dock.
-	if (pDock != NULL)
-		cairo_dock_detach_icon_from_dock_full (icon, pDock, bCheckUnusedSeparator);  // on le fait maintenant, pour que l'icone ait son type correct, et ne soit pas confondue avec un separateur
-	
-	//\___________________ On supprime l'icone du theme courant.
-	if (icon->iface.on_delete)
-	{
-		gboolean r = icon->iface.on_delete (icon);
-		if (r)
-			cairo_dock_mark_current_theme_as_modified (TRUE);
-	}
-}
-
-
-void cairo_dock_remove_automatic_separators (CairoDock *pDock)
-{
-	//g_print ("%s ()\n", __func__);
-	Icon *icon;
-	GList *ic = pDock->icons, *next_ic;
-	while (ic != NULL)
-	{
-		icon = ic->data;
-		next_ic = ic->next;  // si l'icone se fait enlever, on perdrait le fil.
-		if (CAIRO_DOCK_IS_AUTOMATIC_SEPARATOR (icon))
-		{
-			cairo_dock_remove_one_icon_from_dock (pDock, icon);
-			cairo_dock_free_icon (icon);
-		}
-		ic = next_ic;
-	}
-}
-
-void cairo_dock_insert_automatic_separators_in_dock (CairoDock *pDock)
-{
-	//g_print ("%s ()\n", __func__);
-	Icon *icon, *pNextIcon;
-	GList *ic;
-	for (ic = pDock->icons; ic != NULL; ic = ic->next)
-	{
-		icon = ic->data;
-		if (! CAIRO_DOCK_IS_AUTOMATIC_SEPARATOR (icon))
-		{
-			if (ic->next != NULL)
-			{
-				pNextIcon = ic->next->data;
-				if (! CAIRO_DOCK_IS_AUTOMATIC_SEPARATOR (pNextIcon) && icon->iGroup != pNextIcon->iGroup)
-				{
-					int iSeparatorGroup = cairo_dock_get_icon_order (icon) +
-						(cairo_dock_get_icon_order (icon) == cairo_dock_get_icon_order (pNextIcon) ? 0 : 1);  // for separators, group = order.
-					double fOrder = (cairo_dock_get_icon_order (icon) == cairo_dock_get_icon_order (pNextIcon) ? (icon->fOrder + pNextIcon->fOrder) / 2 : 0);
-					cairo_dock_insert_automatic_separator_in_dock (iSeparatorGroup, fOrder, icon->cParentDockName, pDock);
-				}
-			}
-		}
-	}
-}
-
-
-Icon *cairo_dock_add_new_launcher_by_uri_or_type (const gchar *cExternDesktopFileURI, CairoDockDesktopFileType iType, CairoDock *pReceivingDock, double fOrder)
-{
-	//\_________________ On ajoute un fichier desktop dans le repertoire des lanceurs du theme courant.
-	GError *erreur = NULL;
-	const gchar *cDockName = cairo_dock_search_dock_name (pReceivingDock);
-	if (fOrder == CAIRO_DOCK_LAST_ORDER && pReceivingDock != NULL)
-	{
-		Icon *pLastIcon = cairo_dock_get_last_launcher (pReceivingDock->icons);
-		if (pLastIcon != NULL)
-			fOrder = pLastIcon->fOrder + 1;
-		else
-			fOrder = 1;
-	}
-	gchar *cNewDesktopFileName;
-	if (cExternDesktopFileURI != NULL)
-		cNewDesktopFileName = cairo_dock_add_desktop_file_from_uri (cExternDesktopFileURI, cDockName, fOrder, &erreur);
-	else
-		cNewDesktopFileName = cairo_dock_add_desktop_file_from_type (iType, cDockName, fOrder, &erreur);
-	if (erreur != NULL)
-	{
-		cd_warning (erreur->message);
-		g_error_free (erreur);
-		return NULL;
-	}
-	
-	//\_________________ On verifie ici l'unicite du sous-dock.
-	if (iType == CAIRO_DOCK_DESKTOP_FILE_FOR_CONTAINER && cExternDesktopFileURI == NULL)
-	{
-		
-	}
-	
-	//\_________________ On charge ce nouveau lanceur.
-	Icon *pNewIcon = NULL;
-	if (cNewDesktopFileName != NULL)
-	{
-		cairo_dock_mark_current_theme_as_modified (TRUE);
-
-		pNewIcon = cairo_dock_create_icon_from_desktop_file (cNewDesktopFileName);
-		g_free (cNewDesktopFileName);
-
-		if (pNewIcon != NULL)
-		{
-			cairo_dock_insert_icon_in_dock (pNewIcon, pReceivingDock, CAIRO_DOCK_ANIMATE_ICON);
-			
-			if (pNewIcon->pSubDock != NULL)
-				cairo_dock_trigger_redraw_subdock_content (pNewIcon->pSubDock);
-		}
-	}
-	return pNewIcon;
-}
-
-
-void cairo_dock_remove_icons_from_dock (CairoDock *pDock, CairoDock *pReceivingDock, const gchar *cReceivingDockName)
-{
-	GList *pIconsList = pDock->icons;
-	pDock->icons = NULL;
-	Icon *icon;
-	GList *ic;
-	gchar *cDesktopFilePath;
-	for (ic = pIconsList; ic != NULL; ic = ic->next)
-	{
-		icon = ic->data;
-
-		if (icon->pSubDock != NULL)
-		{
-			cairo_dock_remove_icons_from_dock (icon->pSubDock, pReceivingDock, cReceivingDockName);
-		}
-
-		if (pReceivingDock == NULL || cReceivingDockName == NULL)  // alors on les jete.
-		{
-			if (icon->iface.on_delete)
-				icon->iface.on_delete (icon);  // efface le .desktop / ecrit les modules actifs.
-			
-			if (CAIRO_DOCK_IS_APPLET (icon))
-			{
-				cairo_dock_update_icon_s_container_name (icon, CAIRO_DOCK_MAIN_DOCK_NAME);  // on decide de les remettre dans le dock principal la prochaine fois qu'ils seront actives.
-			}
-			cairo_dock_free_icon (icon);  // de-instancie l'applet.
-		}
-		else  // on les re-attribue au dock receveur.
-		{
-			cairo_dock_update_icon_s_container_name (icon, cReceivingDockName);
-			
-			icon->fWidth /= pDock->container.fRatio;  // optimization: no need to detach the icon, we just steal all of them.
-			icon->fHeight /= pDock->container.fRatio;
-			
-			cd_debug (" on re-attribue %s au dock %s", icon->cName, icon->cParentDockName);
-			cairo_dock_insert_icon_in_dock (icon, pReceivingDock, CAIRO_DOCK_ANIMATE_ICON);
-			
-			if (CAIRO_DOCK_IS_APPLET (icon))
-			{
-				icon->pModuleInstance->pContainer = CAIRO_CONTAINER (pReceivingDock);  // astuce pour ne pas avoir a recharger le fichier de conf ^_^
-				icon->pModuleInstance->pDock = pReceivingDock;
-				cairo_dock_reload_module_instance (icon->pModuleInstance, FALSE);
-			}
-		}
-	}
-
-	g_list_free (pIconsList);
-}
-
-
-void cairo_dock_reload_buffers_in_dock (CairoDock *pDock, gboolean bRecursive, gboolean bUpdateIconSize)
-{
-	//g_print ("************%s (%d, %d)\n", __func__, pDock->bIsMainDock, bRecursive);
-	if (bUpdateIconSize && pDock->bGlobalIconSize)
-		pDock->iIconSize = myIconsParam.iIconWidth;
-	
-	// for each icon, reload its buffer (size may change).
-	Icon* icon;
-	GList* ic;
-	for (ic = pDock->icons; ic != NULL; ic = ic->next)
-	{
-		icon = ic->data;
-		
-		if (CAIRO_DOCK_IS_APPLET (icon))  // for an applet, we need to let the module know that the size or the theme has changed, so that it can reload its private buffers.
-		{
-			cairo_dock_reload_module_instance (icon->pModuleInstance, FALSE);
-		}
-		else
-		{
-			if (bUpdateIconSize)
-			{
-				icon->fWidth = icon->fHeight = 0;  // no request
-				icon->iImageWidth = icon->iImageHeight = 0;
-				cairo_dock_set_icon_size_in_dock (pDock, icon);
-			}
-			cairo_dock_trigger_load_icon_buffers (icon);
-		}
-		
-		if (bRecursive && icon->pSubDock != NULL)  // we handle the sub-dock for applets too, so that they don't need to care.
-		{
-			///cairo_dock_synchronize_one_sub_dock_orientation (icon->pSubDock, pDock, FALSE);  /// should probably not be here.
-			if (bUpdateIconSize)
-				icon->pSubDock->iIconSize = pDock->iIconSize;
-			cairo_dock_reload_buffers_in_dock (icon->pSubDock, bRecursive, bUpdateIconSize);
-		}
-	}
-	
-	if (bUpdateIconSize)
-	{
-		cairo_dock_update_dock_size (pDock);
-		cairo_dock_calculate_dock_icons (pDock);
-
-		cairo_dock_move_resize_dock (pDock);
-		if (pDock->iVisibility == CAIRO_DOCK_VISI_RESERVE)  // la position/taille a change, il faut refaire la reservation.
-			cairo_dock_reserve_space_for_dock (pDock, TRUE);
-		gtk_widget_queue_draw (pDock->container.pWidget);
-	}
-}
-
-
-void cairo_dock_set_icon_size_in_dock (CairoDock *pDock, Icon *icon)
-{
-	if (pDock->pRenderer && pDock->pRenderer->set_icon_size)
-	{
-		pDock->pRenderer->set_icon_size (icon, pDock);
-	}
-	else
-	{
-		int wi, hi;
-		if (pDock->iIconSize != 0)
-		{
-			wi = hi = pDock->iIconSize;
-		}
-		else  // same size as main dock.
-		{
-			wi = myIconsParam.iIconWidth;
-			hi = myIconsParam.iIconHeight;
-		}
-		//g_print (" size: %d => %dx%d\n", pDock->iIconSize, wi, hi);
-		double fMaxScale = cairo_dock_get_max_scale (pDock);
-		
-		// set the visible size at rest.
-		if (CAIRO_DOCK_ICON_TYPE_IS_APPLET (icon))  // for applets, consider (fWidth,fHeight) as a requested size, if not 0.
-		{
-			//g_print ("%s (%s, %.1fx%.1f\n", __func__, icon->pModuleInstance->pModule->pVisitCard->cModuleName, icon->fWidth, icon->fHeight);
-			if (icon->iImageWidth != 0)
-			{
-				if (pDock->container.bIsHorizontal)
-					icon->fWidth = icon->iImageWidth / fMaxScale;
-				else
-					icon->fHeight = icon->iImageWidth / fMaxScale;
-			}
-			if (icon->iImageHeight != 0)
-			{
-				if (pDock->container.bIsHorizontal)
-					icon->fHeight = icon->iImageHeight / fMaxScale;
-				else
-					icon->fWidth = icon->iImageHeight / fMaxScale;
-			}
-			if (icon->fWidth == 0)
-				icon->fWidth = wi;
-			if (icon->fHeight == 0 || icon->fHeight > hi)
-				icon->fHeight = hi;
-		}
-		else if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon))  // separators have their own size.
-		{
-			icon->fWidth = myIconsParam.iSeparatorWidth;
-			icon->fHeight = MIN (myIconsParam.iSeparatorHeight, hi);
-		}
-		else  // any other icon use the global size
-		{
-			icon->fWidth = wi;
-			icon->fHeight = hi;
-		}
-		
-		// texture size can be deduced then.
-		if (pDock->container.bIsHorizontal
-		|| (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (icon) && myIconsParam.bRevolveSeparator))
-		{
-			icon->iImageWidth = icon->fWidth * fMaxScale;
-			icon->iImageHeight = icon->fHeight * fMaxScale;
-		}
-		else
-		{
-			icon->iImageWidth = icon->fHeight * fMaxScale;
-			icon->iImageHeight = icon->fWidth * fMaxScale;
-		}
-	}
-	icon->fWidth *= pDock->container.fRatio;
-	icon->fHeight *= pDock->container.fRatio;
-}
-
-
-void cairo_dock_create_redirect_texture_for_dock (CairoDock *pDock)
-{
-	if (! g_openglConfig.bFboAvailable)
-		return ;
-	if (pDock->iRedirectedTexture == 0)
-	{
-		pDock->iRedirectedTexture = cairo_dock_create_texture_from_raw_data (NULL,
-			(pDock->container.bIsHorizontal ? pDock->container.iWidth : pDock->container.iHeight),
-			(pDock->container.bIsHorizontal ? pDock->container.iHeight : pDock->container.iWidth));
-	}
-	if (pDock->iFboId == 0)
-		glGenFramebuffersEXT(1, &pDock->iFboId);
-}

=== removed directory '.pc/02-bzr_fixed_compilation_error.patch'
=== removed directory '.pc/02-bzr_fixed_compilation_error.patch/src'
=== removed directory '.pc/02-bzr_fixed_compilation_error.patch/src/gldit'
=== removed file '.pc/02-bzr_fixed_compilation_error.patch/src/gldit/cairo-dock-keybinder.h'
--- .pc/02-bzr_fixed_compilation_error.patch/src/gldit/cairo-dock-keybinder.h	2012-04-25 01:29:46 +0000
+++ .pc/02-bzr_fixed_compilation_error.patch/src/gldit/cairo-dock-keybinder.h	1970-01-01 00:00:00 +0000
@@ -1,152 +0,0 @@
-/*
-* cairo-dock-keybinder.h
-* This file is a part of the Cairo-Dock project
-* Login : <[e-mail]>
-* Started on  Thu Jan 31 03:57:17 2008 Cedric GESTES
-* $Id$
-*
-* Author(s)
-*  - Cedric GESTES <[e-mail]>
-*  - Havoc Pennington
-*  - Tim Janik
-*
-* Copyright : (C) 2008 Cedric GESTES
-* 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/>.
-*
-* imported from tomboy_key_binder.h
-*/
-
-#ifndef __CD_KEY_BINDER_H__
-#define __CD_KEY_BINDER_H__
-
-#include <glib/gtypes.h>
-#include "cairo-dock-struct.h"
-#include "cairo-dock-manager.h"
-
-G_BEGIN_DECLS
-
-/**
-*@file cairo-dock-keybinder.h This class contains functions to easily bind a keyboard shortcut to an action. These shortkeys are defined globally in your session, that is to say they will be effective whatever window has the focus.
-* Shortkeys are of the form &lt;alt&gt;F1 or &lt;ctrl&gt;&lt;shift&gt;s.
-* 
-* You bind an action to a shortkey with \ref cd_keybinder_bind, and unbind it with \ref cd_keybinder_unbind.
-* To update a binding (on shortkey or description chenge, or just to re-grab it), use \ref cd_keybinder_rebind.
-*/
-
-
-/// Definition of a callback, called when a shortcut is pressed by the user.
-typedef void (* CDBindkeyHandler) (const gchar *keystring, gpointer user_data);
-
-struct _CairoKeyBinding {
-	gchar            *keystring;
-	CDBindkeyHandler  handler;
-	gpointer          user_data;
-	guint             keycode;
-	guint             modifiers;
-	gboolean          bSuccess;
-	gchar            *cDemander;
-	gchar            *cDescription;
-	gchar            *cIconFilePath;
-	gchar            *cConfFilePath;
-	gchar            *cGroupName;
-	gchar            *cKeyName;
-} ;
-
-
-typedef struct _CairoShortkeysManager CairoShortkeysManager;
-
-#ifndef _MANAGER_DEF_
-extern CairoShortkeysManager myShortkeysMgr;
-#endif
-
-// params
-
-// manager
-struct _CairoShortkeysManager {
-	GldiManager mgr;
-	gboolean (*bind) (const gchar *keystring, CDBindkeyHandler handler, gpointer user_data);
-	void (*unbind) (const gchar *keystring, CDBindkeyHandler handler);
-	gboolean (*trigger_shortkey) (const gchar *cKeyString);
-	} ;
-
-// signals
-typedef enum {
-	NOTIFICATION_SHORTKEY_ADDED = NB_NOTIFICATIONS_OBJECT,
-	NOTIFICATION_SHORTKEY_REMOVED,
-	NOTIFICATION_SHORTKEY_CHANGED,
-	NB_NOTIFICATIONS_SHORTKEYS
-	} CairoShortkeysNotifications;
-
-
-/** Bind a shortkey to an action. Unbind it when you don't want it anymore, or when 'user_data' is freed.
- * @param keystring a shortcut.
- * @param cDemander the actor making the demand
- * @param cDescription a short description of the action
- * @param cIconFilePath an icon that represents the demander
- * @param cConfFilePath conf file where the shortkey stored
- * @param cGroupName group name where it's stored in the conf file
- * @param cKeyName key name where it's stored in the conf file
- * @param handler function called when the shortkey is pressed by the user
- * @param user_data data passed to the callback
- * @return the key binding
-*/
-CairoKeyBinding *cd_keybinder_bind (const gchar *keystring,
-	const gchar *cDemander,
-	const gchar *cDescription,
-	const gchar *cIconFilePath,
-	const gchar *cConfFilePath,
-	const gchar *cGroupName,
-	const gchar *cKeyName,
-	CDBindkeyHandler handler,
-	gpointer user_data);
-
-/** Says if the shortkey of a key binding could be grabbed.
- * @param binding a key binding.
- * @return TRUE iif the shortkey has been successfuly grabbed by the key binding.
-*/
-#define cd_keybinder_could_grab(binding) ((binding)->bSuccess)
-
-/** Unbind a shortkey. The binding is destroyed.
- * @param binding a key binding.
-*/
-void cd_keybinder_unbind (CairoKeyBinding *binding);
-
-
-/** Rebind a shortkey to a new one. If the shortkey is the same, don't re-bind it.
- * @param binding a key binding.
- * @param .cNewKeyString the new shortkey
- * @param .cNewDescription the new description, or NULL to keep the current one.
- * @return TRUE on success
-*/
-gboolean cd_keybinder_rebind (CairoKeyBinding *binding,
-	const gchar *cNewKeyString,
-	const gchar *cNewDescription);
-
-
-void cd_keybinder_foreach (GFunc pCallback, gpointer data);
-
-/** Trigger the given shortkey. It will be as if the user effectively pressed the shortkey on its keyboard. It uses the 'XTest' X extension.
- * @param cKeyString a shortkey.
- * @return TRUE if success.
-*/
-gboolean cairo_dock_trigger_shortkey (const gchar *cKeyString);
-
-
-void gldi_register_shortkeys_manager (void);
-
-G_END_DECLS
-
-#endif /* __CD_KEY_BINDER_H__ */
-

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2012-04-25 01:29:46 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-02-bzr_fixed_compilation_error.patch
-01-bzr_dock-s_menu.patch

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-04-16 17:57:58 +0000
+++ CMakeLists.txt	2012-06-19 14:00:30 +0000
@@ -11,7 +11,7 @@
 ########### project ###############
 
 project ("cairo-dock")
-set (VERSION "3.0.0")
+set (VERSION "3.0.2")
 
 add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration -Wstrict-prototypes) # removed for stable versions: -Wstrict-prototypes #-Wunreachable-code -Wno-unused-parameter -Wall 
 if (NOT ${CMAKE_BUILD_TYPE})
@@ -22,6 +22,11 @@
 add_definitions (-DCAIRO_DOCK_ICON="cairo-dock.svg")
 add_definitions (-DCAIRO_DOCK_LOGO="cairo-dock-logo.png")
 add_definitions (-DCAIRO_DOCK_DATA_DIR="cairo-dock")
+if (NOT "${force-icon-in-menus}" STREQUAL "no")  # we believe that not showing icons in the menus by default is a terrible idea; unfortunately, it's not easily undoable for an end-user; so until this is fixed by a big player (Gnome, Ubuntu or other), we'll force the display, unless "-Dforce-icon-in-menus=yes" is provided in the cmake command.
+	add_definitions (-DCAIRO_DOCK_FORCE_ICON_IN_MENUS=1)
+else()
+	add_definitions (-DCAIRO_DOCK_FORCE_ICON_IN_MENUS=0)
+endif()
 add_custom_target (uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
 ############ sources tarball ############

=== added file 'debian/cairo-dock-data.links'
--- debian/cairo-dock-data.links	1970-01-01 00:00:00 +0000
+++ debian/cairo-dock-data.links	2012-06-19 14:00:30 +0000
@@ -0,0 +1,2 @@
+usr/share/man/man1/cairo-dock.1.gz usr/share/man/man1/cairo-dock-package-theme.1.gz
+usr/share/man/man1/cairo-dock.1.gz usr/share/man/man1/cairo-dock-session.1.gz

=== removed file 'debian/cairo-dock-data.lintian-overrides'
--- debian/cairo-dock-data.lintian-overrides	2011-10-11 10:53:26 +0000
+++ debian/cairo-dock-data.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# Cairo-Dock uses custom scripts
-cairo-dock-data: binary-without-manpage

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-25 01:29:46 +0000
+++ debian/changelog	2012-06-19 14:00:30 +0000
@@ -1,3 +1,46 @@
+cairo-dock (3.0.2-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream bug-fix release. (LP: #1014801)
+  * Upstream ChangeLog (3.0.0 -> 3.0.1):
+   - Dialogs: fixed a bug where the dock could auto-hide when a modal dialog
+      was raised
+   - Dialog: fixed a crash with gcc-4.7: the local variable can be corrupted
+      due to optimisations
+   - Fixed a bug where the dock didn't accept clicks when the mouse touches
+      the screen edge (with auto-hide)
+   - Added a compilation option to not force the display of icons in menus
+      (design request but disable by default)
+   - Fixed a bug where the hidden dock background color was not updated
+      properly
+   - Class-Manager: fixed a bug with Windows applications whose name is in
+      upper case (.EXE)
+   - GUI: use cairo_dock_get_xwindow_class to link a programm with a launcher
+   - French translations: fixed 2 small errors
+  * Upstream ChangeLog (3.0.1 -> 3.0.2):
+   - Main GUI: Fixed a crash when hovering group buttons too quickly
+   - Main GUI: The dialog and preview didn't appear when hovering the button
+   - Accelerators: On recent distro, 'Control' key is now called 'Primary'
+   - Icon Mgr: Added a mutex because of occasional crashes with
+      gtk_icon_theme_lookup_icon
+   - Icon Mgr: Don't call a 'change-icon' callback when clicking or scrolling
+      on an icon, and trigger an unneeded animation on the icon
+   - Dock Mgr: Avoid emitting an 'enter' event when not needed
+   - Class Mgr: Fixed 2 typos (special case for kdesu and not kdes)
+   - Class Mgr: Remove launching options (%U) in quick-list Exec command
+      (LP: #1002691)
+   - Dialogues: Prevent closing the dialog unexpectedly when clicking on it,
+      if the click is actually inside the interactive widget
+   - Background: When set to 'always visible', applets' background couldn't
+      be turned off
+   - Added a workaround for the Unity-panel which has a wrong window type
+   - po: Updated translations
+  * debian/patches:
+   - Removed all patches (now in upstream)
+  * debian/cairo-dock-data:
+   - Removed a lintian warning by added symlinks (binary-without-manpage)
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Mon, 18 Jun 2012 20:01:30 +0200
+
 cairo-dock (3.0.0.1-0ubuntu2) quantal; urgency=low
 
   * debian/patches/01-bzr_dock-s_menu.patch: don't hide the dock if it's raised

=== removed file 'debian/patches/01-bzr_dock-s_menu.patch'
--- debian/patches/01-bzr_dock-s_menu.patch	2012-04-25 01:29:46 +0000
+++ debian/patches/01-bzr_dock-s_menu.patch	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-## Description: Dock's menu: don't hide  the dock if it is raised and don't try to check if the mouse has left the dock if the menu is raised 
-## Origin/Author: Upstream (Fabrice Rey)
-## https://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-core/3.0.x/revision/1070
-
-Index: cairo-dock/src/gldit/cairo-dock-callbacks.c
-===================================================================
---- cairo-dock.orig/src/gldit/cairo-dock-callbacks.c	2012-04-16 18:03:45.645725000 +0200
-+++ cairo-dock/src/gldit/cairo-dock-callbacks.c	2012-04-24 02:34:27.416854701 +0200
-@@ -763,10 +763,10 @@
- 	{
- 		//g_print ("forced leave event: %d;%d\n", pDock->container.iMouseX, pDock->container.iMouseY);
- 	}
--	if (pEvent && !_mouse_is_really_outside(pDock))  // check that the mouse is really outside (only if the request comes from the Window Manager; this is to work around buggy WM like KWin).
-+	if (/**pEvent && */!_mouse_is_really_outside(pDock))  // check that the mouse is really outside (the request might not come from the Window Manager, for instance if we deactivate the menu; this also works around buggy WM like KWin).
- 	{
- 		//g_print ("not really outside (%d;%d ; %d/%d)\n", pDock->container.iMouseX, pDock->container.iMouseY, pDock->iMaxDockHeight, pDock->iMinDockHeight);
--		if (pDock->iSidTestMouseOutside == 0 && pEvent)  // si l'action induit un changement de bureau, ou une appli qui bloque le focus (gksu), X envoit un signal de sortie alors qu'on est encore dans le dock, et donc n'en n'envoit plus lorsqu'on en sort reellement. On teste donc pendant qques secondes apres l'evenement.
-+		if (pDock->iSidTestMouseOutside == 0 && pEvent && ! pDock->bMenuVisible)  // si l'action induit un changement de bureau, ou une appli qui bloque le focus (gksu), X envoit un signal de sortie alors qu'on est encore dans le dock, et donc n'en n'envoit plus lorsqu'on en sort reellement. On teste donc pendant qques secondes apres l'evenement. C'est ausi vrai pour l'affichage d'un menu, mais comme on envoie nous-meme un signal de sortie lorsque le menu disparait, il est inutile de le faire ici.
- 		{
- 			//g_print ("start checking mouse\n");
- 			pDock->iSidTestMouseOutside = g_timeout_add (500, (GSourceFunc)_check_mouse_outside, pDock);
-@@ -1038,7 +1038,7 @@
- static gboolean _check_mouse_outside (CairoDock *pDock)  // ce test est principalement fait pour detecter les cas ou X nous envoit un signal leave errone alors qu'on est dedans (=> sortie refusee, bInside reste a TRUE), puis du coup ne nous en envoit pas de leave lorsqu'on quitte reellement le dock.
- {
- 	//g_print ("%s (%d, %d, %d)\n", __func__, pDock->bIsShrinkingDown, pDock->iMagnitudeIndex, pDock->container.bInside);
--	if (pDock->bIsShrinkingDown || pDock->iMagnitudeIndex == 0 || ! pDock->container.bInside)  // cas triviaux : si le dock est deja retrecit, ou qu'on est deja plus dedans, on peut quitter.
-+	if (pDock->bIsShrinkingDown || pDock->iMagnitudeIndex == 0 || ! pDock->container.bInside)  // trivial cases : if the dock has already shrunk, or we're not inside any more, we can quit the loop.
- 	{
- 		pDock->iSidTestMouseOutside = 0;
- 		return FALSE;
-Index: cairo-dock/src/gldit/cairo-dock-dock-factory.c
-===================================================================
---- cairo-dock.orig/src/gldit/cairo-dock-dock-factory.c	2012-04-16 18:03:45.645725000 +0200
-+++ cairo-dock/src/gldit/cairo-dock-dock-factory.c	2012-04-24 02:34:27.416854701 +0200
-@@ -443,8 +443,11 @@
- {
- 	//g_print ("\n+++ %s ()\n\n", __func__);
- 	g_return_if_fail (CAIRO_DOCK_IS_DOCK (pDock));
--	pDock->bMenuVisible = FALSE;
--	cairo_dock_emit_leave_signal (CAIRO_CONTAINER (pDock));
-+	if (pDock->bMenuVisible)  // don't send the signal if the menu was already deactivated.
-+	{
-+		pDock->bMenuVisible = FALSE;
-+		cairo_dock_emit_leave_signal (CAIRO_CONTAINER (pDock));
-+	}
- }
- static void _on_menu_destroyed (GtkWidget *menu, CairoDock *pDock)
- {

=== removed file 'debian/patches/02-bzr_fixed_compilation_error.patch'
--- debian/patches/02-bzr_fixed_compilation_error.patch	2012-04-25 01:29:46 +0000
+++ debian/patches/02-bzr_fixed_compilation_error.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-## Description: ixed a compilation error with GLib >= 2.33
-## Origin/Author: Upstream (Fabrice Rey)
-## https://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-core/cairo-dock/revision/1073
-
-Index: cairo-dock/src/gldit/cairo-dock-keybinder.h
-===================================================================
---- cairo-dock.orig/src/gldit/cairo-dock-keybinder.h	2012-06-04 18:22:56.544276402 +0200
-+++ cairo-dock/src/gldit/cairo-dock-keybinder.h	2012-06-04 18:23:13.528276165 +0200
-@@ -31,7 +31,6 @@
- #ifndef __CD_KEY_BINDER_H__
- #define __CD_KEY_BINDER_H__
- 
--#include <glib/gtypes.h>
- #include "cairo-dock-struct.h"
- #include "cairo-dock-manager.h"
- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-04-25 01:29:46 +0000
+++ debian/patches/series	2012-06-19 14:00:30 +0000
@@ -1,2 +0,0 @@
-02-bzr_fixed_compilation_error.patch
-01-bzr_dock-s_menu.patch

=== modified file 'po/ar.po'
--- po/ar.po	2012-04-16 16:03:43 +0000
+++ po/ar.po	2012-06-19 14:00:30 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:22+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:49+0000\n"
 "Last-Translator: Matthieu Baerts <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:20+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:37+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: ar\n"
 

=== modified file 'po/be.po'
--- po/be.po	2012-04-16 16:03:43 +0000
+++ po/be.po	2012-06-19 14:00:30 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-04-01 14:07+0000\n"
-"Last-Translator: Vitaly Danilovich <Unknown>\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:54+0000\n"
+"Last-Translator: Matthieu Baerts <[e-mail]>\n"
 "Language-Team: Belarusian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:20+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:38+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: be\n"
 
@@ -420,6 +420,8 @@
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Fabounet https://launchpad.net/~fabounet03\n"
+"  Matthieu Baerts https://launchpad.net/~matttbe\n"
 "  Vitaly Danilovich https://launchpad.net/~danvyr"
 
 #: ../src/cairo-dock-menu.c:285

=== modified file 'po/bn.po'
--- po/bn.po	2012-04-16 16:03:43 +0000
+++ po/bn.po	2012-06-19 14:00:30 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:28+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:51+0000\n"
 "Last-Translator: Fabounet <[e-mail]>\n"
 "Language-Team: Bengali <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:20+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:38+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: bn\n"
 

=== modified file 'po/ca.po'
--- po/ca.po	2012-04-16 16:03:43 +0000
+++ po/ca.po	2012-06-19 14:00:30 +0000
@@ -8,14 +8,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:42+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:52+0000\n"
 "Last-Translator: Fabounet <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:38+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: ca\n"
 

=== modified file 'po/cs.po'
--- po/cs.po	2012-04-16 16:03:43 +0000
+++ po/cs.po	2012-06-19 14:00:30 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
 "PO-Revision-Date: 2012-03-21 03:01+0000\n"
 "Last-Translator: Michal Mlejnek <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:38+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: cs\n"
 

=== modified file 'po/cy.po'
--- po/cy.po	2012-04-16 16:03:43 +0000
+++ po/cy.po	2012-06-19 14:00:30 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 12:57+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:53+0000\n"
 "Last-Translator: Fabounet <[e-mail]>\n"
 "Language-Team: Welsh <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:23+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:40+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: cy\n"
 

=== modified file 'po/de.po'
--- po/de.po	2012-04-16 16:03:43 +0000
+++ po/de.po	2012-06-19 14:00:30 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-04-10 11:01+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:49+0000\n"
 "Last-Translator: Daniel Winzen <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:38+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: de\n"
 

=== modified file 'po/el.po'
--- po/el.po	2012-04-16 16:03:43 +0000
+++ po/el.po	2012-06-19 14:00:30 +0000
@@ -8,14 +8,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock_el\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:29+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:54+0000\n"
 "Last-Translator: Michael Kotsarinis <[e-mail]>\n"
 "Language-Team: Greek\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:38+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "X-Poedit-Country: France\n"
 "Language: \n"

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2012-04-16 16:03:43 +0000
+++ po/en_GB.po	2012-06-19 14:00:30 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:35+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:54+0000\n"
 "Last-Translator: Philippe Le Toquin <[e-mail]>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:23+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:40+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: \n"
 

=== modified file 'po/eo.po'
--- po/eo.po	2012-04-16 16:03:43 +0000
+++ po/eo.po	2012-06-19 14:00:30 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 12:51+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:53+0000\n"
 "Last-Translator: Matthieu Baerts <[e-mail]>\n"
 "Language-Team: Esperanto <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:38+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: eo\n"
 

=== modified file 'po/es.po'
--- po/es.po	2012-04-16 16:03:43 +0000
+++ po/es.po	2012-06-19 14:00:30 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: 1.6.2\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 12:53+0000\n"
-"Last-Translator: Fabounet <[e-mail]>\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-06-12 06:24+0000\n"
+"Last-Translator: Morgus <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:22+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-06-13 04:35+0000\n"
+"X-Generator: Launchpad (build 15389)\n"
 "Language: \n"
 "X-Poedit-Language: Spanish\n"
 
@@ -30,7 +30,7 @@
 
 #: ../src/cairo-dock-gui-commons.c:369
 msgid "Configure this applet"
-msgstr "Configurar esta mini-aplicación"
+msgstr "Configurar esta miniaplicación"
 
 #: ../src/cairo-dock-gui-commons.c:406 ../src/cairo-dock-gui-main.c:131
 msgid "Files"
@@ -187,7 +187,7 @@
 
 #: ../src/cairo-dock-gui-main.c:1541
 msgid "Applets can be displayed on your desktop as widgets."
-msgstr "Las mini-aplicaciones pueden situarse en el escritorio como objetos."
+msgstr "Las miniaplicaciones pueden situarse en el escritorio como objetos."
 
 #: ../src/cairo-dock-gui-main.c:1542 ../data/messages:89 ../data/messages:989
 msgid "Desklets"
@@ -313,7 +313,7 @@
 msgid ""
 "Click on an applet in order to have a preview and a description for it."
 msgstr ""
-"Haga clic sobre una mini-aplicación para tener una vista previa y una "
+"Pulse sobre una miniaplicación para ver una previsualización y una "
 "descripción de ella."
 
 #: ../src/cairo-dock-gui-simple.c:823
@@ -322,7 +322,7 @@
 
 #: ../src/cairo-dock-gui-simple.c:825 ../data/messages:485
 msgid "On click:"
-msgstr "Al hacer clic:"
+msgstr "Al pulsar:"
 
 #: ../src/cairo-dock-gui-simple.c:898
 msgid ""
@@ -374,7 +374,7 @@
 
 #: ../src/cairo-dock-menu.c:219 ../src/cairo-dock-menu.c:953
 msgid "Get more applets!"
-msgstr "¡Obtener más complementos!"
+msgstr "Obtener más miniaplicaciones"
 
 #: ../src/cairo-dock-menu.c:223 ../src/cairo-dock-menu.c:229
 msgid "Donate"
@@ -422,18 +422,42 @@
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Adolfo Jayme Barrientos https://launchpad.net/~fitoschido\n"
+"  Alain Jerrel Bustamante-López https://launchpad.net/~zanmato\n"
 "  Albert Milian https://launchpad.net/~mln-gmx\n"
+"  Andrés Casals Jahnsen https://launchpad.net/~mxwig23\n"
+"  Carlos Joel Delgado Pizarro https://launchpad.net/~carlosj2585\n"
 "  Carlos Rosales https://launchpad.net/~chartre\n"
+"  Daniel O. Mondaca S. https://launchpad.net/~dnielm\n"
+"  David Portella https://launchpad.net/~dobled\n"
 "  DiegoJ https://launchpad.net/~diegojromerolopez\n"
+"  FaPrO https://launchpad.net/~fabro-pro\n"
 "  Fabounet https://launchpad.net/~fabounet03\n"
+"  Florencia Mincucci https://launchpad.net/~flomincucci\n"
+"  Gonzalo Testa https://launchpad.net/~gonzalogtesta\n"
+"  Harold https://launchpad.net/~sancospi\n"
 "  Joaquín Padilla Rivero https://launchpad.net/~logseman\n"
+"  José A. Fuentes Santiago https://launchpad.net/~joanfusan\n"
+"  José Luis Figueroa https://launchpad.net/~jolfig\n"
+"  Juan Eduardo Riva https://launchpad.net/~juaneduardoriva\n"
+"  Juan Pablo Marzetti https://launchpad.net/~yonpols\n"
+"  Kaede https://launchpad.net/~caramelo--asesino\n"
 "  Martín V. https://launchpad.net/~martinvukovic\n"
 "  Miguel Valdiri Badillo https://launchpad.net/~catastro1\n"
 "  Monkey https://launchpad.net/~monkey-libre\n"
 "  Morgus https://launchpad.net/~morgus\n"
+"  Patricio Gonzalez https://launchpad.net/~pagondel\n"
+"  Ricardo A. Hermosilla Carrillo https://launchpad.net/~rahermosillac\n"
 "  Sergio Meneses https://launchpad.net/~sergiomeneses\n"
+"  Stefano Prenna https://launchpad.net/~stefanoprenna\n"
+"  benjamin https://launchpad.net/~jesuisbenjamin\n"
 "  david cg https://launchpad.net/~dcardelleg\n"
-"  orvalius https://launchpad.net/~orvalius"
+"  hoortiz https://launchpad.net/~hoortiz\n"
+"  hug0 https://launchpad.net/~hug0\n"
+"  orvalius https://launchpad.net/~orvalius\n"
+"  polkillas https://launchpad.net/~paulsanzcalvo\n"
+"  rubioo https://launchpad.net/~rubioo\n"
+"  sebikul https://launchpad.net/~sebikul"
 
 #: ../src/cairo-dock-menu.c:285
 msgid "Support"
@@ -487,9 +511,9 @@
 "Now move some launchers or applets into it by right-clicking on the icon -> "
 "move to another dock"
 msgstr ""
-"El nuevo lanzador ha sido creado.\n"
-"Ahora mueva algunos lanzadores o complementos dentro haciendo clic derecho "
-"en el ícono -> mover a otro lanzador"
+"Se ha creado el nuevo dock.\n"
+"Ahora, mueva algunos lanzadores o miniaplicaciones a él pulsando con el "
+"botón derecho sobre un icono ‣ Mover a otro dock"
 
 #: ../src/cairo-dock-menu.c:567
 msgid "Add"
@@ -542,9 +566,9 @@
 "You can customize it by right-clicking on it -> cairo-dock -> configure this "
 "dock."
 msgstr ""
-"El nuevo lanzador ha sido creado.\n"
-"Puede personalizarlo haciendo clic derecho en él -> cairo-dock -> configurar "
-"este lanzador"
+"Se ha creado el nuevo dock.\n"
+"Puede personalizarlo pulsando con el botón derecho sobre él ‣ Cairo-Dock ‣ "
+"Configurar este dock"
 
 #: ../src/cairo-dock-menu.c:754
 msgid ""
@@ -558,7 +582,7 @@
 #, c-format
 msgid "You're about to remove this applet (%s) from the dock. Are you sure?"
 msgstr ""
-"Está apunto de remover la mini-aplicación (%s) de la barra. ¿Está seguro?"
+"Está a punto de quitar esta miniaplicación (%s) del dock. ¿Está seguro?"
 
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2007 Cairo-Dock project
@@ -572,7 +596,7 @@
 
 #: ../src/cairo-dock-menu.c:858
 msgid "Configure behaviour, appearance, and applets."
-msgstr "Configurar el comportamiento, la apariencia y aplicaciones."
+msgstr "Configurar comportamiento, apariencia y miniaplicaciones."
 
 #: ../src/cairo-dock-menu.c:863
 msgid "Configure this dock"
@@ -620,8 +644,8 @@
 msgid ""
 "Third-party applets provide integration with many programs, like Pidgin"
 msgstr ""
-"Los complementos de terceros proveen integración con otros programas, como "
-"Pidgin"
+"Las miniaplicaciones de terceros proporcionan integración con muchos "
+"programas, como Pidgin"
 
 #: ../src/cairo-dock-menu.c:961 ../src/help/applet-init.c:28
 #: ../src/help/applet-notifications.c:257
@@ -688,7 +712,7 @@
 
 #: ../src/cairo-dock-menu.c:1065
 msgid "Applet's handbook"
-msgstr "Guía de la mini-aplicación"
+msgstr "Guía de la miniaplicación"
 
 #: ../src/cairo-dock-menu.c:1110
 msgid "Pick up an image"
@@ -1189,13 +1213,11 @@
 "Hope you will enjoy this soft !\n"
 "  (you can now click on this dialog to close it)"
 msgstr ""
-"Bienvenido a Cairo-Dock !\n"
-"Esta aplicación esta aquí para ayudarlo a comenzar usando el dock; solo e "
-"click sobre el.\n"
-"Si tiene alguna pregunta/solicitud/observación, por favor visítenos en "
-"http://glx-dock.org.\n"
-"Esperamos disfrute este software!\n"
-"  (ahora se puede hacer click en este cuadro de dialogo para cerrarlo)"
+"¡Bienvenido a Cairo-Dock!\n"
+"Esta miniaplicación le ayudará a usar el dock, solo pulse sobre ella.\n"
+"Si tiene preguntas/pedidos/sugerencias, visítenos en http://glx-dock.org.\n"
+"Esperamos que disfrute este software.\n"
+"  (pulse en este diálogo para cerrarlo)"
 
 #: ../src/help/applet-composite.c:160
 msgid "Don't ask me any more"
@@ -1244,13 +1266,12 @@
 "Middle-click to open the configuration window.\n"
 "Right-click to access some troubleshooting actions."
 msgstr ""
-"Esta aplicación se hace para ayudarlo.\n"
-"Haga click en el icono para que aparezca consejos útiles acerca de las "
-"posibilidades de El Cairo-Dock.\n"
-"Haga click con el botón central del ratón para abrir la ventana de "
-"configuración.\n"
-"Haga click con el botón derecho para acceder a algunas de las acciones de "
-"solución de problemas."
+"Esta miniaplicación tiene como objetivo ayudarle.\n"
+"Pulse en su icono para mostrar consejos útiles sobre las posibilidades de "
+"Cairo-Dock.\n"
+"Pulse con el botón central para abrir la ventana de configuración.\n"
+"Pulse con el botón derecho para acceder a algunas acciones de solución de "
+"problemas."
 
 #: ../src/help/applet-notifications.c:247
 msgid "Open global settings"
@@ -1329,11 +1350,11 @@
 "Some applets let you bind a shortkey to an action, and decide which action "
 "sould be on middle-click."
 msgstr ""
-"La mayoría de los iconos del dock realizan varias acciones : la acción "
-"primaria con el botón izquierdo del ratón, una acción secundaria con el "
-"botón central y acciones adicionales con el botón derecho (en el menú).\n"
-"Algunos complementos permiten vincular una tecla de acceso rápido a una "
-"acción y decidir qué acción se realiza con el click central."
+"La mayoría de iconos en el dock tienen varias acciones: la acción primaria "
+"se ejecuta al pulsar, la acción secundaria al pulsar con el botón central, y "
+"acciones adicionales al pulsar con el botón derecho.\n"
+"Algunas miniaplicaciones le permiten vincular una tecla de acceso rápido a "
+"una acción y así decidir qué acción realizar al pulsar con el botón central."
 
 #: ../data/messages:7
 msgid "Adding features"
@@ -1349,16 +1370,16 @@
 "the \"More applets\" button (which will lead you to our applets web page) "
 "and then just drag-and-drop the link of an applet into your dock."
 msgstr ""
-"Cairo-Dock tiene muchos complementos. Los complementos son pequeñas "
-"aplicaciones dentro del dock, por ejemplo un reloj o un botón de finalizar "
-"sesión.\n"
-"Para habilitar nuevos complementos, ir a preferencias (click derecho -> "
-"Cairo-Dock -> configurar), ir a \"Componentes adicionales\", y marcar el "
-"complemento que se desea.\n"
-"Más complementos se pueden instalar fácilmente: en la ventana de "
-"configuración, click en el botón de \"Obtener más complementos\" (que nos "
-"redireccionará a nuestra página web de complementos) y luego simplemente "
-"arrastrar el enlace del complemento deseado al dock."
+"Cairo-Dock tiene muchas miniaplicaciones. Las miniaplicaciones son pequeños "
+"complementos que residen en el dock, por ejemplo un reloj o un botón para "
+"cerrar sesión.\n"
+"Para activar miniaplicaciones nuevas, abra la configuración (pulsación "
+"derecha ‣ Cairo-Dock ‣ Configurar), vaya a «Añadidos», y active la "
+"miniaplicación que desee.\n"
+"Puede instalar más miniaplicaciones fácilmente: en la ventana de "
+"configuración, pulse en «Más miniaplicaciones» (que le llevará a nuestro "
+"sitio web de miniaplicaciones) y luego arrastre el enlace de una "
+"miniaplicación y suéltelo en su dock."
 
 #: ../data/messages:13
 msgid "Adding a launcher"
@@ -1374,8 +1395,8 @@
 "Se puede añadir un lanzador arrastrándolo desde el menú de Aplicaciones y "
 "soltándolo dentro del dock. Una flecha animada aparecerá cuando se pueda "
 "soltar.\n"
-"Alternativamente, si una aplicación ya está abierta, se puede hacer click "
-"derecho en su icono y seleccionar \"Crear un lanzador\"."
+"Alternativamente, si una aplicación ya está abierta, puede pulsar su icono "
+"con el botón derecho y seleccionar «Crear un lanzador»."
 
 #: ../data/messages:17
 msgid "Removing a launcher"
@@ -1441,6 +1462,17 @@
 "of them to be used instead of the default icon theme, in the global config "
 "window."
 msgstr ""
+"Para un lanzador o miniaplicación:\n"
+"Abra la configuración de un icono y establezca la ruta a una imagen.\n"
+"- Para un icono de aplicación:\n"
+"Pulsación derecha sobre el icono ‣ «Otras acciones» ‣ «Establecer un icono "
+"personalizado», y elija una imagen. Para quitar la imagen personalizada, "
+"pulsación derecha sobre el icono ‣ «Otras acciones» ‣ «Quitar el icono "
+"personalizado».\n"
+"\n"
+"Si ha instalado temas de iconos en su equipo, también puede seleccionar uno "
+"de ellos para su uso en lugar del tema predeterminado, en la ventana de "
+"configuración global."
 
 #: ../data/messages:33
 msgid "Resizing icons"
@@ -1456,13 +1488,13 @@
 "Also, you can define the size of each applet independently in their own "
 "settings."
 msgstr ""
-"Se pueden hacer los iconos o el efecto de zoom mayor o menor. Aprir las "
-"opciones (click derecho -> Cairo-Dock -> configuración), e ir a Apariencia "
-"(o Iconos en modo avanzado).\n"
-"Notar que si hay demasiados iconos en el dock, serán emequeñecidos para "
-"caber en la pantalla.\n"
-"También se puede definir el tamaño de cada complemento independientemente en "
-"sus opciones."
+"Puede cambiar el tamaño de los iconos y el efecto de ampliación. Abra la "
+"configuración (pulsación derecha ‣ Cairo-Dock ‣ Configurar), y vaya a "
+"Apariencia (o Iconos en el modo avanzado).\n"
+"Note que si hay demasiados iconos en el dock, éstos se reducirán para caber "
+"en la pantalla.\n"
+"También puede definir el tamaño individual de cada miniaplicación en sus "
+"configuraciones."
 
 #: ../data/messages:37
 msgid "Separating icons"
@@ -1515,8 +1547,8 @@
 msgid ""
 "You can close a window by middle-clicking on its icon (or from the menu)."
 msgstr ""
-"Puedes cerrar una ventana haciendo click medio sobre el icono (o desde el "
-"menú)"
+"Puede cerrar una ventana haciendo una pulsación central sobre su icono (o "
+"desde el menú)."
 
 #: ../data/messages:51
 msgid "Minimizing / restauring a window"
@@ -1636,7 +1668,7 @@
 
 #: ../data/messages:91
 msgid "Placing applets on your desktop"
-msgstr "Colocando complementos en tu escritorio"
+msgstr "Colocar miniaplicaciones en su escritorio"
 
 #: ../data/messages:93
 msgid ""
@@ -1644,10 +1676,13 @@
 "wherever on your desktop.\n"
 "To detach an applet from the dock, simply drag and drop it outside the dock."
 msgstr ""
+"Las miniaplicaciones pueden posicionarse en «desklets» que son ventanas "
+"pequeñas que pueden ubicarse en cualquier lugar de su escritorio.\n"
+"Para separar una miniaplicación del dock, simplemente arrástrela fuera de él."
 
 #: ../data/messages:95
 msgid "Moving desklets"
-msgstr ""
+msgstr "Moviendo desklets"
 
 #: ../data/messages:97
 msgid ""
@@ -1683,6 +1718,9 @@
 "applet, go to Desklet, and select the decoration you want (you can provide "
 "your own one)."
 msgstr ""
+"Los «desklets» pueden tener decoraciones. Para cambiar eso, abra la "
+"configuración de la miniaplicación, vaya a Desklet, y seleccione la "
+"decoración que desee (puede proporcionar la suya propia)."
 
 #: ../data/messages:107
 msgid "Useful Features"
@@ -1701,6 +1739,12 @@
 "When a task has been or is going to be scheduled, the applet will warn you "
 "(15mn before the event, and also 1 day before in the case of an anniversary)."
 msgstr ""
+"Active la miniaplicación Reloj.\n"
+"Al pulsar sobre él se abrirá un calendario.\n"
+"Al pulsar dos veces sobre él se abrirá un editor de tareas. Allí puede "
+"añadir o quitar tareas.\n"
+"Cuando una tarea ha sido o será programada, la miniaplicación le avisará "
+"(15min antes del evento, o un día antes en caso de un aniversario)."
 
 #: ../data/messages:113
 msgid "Having a list of all windows"
@@ -1736,6 +1780,9 @@
 "Activate the Show-Desktop applet.\n"
 "Right-click on it -> \"change resolution\" -> select the one you want."
 msgstr ""
+"Active la miniaplicación Mostrar escritorio.\n"
+"Pulse con el botón derecho en él ‣ «Cambiar resolución» ‣ seleccione la que "
+"desee.t"
 
 #: ../data/messages:125
 msgid "Locking your session"
@@ -2083,15 +2130,16 @@
 #: ../data/messages:229
 msgid "The «netspeed» applet displays 0 even when I'm downloading something"
 msgstr ""
-"El applet «Redrapidez» expone 0 incluso cuando estoy trasvasando algo."
+"La miniaplicación «Velocidad de red» muestra 0 aun cuando estoy descargando "
+"algo"
 
 #: ../data/messages:231
 msgid ""
 "Tip: you can run several instances of this applet if you wish to monitor "
 "several interfaces."
 msgstr ""
-"Pista: se puede iniciar este aplique varias veces si se desea controlar "
-"varias interfaces."
+"Consejo: puede ejecutar varias instancias de esta miniaplicación si quiere "
+"monitorear varias interfaces."
 
 #: ../data/messages:233
 msgid ""
@@ -2169,7 +2217,7 @@
 msgid ""
 "If you wish to develop an applet, a complete documentation is available here."
 msgstr ""
-"Si usted desea desarrollar un applet, una documentación completa está "
+"Si quiere desarrollar una miniaplicación, hay una completa documentación "
 "disponible aquí."
 
 #: ../data/messages:255
@@ -2182,9 +2230,10 @@
 "or to interact with the dock in any kind of way, a full DBus API is "
 "described here."
 msgstr ""
-"Si quieres crear un appelt con Python, Perl o cualquier otro lenguaje,\n"
-"o si quieres interactura con el dock por cualquira manera, un API DBus "
-"complete esta describido ahí."
+"Si quiere desarrollar una miniaplicación con Python, Perl o cualquier otro "
+"lenguaje,\n"
+"o quiere interactuar con el dock de otra manera, aquí está descrita una API "
+"completa de DBus."
 
 #: ../data/messages:259
 msgid "DBus API"
@@ -2214,7 +2263,7 @@
 
 #: ../data/messages:273
 msgid "More applets available online!"
-msgstr ""
+msgstr "Más miniaplicaiones disponibles en línea"
 
 #: ../data/messages:275
 msgid "Cairo-Dock-Plug-ins-Extras"
@@ -2316,15 +2365,15 @@
 
 #: ../data/messages:315
 msgid "Set to 0 to use the default applet size"
-msgstr "Establezca a 0 para usar el tamaño de aplique predeterminado"
+msgstr "Configure a 0 para usar el tamaño predeterminado de miniaplicación"
 
 #: ../data/messages:317
 msgid "Desired icon size for this applet"
-msgstr "Tamaño de icono deseado para este aplique"
+msgstr "Tamaño de icono deseado para esta miniaplicación"
 
 #: ../data/messages:319
 msgid "Applet's Handbook"
-msgstr "Manual del aplique"
+msgstr "Manual de la miniaplicación"
 
 #: ../data/messages:321
 msgid "Desklet"
@@ -2722,7 +2771,7 @@
 
 #: ../data/messages:523
 msgid "Add or remove any applet"
-msgstr "Agrega o remueve cualquier applet"
+msgstr "Añadir o quitar cualquier miniaplicación"
 
 #: ../data/messages:525
 msgid ""
@@ -2730,11 +2779,11 @@
 "Click on the left check-box to (de)activate an applet.\n"
 "Once an applet is active, you can configure it by right clicking on its icon."
 msgstr ""
-"Seleccione una línea para obtener una descripción y una vista previa de la "
-"mini-aplicación.\n"
-"Haga click en la casilla izquierda para (des)activar una miniaplicación.\n"
-"Una vez que la mini-aplicación está activa, puede configurarla haciendo "
-"click derecho en su icono"
+"Seleccione una línea para obtener una previsualización y descripción de la "
+"miniaplicación.\n"
+"Pulse en la casilla a la izquierda para (des)activar una miniaplicación.\n"
+"Una vez que la miniaplicación esté activa, puede configurarla haciendo una "
+"pulsación derecha sobre su icono."
 
 #: ../data/messages:527
 msgid ""
@@ -3346,6 +3395,8 @@
 #: ../data/messages:909
 msgid "Several applets can be visible even when the dock is hidden"
 msgstr ""
+"Algunas miniaplicaciones pueden permanecer visibles incluso cuando el dock "
+"está oculto"
 
 #: ../data/messages:911
 msgid "Default background color when the dock is hidden"

=== modified file 'po/et.po'
--- po/et.po	2012-04-16 16:03:43 +0000
+++ po/et.po	2012-06-19 14:00:30 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:42+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:48+0000\n"
 "Last-Translator: Fabounet <[e-mail]>\n"
 "Language-Team: Estonian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:38+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: et\n"
 

=== modified file 'po/eu.po'
--- po/eu.po	2012-04-16 16:03:43 +0000
+++ po/eu.po	2012-06-19 14:00:30 +0000
@@ -8,14 +8,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
 "PO-Revision-Date: 2012-03-21 03:02+0000\n"
 "Last-Translator: Mendi <[e-mail]>\n"
 "Language-Team: librezale.org\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:20+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:38+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: eu\n"
 

=== modified file 'po/fi.po'
--- po/fi.po	2012-04-16 16:03:43 +0000
+++ po/fi.po	2012-06-19 14:00:30 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:37+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:54+0000\n"
 "Last-Translator: Rami Selin <[e-mail]>\n"
 "Language-Team: Finnish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:38+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: fi\n"
 

=== modified file 'po/fo.po'
--- po/fo.po	2012-04-16 16:03:43 +0000
+++ po/fo.po	2012-06-19 14:00:30 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
 "PO-Revision-Date: 2012-03-21 02:58+0000\n"
 "Last-Translator: Matthieu Baerts <[e-mail]>\n"
 "Language-Team: Faroese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:38+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: fo\n"
 

=== modified file 'po/fr.po'
--- po/fr.po	2012-04-16 16:03:43 +0000
+++ po/fr.po	2012-06-19 14:00:30 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: 2.1.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-04-01 12:59+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-05-08 02:24+0000\n"
 "Last-Translator: Matthieu Baerts <[e-mail]>\n"
 "Language-Team: Cairo-Dock <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-05-09 04:40+0000\n"
+"X-Generator: Launchpad (build 15213)\n"
 "X-Poedit-Country: France\n"
 "Language: \n"
 "X-Poedit-Language: French\n"
@@ -437,6 +437,7 @@
 "  Lentdormi https://launchpad.net/~dahr974\n"
 "  Matthieu Baerts https://launchpad.net/~matttbe\n"
 "  Nicolas Delvaux https://launchpad.net/~malizor\n"
+"  Pierre Slamich https://launchpad.net/~pierre-slamich\n"
 "  SQP https://launchpad.net/~sqp\n"
 "  Thibault Févry https://launchpad.net/~thibaultfevry\n"
 "  bouchard renaud https://launchpad.net/~renaud-bouchard\n"
@@ -3555,12 +3556,12 @@
 
 #: ../data/messages:907
 msgid "Background when hidden"
-msgstr "Arrière plan lorsque que c'est caché"
+msgstr "Arrière plan du dock caché"
 
 #: ../data/messages:909
 msgid "Several applets can be visible even when the dock is hidden"
 msgstr ""
-"Plusieurs applets peuvent être visible même lorsque le dock est caché."
+"Plusieurs applets peuvent être visibles même lorsque le dock est caché."
 
 #: ../data/messages:911
 msgid "Default background color when the dock is hidden"

=== modified file 'po/gl.po'
--- po/gl.po	2012-04-16 16:03:43 +0000
+++ po/gl.po	2012-06-19 14:00:30 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:17+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:49+0000\n"
 "Last-Translator: Miguel Anxo Bouzada <[e-mail]>\n"
 "Language-Team: Galician <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:38+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: gl\n"
 

=== modified file 'po/hu.po'
--- po/hu.po	2012-04-16 16:03:43 +0000
+++ po/hu.po	2012-06-19 14:00:30 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:17+0000\n"
-"Last-Translator: Fabounet <[e-mail]>\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-22 13:19+0000\n"
+"Last-Translator: Péter Trombitás <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-04-23 04:42+0000\n"
+"X-Generator: Launchpad (build 15135)\n"
 "Language: hu\n"
 
 #: ../src/cairo-dock-gui-commons.c:221
@@ -70,15 +70,15 @@
 
 #: ../src/cairo-dock-gui-commons.c:575
 msgid "Press the shortkey"
-msgstr ""
+msgstr "Nyomja meg a gyorsgombot"
 
 #: ../src/cairo-dock-gui-commons.c:594
 msgid "Change the shortkey"
-msgstr ""
+msgstr "Gyorsgomb megváltoztatása"
 
 #: ../src/cairo-dock-gui-commons.c:681
 msgid "Origin"
-msgstr ""
+msgstr "Forrás"
 
 #: ../src/cairo-dock-gui-commons.c:686
 msgid "Action"
@@ -86,7 +86,7 @@
 
 #: ../src/cairo-dock-gui-commons.c:690
 msgid "Shortkey"
-msgstr ""
+msgstr "Gyorsgomb"
 
 #: ../src/cairo-dock-gui-items.c:242
 msgid ""
@@ -154,7 +154,7 @@
 
 #: ../src/cairo-dock-gui-main.c:1502 ../data/messages:515 ../data/messages:767
 msgid "Shortkeys"
-msgstr ""
+msgstr "Gyorsgombok"
 
 #: ../src/cairo-dock-gui-main.c:1508
 msgid "All of the parameters you will never want to tweak."
@@ -441,6 +441,8 @@
 "Thanks to all people that help us to improve the Cairo-Dock project.\n"
 "Thanks to all current, former and future contributors."
 msgstr ""
+"Köszönet mindenkinek, aki segíti a Cairo-Dock projekt fejlődését.\n"
+"Köszönet minden jelenlegi, volt és jövendőbeli közreműködőnek."
 
 #: ../src/cairo-dock-menu.c:317
 msgid "How to help us?"
@@ -448,7 +450,7 @@
 
 #: ../src/cairo-dock-menu.c:318
 msgid "Don't hesitate to join the project, we need you ;)"
-msgstr ""
+msgstr "Ne habozzon, csatlakozzon most a projekthez, szükségünk van Önre!"
 
 #: ../src/cairo-dock-menu.c:319
 msgid "Former contributors"
@@ -460,7 +462,7 @@
 
 #: ../src/cairo-dock-menu.c:321
 msgid "Users of our forum"
-msgstr ""
+msgstr "A fórum felhasználói"
 
 #: ../src/cairo-dock-menu.c:322
 msgid "Artwork"
@@ -589,7 +591,7 @@
 
 #: ../src/cairo-dock-menu.c:898
 msgid "Lock icons position"
-msgstr ""
+msgstr "Ikonok helyzetének rögzítése"
 
 #: ../src/cairo-dock-menu.c:902
 msgid "This will (un)lock the position of the icons."

=== modified file 'po/id.po'
--- po/id.po	2012-04-16 16:03:43 +0000
+++ po/id.po	2012-06-19 14:00:30 +0000
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:36+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:54+0000\n"
 "Last-Translator: Fabounet <[e-mail]>\n"
 "Language-Team: Indonesian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:39+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: id\n"
 

=== modified file 'po/it.po'
--- po/it.po	2012-04-16 16:03:43 +0000
+++ po/it.po	2012-06-19 14:00:30 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: 1.4.5\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:48+0000\n"
-"Last-Translator: Mattia Tavernini <[e-mail]>\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-06-03 11:35+0000\n"
+"Last-Translator: Wonderfulheart <Unknown>\n"
 "Language-Team: Italian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-06-04 04:35+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 "Language: it\n"
 
 #: ../src/cairo-dock-gui-commons.c:221
@@ -71,23 +71,23 @@
 
 #: ../src/cairo-dock-gui-commons.c:575
 msgid "Press the shortkey"
-msgstr ""
+msgstr "Premere il tasto scorciatoia"
 
 #: ../src/cairo-dock-gui-commons.c:594
 msgid "Change the shortkey"
-msgstr ""
+msgstr "Cambia il tasto scorciatoia"
 
 #: ../src/cairo-dock-gui-commons.c:681
 msgid "Origin"
-msgstr ""
+msgstr "Origine"
 
 #: ../src/cairo-dock-gui-commons.c:686
 msgid "Action"
-msgstr ""
+msgstr "Azione"
 
 #: ../src/cairo-dock-gui-commons.c:690
 msgid "Shortkey"
-msgstr ""
+msgstr "Tasto scorciatoia"
 
 #: ../src/cairo-dock-gui-items.c:242
 msgid ""
@@ -102,7 +102,7 @@
 
 #: ../src/cairo-dock-gui-items.c:878
 msgid "Remove this item"
-msgstr ""
+msgstr "Rimuovere questa voce"
 
 #: ../src/cairo-dock-gui-main.c:129 ../data/messages:665
 msgid "Behaviour"
@@ -153,11 +153,11 @@
 
 #: ../src/cairo-dock-gui-main.c:1501
 msgid "Define all the keyboard shortcuts currently available."
-msgstr ""
+msgstr "Rileva tutte le scorciatoie da tastiera attualmente disponibili."
 
 #: ../src/cairo-dock-gui-main.c:1502 ../data/messages:515 ../data/messages:767
 msgid "Shortkeys"
-msgstr ""
+msgstr "Tasti scorciatoia"
 
 #: ../src/cairo-dock-gui-main.c:1508
 msgid "All of the parameters you will never want to tweak."
@@ -315,7 +315,7 @@
 #: ../src/cairo-dock-gui-simple.c:797
 msgid ""
 "Click on an applet in order to have a preview and a description for it."
-msgstr "Clicca su di un'applet per averne un'anteprima e una sua descrizione"
+msgstr "Clicca su un'applet per avere un'anteprima e una sua descrizione."
 
 #: ../src/cairo-dock-gui-simple.c:823
 msgid "On mouse hover:"
@@ -348,8 +348,8 @@
 "powerful tool to customise your current theme."
 msgstr ""
 "La Modalità avanzata dà la possibilità di configurare ogni singolo parametro "
-"della dock. E' uno strumento potente per customizzare il tema attualmente in "
-"uso."
+"della dock. E' uno strumento potente per personalizzare il tema attualmente "
+"in uso."
 
 #: ../src/cairo-dock-gui-themes.c:149
 msgid "Importing theme ..."
@@ -387,24 +387,24 @@
 msgid ""
 "Support the people who spend countless hours to bring you the best dock ever."
 msgstr ""
-"Supporta le persone che spendono gratuitamente il loro tempo per consegnarti "
-"la migliore dock in assoluto."
+"Sostieni le persone che impiegano gratuitamente il loro tempo per "
+"consegnarti la migliore dock in assoluto."
 
 #: ../src/cairo-dock-menu.c:260
 msgid "Here is a list of the current developers and contributors"
-msgstr ""
+msgstr "Ecco una lista degli attuali sviluppatori e collaboratori"
 
 #: ../src/cairo-dock-menu.c:261
 msgid "Developers"
-msgstr ""
+msgstr "Sviluppatori"
 
 #: ../src/cairo-dock-menu.c:262
 msgid "Main developer and project leader"
-msgstr ""
+msgstr "Sviluppatore principale e Leader del Progetto"
 
 #: ../src/cairo-dock-menu.c:263
 msgid "Contributors / Hackers"
-msgstr ""
+msgstr "Collaboratori / Esperti"
 
 #: ../src/cairo-dock-menu.c:265
 msgid "Development"
@@ -412,23 +412,33 @@
 
 #: ../src/cairo-dock-menu.c:280
 msgid "Website"
-msgstr ""
+msgstr "Sito Web"
 
 #: ../src/cairo-dock-menu.c:281
 msgid "Beta-testing / Suggestions / Forum animation"
-msgstr ""
+msgstr "Beta-testing / Suggerimenti / Animazione Forum"
 
 #: ../src/cairo-dock-menu.c:282
 msgid "Translators for this language"
-msgstr ""
+msgstr "Traduttori nella lingua italiana"
 
 #: ../src/cairo-dock-menu.c:283
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Andrea Amoroso https://launchpad.net/~heiko81\n"
+"  Andrea Calabrò https://launchpad.net/~mastropino\n"
+"  Giampaolo Bozzali https://launchpad.net/~g.bozzali\n"
+"  Loscuby https://launchpad.net/~scuby84\n"
+"  Luca Vercelli https://launchpad.net/~luca-vercelli\n"
 "  Mario Calabrese https://launchpad.net/~mario-calabrese\n"
-"  Mattia Tavernini https://launchpad.net/~maathias"
+"  Mattia Tavernini https://launchpad.net/~maathias\n"
+"  Natale https://launchpad.net/~ngm270189\n"
+"  Stefano Prenna https://launchpad.net/~stefanoprenna\n"
+"  Wonderfulheart https://launchpad.net/~wonderfulheart\n"
+"  bobol68 https://launchpad.net/~bobol68\n"
+"  danielesil88 https://launchpad.net/~danielesil88\n"
+"  yoruk https://launchpad.net/~yoruk87"
 
 #: ../src/cairo-dock-menu.c:285
 msgid "Support"
@@ -439,26 +449,29 @@
 "Thanks to all people that help us to improve the Cairo-Dock project.\n"
 "Thanks to all current, former and future contributors."
 msgstr ""
+"Grazie a tutte le persone che ci aiutano a migliorare il progetto Cairo-"
+"Dock.\n"
+"Grazie a tutti i collaboratori attuali, precedenti e futuri."
 
 #: ../src/cairo-dock-menu.c:317
 msgid "How to help us?"
-msgstr ""
+msgstr "Come aiutarci?"
 
 #: ../src/cairo-dock-menu.c:318
 msgid "Don't hesitate to join the project, we need you ;)"
-msgstr ""
+msgstr "Non esitare ad unirti al progetto, abbiamo bisogno di te ;)"
 
 #: ../src/cairo-dock-menu.c:319
 msgid "Former contributors"
-msgstr ""
+msgstr "Collaboratori di concetto"
 
 #: ../src/cairo-dock-menu.c:320
 msgid "For a complete list, please have a look to BZR logs"
-msgstr ""
+msgstr "Per una lista completa, per favore date uno sguardo ai log della BZR"
 
 #: ../src/cairo-dock-menu.c:321
 msgid "Users of our forum"
-msgstr ""
+msgstr "Utenti del nostro forum"
 
 #: ../src/cairo-dock-menu.c:322
 msgid "Artwork"
@@ -466,11 +479,11 @@
 
 #: ../src/cairo-dock-menu.c:324
 msgid "Thanks"
-msgstr ""
+msgstr "Ringraziamenti"
 
 #: ../src/cairo-dock-menu.c:401
 msgid "Quit Cairo-Dock?"
-msgstr "Esci da Cairo-Dock?"
+msgstr "Uscire da Cairo-Dock?"
 
 #: ../src/cairo-dock-menu.c:431 ../src/cairo-dock-menu.c:573
 msgid "Separator"
@@ -483,7 +496,7 @@
 "move to another dock"
 msgstr ""
 "La nuova dock è stata creata.\n"
-"Adesso sposta qualche lanciatore o applet su di lei con clic destro "
+"Adesso sposta qualche lanciatore o applet su di essa con clic destro "
 "sull'icona -> Sposta in un'altra dock"
 
 #: ../src/cairo-dock-menu.c:567
@@ -500,12 +513,12 @@
 
 #: ../src/cairo-dock-menu.c:575
 msgid "Custom launcher"
-msgstr "Lanciatori personalizzati"
+msgstr "Lanciatore personalizzato"
 
 #: ../src/cairo-dock-menu.c:576
 msgid ""
 "Usually you would drag a launcher from the menu and drop it on the dock."
-msgstr "Di solito trascineresti un lanciatore dal menu alla dock."
+msgstr "Di solito dovresti trascinare un lanciatore dal menu alla dock."
 
 #: ../src/cairo-dock-menu.c:593
 msgid "separator"
@@ -551,7 +564,7 @@
 #: ../src/cairo-dock-menu.c:795
 #, c-format
 msgid "You're about to remove this applet (%s) from the dock. Are you sure?"
-msgstr "Stai per rimuovere questo applet (%s) dalla dock. Sicuro?"
+msgstr "Stai per rimuovere questa applet (%s) dalla dock. Sei sicuro?"
 
 #: ../src/cairo-dock-menu.c:853
 msgid "Configure"
@@ -559,7 +572,7 @@
 
 #: ../src/cairo-dock-menu.c:858
 msgid "Configure behaviour, appearance, and applets."
-msgstr "Configura il comportamento, l'aspetto, e le applet."
+msgstr "Configura il comportamento, l'aspetto e le applet."
 
 #: ../src/cairo-dock-menu.c:863
 msgid "Configure this dock"
@@ -568,7 +581,7 @@
 #: ../src/cairo-dock-menu.c:868
 msgid "Customize the position, visibility and appearance of this main dock."
 msgstr ""
-"Personalizza la posizione, visibilità e apparenza della dock principale."
+"Personalizza la posizione, la visibilità e l'aspetto della dock principale."
 
 #: ../src/cairo-dock-menu.c:870
 msgid "Delete this dock"
@@ -582,12 +595,12 @@
 msgid ""
 "Choose from amongst many themes on the server or save your current theme."
 msgstr ""
-"Scegli uno tra i molti temi disponibili sul server, e salva il tuo tema "
+"Scegli tra uno dei molti temi disponibili sul server o salva il tuo tema "
 "corrente."
 
 #: ../src/cairo-dock-menu.c:898
 msgid "Lock icons position"
-msgstr ""
+msgstr "Blocca le icone"
 
 #: ../src/cairo-dock-menu.c:902
 msgid "This will (un)lock the position of the icons."
@@ -609,8 +622,8 @@
 msgid ""
 "Third-party applets provide integration with many programs, like Pidgin"
 msgstr ""
-"Le applet di terze-parti provvedono all'integrazione di molti programmi, "
-"come Pidgin"
+"Le applet di terze-parti forniscono un'integrazione a molti programmi, come "
+"Pidgin"
 
 #: ../src/cairo-dock-menu.c:961 ../src/help/applet-init.c:28
 #: ../src/help/applet-notifications.c:257
@@ -636,14 +649,17 @@
 "It's not advised to quit the dock but you can press Shift to unlock this "
 "menu entry."
 msgstr ""
+"Stai usando una sessione Cairo-Dock!\n"
+"Non è consigliato uscire dalla dock ma è possibile premere Shift per "
+"sbloccare questa voce del menu."
 
 #: ../src/cairo-dock-menu.c:1018 ../src/cairo-dock-menu.c:1039
 msgid "Edit"
-msgstr ""
+msgstr "Modifica"
 
 #: ../src/cairo-dock-menu.c:1020 ../src/cairo-dock-menu.c:1046
 msgid "Remove"
-msgstr ""
+msgstr "Elimina"
 
 #: ../src/cairo-dock-menu.c:1021
 msgid ""
@@ -666,7 +682,7 @@
 
 #: ../src/cairo-dock-menu.c:1043
 msgid "Detach"
-msgstr ""
+msgstr "Distacca"
 
 #: ../src/cairo-dock-menu.c:1043
 msgid "Return to the dock"
@@ -674,7 +690,7 @@
 
 #: ../src/cairo-dock-menu.c:1050
 msgid "Duplicate"
-msgstr ""
+msgstr "Duplica"
 
 #: ../src/cairo-dock-menu.c:1065
 msgid "Applet's handbook"
@@ -682,7 +698,7 @@
 
 #: ../src/cairo-dock-menu.c:1110
 msgid "Pick up an image"
-msgstr ""
+msgstr "Trovare un'immagine"
 
 #: ../src/cairo-dock-menu.c:1341
 #, c-format
@@ -778,7 +794,7 @@
 #: ../src/cairo-dock-menu.c:1666 ../src/cairo-dock-menu.c:1668
 #: ../data/messages:745
 msgid "Lower"
-msgstr ""
+msgstr "Arrotola"
 
 #: ../src/cairo-dock-menu.c:1674 ../src/cairo-dock-menu.c:1676
 #: ../data/messages:739
@@ -832,7 +848,7 @@
 "config.\n"
 "It is located in the 'Taskbar' module."
 msgstr ""
-"L'opzione ' sovrascrivi le icone di X' è stata automaticamente abilitata "
+"L'opzione 'sovrascrivi le icone di X' è stata automaticamente abilitata "
 "nella configurazione.\n"
 "E' rintracciabile nel modulo 'Taskbar'."
 
@@ -847,7 +863,7 @@
 
 #: ../src/cairo-dock.c:328
 msgid "Use OpenGL backend."
-msgstr "Usa il backend OpenGL"
+msgstr "Usa il backend OpenGL."
 
 #: ../src/cairo-dock.c:331
 msgid ""
@@ -859,7 +875,7 @@
 
 #: ../src/cairo-dock.c:334
 msgid "Ask again on startup which backend to use."
-msgstr ""
+msgstr "Chiedi nuovamente all'avvio quale backend usare."
 
 #: ../src/cairo-dock.c:337
 msgid "Force the dock to consider this environnement - use it with care."
@@ -870,7 +886,7 @@
 msgid ""
 "Force the dock to load from this directory, instead of ~/.config/cairo-dock."
 msgstr ""
-"Forza la dock a caricare da questa cartella, invece che da ~/.config/cairo-"
+"Forza la dock a caricare da questa directory, invece che da ~/.config/cairo-"
 "dock."
 
 #: ../src/cairo-dock.c:343
@@ -879,15 +895,15 @@
 "default server address."
 msgstr ""
 "Indirizzo di un server contenente temi addizionali. Questo sovrascriverà "
-"l'indirizzo server di default."
+"l'indirizzo del server predefinito."
 
 #: ../src/cairo-dock.c:346
 msgid ""
 "Wait for N seconds before starting; this is useful if you notice some "
 "problems when the dock starts with the session."
 msgstr ""
-"Attendi per N secondi prima di partire; questo è utile se sperimenti "
-"problemi quando la dock si avvia ad inizio sessione."
+"Attendi per N secondi prima di partire; questo è utile se hai problemi "
+"quando la dock si avvia ad inizio sessione."
 
 #: ../src/cairo-dock.c:349
 msgid ""
@@ -910,7 +926,7 @@
 msgid ""
 "Log verbosity (debug,message,warning,critical,error); default is warning."
 msgstr ""
-"Log verboso (debug,message,warning,critical,error); di base è solo warning."
+"Log prolisso (debug,message,warning,critical,error); di base è solo warning."
 
 #: ../src/cairo-dock.c:361
 msgid "Force to display some output messages with colors."
@@ -942,8 +958,8 @@
 "Ask the dock to load additionnal modules contained in this directory (though "
 "it is unsafe for your dock to load unnofficial modules)."
 msgstr ""
-"Domanda alla dock di caricare moduli addizionali contenuti in questa "
-"cartella (ricorda che non è sicuro per la tua dock, caricare moduli non "
+"Domanda alla dock di caricare i moduli addizionali contenuti in questa "
+"directory (sebbene non sia sicuro per la tua dock caricare moduli non "
 "ufficiali)."
 
 #: ../src/cairo-dock.c:383
@@ -951,20 +967,20 @@
 "For debugging purpose only. The crash manager will not be started to hunt "
 "down the bugs."
 msgstr ""
-"Per interessi di debug soltanto. Il manager dei crash non verrà avviato per "
-"ricercare gli errori."
+"Solo per interesse di debug. Il manager dei crash non sarà avviato per "
+"ricercare degli errori."
 
 #: ../src/cairo-dock.c:386
 msgid ""
 "For debugging purpose only. Some hidden and still unstable options will be "
 "activated."
 msgstr ""
-"Per interessi di debug soltanto. Qualche opzione ancora nascosta e instabile "
-"sarà attivata."
+"Solo per interesse di debug. Saranno attivate delle opzioni ancora nascoste "
+"ed instabili."
 
 #: ../src/cairo-dock.c:503
 msgid "Use OpenGL in Cairo-Dock"
-msgstr "Utilizza OpenGL in Cairo-Dock?"
+msgstr "Utilizza OpenGL in Cairo-Dock"
 
 #: ../src/cairo-dock.c:511
 msgid ""
@@ -983,10 +999,10 @@
 "In ogni caso, alcune schede video e/o i relativi driver non la supportano "
 "completamente, il che potrebbe causare un funzionamento non corretto della "
 "dock.\n"
-"Attiva OpenGL?\n"
+"Vuoi attivare OpenGL?\n"
 " (Per non mostrare questo avviso, lanciare la dock dal menu delle "
 "Applicazioni,\n"
-"  oppure con l'opzione -o per forzare OpenGL e -c per forzare cairo.)"
+"  oppure con l'opzione -o per forzare OpenGL e -c per forzare Cairo.)"
 
 #: ../src/cairo-dock.c:522
 msgid "Remember this choice"
@@ -1004,8 +1020,8 @@
 "at http://glx-dock.org"
 msgstr ""
 "Il modulo '%s' potrebbe avere incontrato un problema.\n"
-"E' stato riavviato con successo, ma è accaduto ancora; ti ringraziamo se lo "
-"riferisci su http://glx-dock.org"
+"E' stato riavviato con successo, ma se accade ancora, per favore, "
+"riferiscilo su http://glx-dock.org"
 
 #: ../src/gldit/cairo-dock-applet-facility.h:277
 msgid ""
@@ -1051,7 +1067,7 @@
 #: ../src/gldit/cairo-dock-dock-manager.c:1656
 #: ../src/gldit/cairo-dock-dock-manager.c:1757
 msgid "Pop up the main dock"
-msgstr ""
+msgstr "Fai apparire la Dock principale"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:243
 #, c-format
@@ -1060,7 +1076,7 @@
 
 #: ../src/gldit/cairo-dock-gui-factory.c:255
 msgid "kB"
-msgstr "kB"
+msgstr "KB"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:257
 msgid "MB"
@@ -1088,11 +1104,11 @@
 
 #: ../src/gldit/cairo-dock-gui-factory.c:724
 msgid "Pick up a file"
-msgstr ""
+msgstr "Trovare un file"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:724
 msgid "Pick up a directory"
-msgstr ""
+msgstr "Trovare una directory"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:984
 msgid "_Custom Icons_"
@@ -1135,7 +1151,7 @@
 
 #: ../src/gldit/cairo-dock-gui-factory.c:2962
 msgid "Theme"
-msgstr "tema"
+msgstr "Tema"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:2975
 msgid "Rating"
@@ -1143,7 +1159,7 @@
 
 #: ../src/gldit/cairo-dock-gui-factory.c:2981
 msgid "Sobriety"
-msgstr "sobrietà"
+msgstr "Sobrietà"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:3054
 msgid "link"
@@ -1151,7 +1167,7 @@
 
 #: ../src/gldit/cairo-dock-gui-factory.c:3107
 msgid "Grab"
-msgstr "cattura"
+msgstr "Cattura"
 
 #: ../src/gldit/cairo-dock-struct.h:423
 msgid "Default"
@@ -1172,6 +1188,8 @@
 "Could not access remote file %s. Maybe the server is down.\n"
 "Please retry later or contact us at glx-dock.org."
 msgstr ""
+"Non posso accedere al file remoto %s. Il server potrebbe essere spento.\n"
+"Per favore prova più tardi o contattaci su glx-dock.org."
 
 #: ../src/gldit/cairo-dock-themes-manager.c:267
 #, c-format
@@ -1192,12 +1210,12 @@
 "  (you can now click on this dialog to close it)"
 msgstr ""
 "Benvenuto in Cairo-Dock!\n"
-"Quest' applet è qui per aiutarti ad iniziare con l'utilizzo della dock; "
-"basta cliccarci sopra.\n"
-"Se hai delle domande/richieste/segnalazioni, per favore spendi una visita al "
+"Quest'applet è qui per aiutarti ad iniziare con l'utilizzo della dock; basta "
+"cliccarci sopra.\n"
+"Se hai delle domande/richieste/segnalazioni, per favore facci una visita al "
 "sito http://glx-dock.org.\n"
-"Speriamo tu gradisca questo software!\n"
-"  (adesso puoi cliccare sul dialogo per chiuderlo)"
+"Speriamo che tu gradisca questo software!\n"
+"  (adesso puoi cliccare su questo dialogo per chiuderlo)"
 
 #: ../src/help/applet-composite.c:160
 msgid "Don't ask me any more"
@@ -1390,7 +1408,7 @@
 
 #: ../data/messages:21
 msgid "Grouping icons into a sub-dock"
-msgstr "Ragruppare le icone in sub-dock"
+msgstr "Raggruppare le icone in una sub-dock"
 
 #: ../data/messages:23
 msgid ""
@@ -1465,13 +1483,13 @@
 "Also, you can define the size of each applet independently in their own "
 "settings."
 msgstr ""
-"Puoi rendere più grandi o più piccoli sia le icone che l'effetto zoom. Apri "
-"le impostazioni (clic destro -> Cairo-Dock -> Configura) e vai su Aspetto (o "
+"Puoi ingrandire o rimpicciolire sia le icone che l'effetto zoom. Apri le "
+"impostazioni (clic destro -> Cairo-Dock -> Configura) e vai su Aspetto (o "
 "Icone nella modalità avanzata).\n"
-"Considera che se ci saranno troppe icone sulla dock, queste verranno "
+"Considera che se ci saranno troppe icone sulla dock, esse verranno "
 "ridimensionate per adattarsi allo schermo.\n"
-"In più puoi definire la dimensione di ogni applet indipendentemente, "
-"attraverso le loro impostazioni."
+"Inoltre puoi definire la dimensione di ciascuna applet impostandone ognuna "
+"indipendentemente."
 
 #: ../data/messages:37
 msgid "Separating icons"
@@ -1964,8 +1982,8 @@
 "To remove a bookmark, right-click on its icon -> remove"
 msgstr ""
 "Attiva l'applet Scorciatoie.\n"
-"Successivamente ogni segnalibro delle cartelle (quelli che appaiono in "
-"Nautilus) sarà elencato in na sub-dock.\n"
+"Successivamente, ogni segnalibro delle cartelle (quelli che appaiono in "
+"Nautilus), sarà elencato in una sub-dock.\n"
 "Per aggiungere segnalibri, trascina semplicemente una cartella nell'icona "
 "dell'applet.\n"
 "Per rimuoverlo, clic destro sulla sua icona -> \"rimuovi\""
@@ -2146,10 +2164,10 @@
 "If the dock is running with OpenGL, try to disable it by launching the dock "
 "with «cairo-dock -c»."
 msgstr ""
-"Se hai una GeForce8, dovrai installare gli ultimi driver, perchè i "
-"precedenti avevano molti bug.\n"
+"Se hai una GeForce8, dovrai installare gli ultimi driver perché i precedenti "
+"avevano molti bug.\n"
 "Se la dock sta andando senza OpenGL, prova a ridurre il numero di icone "
-"sulla dock principale, oppure a ridurne la dimensione.\n"
+"sulla dock principale oppure a ridurne la dimensione.\n"
 "Se la dock va con OpenGL, prova a disattivarlo lanciandola con 'cairo-dock -"
 "c'."
 
@@ -2172,7 +2190,7 @@
 "cards can do this, as can more and more Intel cards. Most ATI cards do not "
 "support OpenGL2.0."
 msgstr ""
-"Occorre una scheda grafica con driver che supportino openGL2.0. La maggior "
+"Occorre una scheda grafica con driver che supportino OpenGL2.0. La maggior "
 "parte delle schede Nvidia lo fanno, sempre più schede Intel ne sono in "
 "grado. La maggior parte delle schede ATI invece non può farlo."
 
@@ -2241,7 +2259,7 @@
 "Se usi KDE, è possibile tu debba dirgli il percorso della cartella Cestino.\n"
 "Apri l'editor di configurazione, e riempi il percorso del cestino; "
 "probabilmente è ~/.local/share/Trash/files. Stai molto attento quando digiti "
-"un percorso qui!!! (Non inserire spazi nè caratteri invisibili)."
+"un percorso qui!!! (Non inserire spazi né caratteri invisibili)."
 
 #: ../data/messages:239
 msgid ""
@@ -2355,8 +2373,8 @@
 " One for stable releases and another which is updated weekly (unstable "
 "version)"
 msgstr ""
-"Manteniamo due repository per Debian, Ubuntu e altre Debian-derivate:\n"
-" Uno per la release stable e un altro aggiornato setttimanalmente (versione "
+"Manteniamo due repository per Debian, Ubuntu e altre derivate Debian:\n"
+" Uno per la release stable e un altro aggiornato settimanalmente (versione "
 "unstable)"
 
 #: ../data/messages:281
@@ -2425,7 +2443,7 @@
 
 #: ../data/messages:307
 msgid "Name of the dock it belongs to:"
-msgstr "Nome della dock al quale appartiene:"