Matthieu Baerts has proposed merging lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.3.0-3-1 into lp:ubuntu/cairo-dock-plug-ins.
Requested reviews: Ubuntu Sponsors Team (ubuntu-sponsors) Related bugs: Bug #811579 in cairo-dock-plug-ins (Ubuntu): "dependancy issues (cairo-dock-plug-ins and libindicator3)" https://bugs.launchpad.net/ubuntu/+source/cairo-dock-plug-ins/+bug/811579 Bug #815026 in cairo-dock-plug-ins (Ubuntu): "Please update Cairo-Dock Plug-Ins to 2.3.0~3.1 version (bugs fixed only)" https://bugs.launchpad.net/ubuntu/+source/cairo-dock-plug-ins/+bug/815026 For more details, see: https://code.launchpad.net/~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.3.0-3-1/+merge/68944 Hello, The Cairo-Dock team proposes a bugs fixed version for its 2.3.0 branch. This is the ChangeLog: * From 2.3.0~3 to 2.3.0~3.1: - Stack: fixed a bug that prevented from having more than 1 stack. - Systray: fixed a crash when inside the dock. Please note that this new version fixes also this bug #811579 (Cairo-Dock Plug-Ins needs to be recompiled to fix a dependency issues) How to reproduce the bugs: * Stack will not work correctly if there is more than one instance. * Enable the Systray (aka Notification Area) applet and put it into the dock (not in a desklet mode) Thank you for your help -- https://code.launchpad.net/~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.3.0-3-1/+merge/68944 Your team Cairo-Dock Team is subscribed to branch lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.3.0-3-1.
=== modified file 'debian/changelog' --- debian/changelog 2011-07-05 13:45:43 +0000 +++ debian/changelog 2011-07-23 10:29:23 +0000 @@ -1,3 +1,14 @@ +cairo-dock-plug-ins (2.3.0~3-1ubuntu1) UNRELEASED; urgency=low + + * New upstream release. (LP: #815026) + * Upstream ChangeLog: + - Stack: fixed a bug that prevented from having more than 1 stack. + - Systray: fixed a crash when inside the dock. + * This package needs to be recompiled in order to fix + a dependency issues. (LP: #811579) + + -- Matthieu Baerts (matttbe) <[email protected]> Sat, 23 Jul 2011 12:10:37 +0200 + cairo-dock-plug-ins (2.3.0~3-0ubuntu1) oneiric; urgency=low * New upstream release. (LP: #799774) === modified file 'stack/src/applet-stack.c' --- stack/src/applet-stack.c 2011-04-20 20:46:51 +0000 +++ stack/src/applet-stack.c 2011-07-23 10:29:23 +0000 @@ -26,6 +26,24 @@ void cd_stack_check_local (CairoDockModuleInstance *myApplet, GKeyFile *pKeyFile) { + + // be sure to not use the stack dir of another instance (it can happen when the applet is multi-instanciated, since new instances are initialized with the conf file of the first instance when they are created). + GList *mi; + CairoDockModuleInstance *applet; + AppletConfig *cfg; + for (mi = myApplet->pModule->pInstancesList; mi!= NULL; mi = mi->next) + { + applet = mi->data; + if (applet == myApplet) + continue; + cfg = (AppletConfig*)applet->pConfig; + if (cfg->cStackDir && strcmp (cfg->cStackDir, myConfig.cStackDir) == 0) + { + g_free (myConfig.cStackDir); + myConfig.cStackDir = NULL; + } + } + if (! g_file_test (myConfig.cStackDir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE)) { === modified file 'systray/src/systray-interface.c' --- systray/src/systray-interface.c 2010-08-10 00:05:57 +0000 +++ systray/src/systray-interface.c 2011-07-23 10:29:23 +0000 @@ -36,6 +36,7 @@ CairoDialogAttribute attr; memset (&attr, 0, sizeof (CairoDialogAttribute)); attr.pInteractiveWidget = GTK_WIDGET (myData.tray); + attr.bHideOnClick = TRUE; // keep the dialog alive on click (hide it). myData.dialog = cairo_dock_build_dialog (&attr, myIcon, myContainer); gtk_window_set_resizable (GTK_WINDOW(myData.dialog->container.pWidget), FALSE); /// utile ?... cairo_dock_hide_dialog (myData.dialog);
_______________________________________________ Mailing list: https://launchpad.net/~cairo-dock-team Post to : [email protected] Unsubscribe : https://launchpad.net/~cairo-dock-team More help : https://help.launchpad.net/ListHelp
