Merge lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.3.0-3-1 into lp:ubuntu/oneiric/cairo-dock-plug-ins

[Matthieu Baerts]

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

[Matthieu Baerts (matttbe)]

I've a question to the Ubuntu Sponsors Team:
 The older version was 2.3.0~3-0ubuntu1. Should I now use 2.3.0~3-1ubuntu1 or 2.3.0~3.1-0ubuntu1?

[lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.3.0-3-1]

22. By Matthieu Baerts on 2011-07-27

* debian/patches
 - Fixed the Uppix backend of the Drop to Share applet

[Matthieu Baerts (matttbe)]

Hi,

I've added a patch to fix a bug with the Uppix backend (Drop to Share/DND2Share applet)

[Michael Vogt (mvo)]

Thanks for proposing this branch!

When I test merge this branch into the ubuntu branch I see that the following two patches are
deleted:
-D debian/patches/01-ubuntuone-fix_upstream-version-2.3.0~2.1.patch
-D debian/patches/02-weather-fix_upstream-version-2.3.0~2.2.patch

Is this intentional? It looks like they are just leftovers that were not applied anyway, but it would be nice to mention it here.

review: Needs Fixing

[Matthieu Baerts (matttbe)]

Hello,

Sorry for this delay and for this lack of precisions and thank you for your help!

These patches have been removed on the rev 20 with the version 2.3.0~3-0ubuntu1 (now in upstream) but I've forgotten to delete these two files...

http://bazaar.launchpad.net/~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.3.0-3-1/revision/20

review: Needs Resubmitting

[Matthieu Baerts (matttbe)]

(arf, sorry for this new Resubmit status :( )

[Matthieu Baerts (matttbe)]

I guess this new merge proposal replace this one.
https://code.launchpad.net/~cairo-dock-team/ubuntu/oneiric/cairo-dock-plug-ins/2.4.0-0beta2/+merge/70953

Unmerged revisions

22. By Matthieu Baerts on 2011-07-27

* debian/patches
 - Fixed the Uppix backend of the Drop to Share applet

21. By Matthieu Baerts on 2011-07-23

* 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)

=== added directory '.pc'
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2011-07-28 10:10:29 +0000
@@ -0,0 +1,1 @@
+2

=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2011-07-28 10:10:29 +0000
@@ -0,0 +1,1 @@
+fix_uppix_dnd2share_backend.patch

=== added directory '.pc/fix_uppix_dnd2share_backend.patch'
=== added directory '.pc/fix_uppix_dnd2share_backend.patch/dnd2share'
=== added directory '.pc/fix_uppix_dnd2share_backend.patch/dnd2share/src'
=== added file '.pc/fix_uppix_dnd2share_backend.patch/dnd2share/src/applet-backend-uppix.c'
--- .pc/fix_uppix_dnd2share_backend.patch/dnd2share/src/applet-backend-uppix.c	1970-01-01 00:00:00 +0000
+++ .pc/fix_uppix_dnd2share_backend.patch/dnd2share/src/applet-backend-uppix.c	2011-07-28 10:10:29 +0000
@@ -0,0 +1,126 @@
+/**
+* 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/>.
+*/
+
+#define _BSD_SOURCE
+#include <stdlib.h>
+#include <math.h>
+#include <unistd.h>
+#include <glib/gstdio.h>
+
+#include "applet-struct.h"
+#include "applet-dnd2share.h"
+#include "applet-backend-uppix.h"
+
+#define NB_URLS 5
+static const gchar *s_UrlLabels[NB_URLS] = {"DirectLink", "DisplayImage", "BBCode150px", "BBCode600px", "BBCodeFullPic"};
+
+
+static void upload (const gchar *cFilePath, gchar *cDropboxDir, gboolean bAnonymous, gint iLimitRate, gchar **cResultUrls)
+{
+	// On cree un fichier de log temporaire.
+	gchar *cLogFile = g_strdup ("/tmp/dnd2share-log.XXXXXX");
+	int fds = mkstemp (cLogFile);
+	if (fds == -1)
+	{
+		g_free (cLogFile);
+		return ;
+	}
+	close(fds);
+	
+	// On lance la commande d'upload.
+	gchar *cCommand = g_strdup_printf ("curl --connect-timeout 5 --retry 2 --limit-rate %dk uppix.net -F myimage=@\"%s\" -F submit=Upload -F formup=1 -o \"%s\"", iLimitRate, cFilePath, cLogFile);  /// peut-on ajouter le nom de l'auteur dans le formulaire ?...
+	cd_debug ("%s", cCommand);
+	int r = system (cCommand);
+	g_free (cCommand);
+	
+	
+	// On récupère toutes les infos dans le fichier de log :
+	/// TODO : se passer des g_spawn_command_line_sync !
+	//D'abord l'url de DisplayImage
+	gchar *cDisplayImage = NULL;
+	gchar *cCommandDisplayImage = g_strdup_printf ("grep -oEm 1 '\\[url\\=([^]]*)' \"%s\"", cLogFile);
+	g_spawn_command_line_sync (cCommandDisplayImage, &cDisplayImage,  NULL, NULL, NULL);
+	g_free (cCommandDisplayImage);
+	
+	if (cDisplayImage == NULL || *cDisplayImage == '\0')
+	{
+		g_remove (cLogFile);
+		g_free (cLogFile);
+		return ;
+	}
+	
+	gchar *str = g_strstr_len (cDisplayImage, -1, "http://"); // On retire tout ce qui se trouve avant http://
+	if (str != NULL && str != cDisplayImage)
+	{
+		gchar *tmp = cDisplayImage;
+		cDisplayImage = g_strdup (str);
+		g_free (tmp);
+	}
+	cDisplayImage[strlen(cDisplayImage) - 1] = '\0';  // on retire le \n à la fin
+	cd_debug ("dnd2share : Display Image = %s", cDisplayImage);
+	
+	// Puis l'url de DirectLink
+	gchar *cDirectLink = NULL;
+	gchar *cCommandDirectLink = g_strdup_printf ("grep -oEm 1 '\\[img\\]([^[]*)' \"%s\"", cLogFile);
+	g_spawn_command_line_sync (cCommandDirectLink, &cDirectLink,  NULL, NULL, NULL);
+	g_free (cCommandDirectLink);
+	
+	str = g_strstr_len (cDirectLink, -1, "http://"); // On retire tout ce qui se trouve avant http://
+	if (str != NULL && str != cDirectLink)
+	{
+		gchar *tmp = cDirectLink;
+		cDirectLink = g_strdup (str);
+		g_free (tmp);
+	}
+	cDirectLink[strlen(cDirectLink) - 1] = '\0';  // on retire le \n à la fin
+	cd_debug ("dnd2share : Direct Link = %s", cDirectLink);
+
+	// Puis on créé les autres URLs à la mano ;-) :
+	gchar *cBBCodeFullPic = g_strdup_printf ("[img]%s[/img]", cDirectLink);
+	cd_debug ("dnd2share : BBCODE_Full = '%s'", cBBCodeFullPic);
+	
+	gchar *cDirectLinkWithoutExt = g_strdup (cDisplayImage);
+	cDirectLinkWithoutExt[strlen(cDirectLinkWithoutExt) - 5] = '\0';  // on retire le .html à la fin
+	gchar *cBBCode150px = g_strdup_printf ("[url=%s][img]%st.jpg[/img][/url]", cDirectLink, cDirectLinkWithoutExt);
+	gchar *cBBCode600px = g_strdup_printf ("[url=%s][img]%stt.jpg[/img][/url]", cDirectLink, cDirectLinkWithoutExt);
+	g_free (cDirectLinkWithoutExt);
+	cd_debug ("dnd2share : BBCODE_150px = '%s'", cBBCode150px);
+	cd_debug ("dnd2share : BBCODE_600px = '%s'", cBBCode600px);
+	
+	g_remove (cLogFile);
+	g_free (cLogFile);
+	
+	// Enfin on remplit la memoire partagee avec nos URLs.
+	cResultUrls[0] = cDirectLink;
+	cResultUrls[1] = cDisplayImage;
+	cResultUrls[2] = cBBCode150px;
+	cResultUrls[3] = cBBCode600px;
+	cResultUrls[4] = cBBCodeFullPic;
+}
+
+
+void cd_dnd2share_register_uppix_backend (void)
+{
+	cd_dnd2share_register_new_backend (CD_TYPE_IMAGE,
+		"Uppix.net",
+		NB_URLS,
+		s_UrlLabels,
+		0,
+		upload);
+}

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-05 13:45:43 +0000
+++ debian/changelog	2011-07-28 10:10:29 +0000
@@ -1,3 +1,21 @@
+cairo-dock-plug-ins (2.3.0~3-1ubuntu2) natty; urgency=low
+
+  * debian/patches
+   - Fixed the Uppix backend of the Drop to Share applet
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Wed, 27 Jul 2011 23:58:24 +0200
+
+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) <[e-mail]>  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)

=== removed file 'debian/patches/01-ubuntuone-fix_upstream-version-2.3.0~2.1.patch'
--- debian/patches/01-ubuntuone-fix_upstream-version-2.3.0~2.1.patch	2011-06-06 10:13:07 +0000
+++ debian/patches/01-ubuntuone-fix_upstream-version-2.3.0~2.1.patch	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-From: Matthieu Baerts <[e-mail]>
-Subject: dnd2share: UbuntuOne backend: wait for the end of the sync before publishing the link (to avoid a crash of u1sdtool)
-Origin: upstream, http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-plug-ins/2.3.x/revision/1939
-Bug: http://www.glx-dock.org/tt_task.php?p=2&t=187
-Forwarded: yes
-
-Index: cairo-dock-plug-ins/CMakeLists.txt
-===================================================================
---- cairo-dock-plug-ins.orig/CMakeLists.txt	2011-05-21 01:52:06.786633847 +0200
-+++ cairo-dock-plug-ins/CMakeLists.txt	2011-05-21 01:52:49.006695762 +0200
-@@ -299,7 +299,7 @@
- 
- ############# DND2SHARE #################
- set (GETTEXT_DND2SHARE ${GETTEXT_PLUGINS})
--set (VERSION_DND2SHARE "1.0.5")
-+set (VERSION_DND2SHARE "1.0.6")
- set (PACKAGE_DND2SHARE "cd-dnd2share")
- set (dnd2sharedatadir "${pluginsdatadir}/dnd2share")
- configure_file (${CMAKE_CURRENT_SOURCE_DIR}/dnd2share/data/dnd2share.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dnd2share/data/dnd2share.conf)
-Index: cairo-dock-plug-ins/dnd2share/src/applet-backend-ubuntuone.c
-===================================================================
---- cairo-dock-plug-ins.orig/dnd2share/src/applet-backend-ubuntuone.c	2011-05-21 01:52:06.806633864 +0200
-+++ cairo-dock-plug-ins/dnd2share/src/applet-backend-ubuntuone.c	2011-05-21 01:52:49.006695762 +0200
-@@ -54,8 +54,10 @@
- 		return;
- 	}
- 	
--	// On recupere l'URL (dispo tout de suite, sinon il faudra boucler en testant 'dropbox status' jusqu'a avoir 'Idle').
--	cCommand= g_strdup_printf ("u1sdtool --publish-file \"%s\"", cLocalFilePath);
-+	// We wait for the end of the sync
-+	cairo_dock_launch_command_sync ("u1sdtool --wait");
-+	// We publish the file and we read the output message
-+	cCommand = g_strdup_printf ("u1sdtool --publish-file \"%s\"", cLocalFilePath);
- 	cd_debug ("commande u2 : %s", cCommand);
- 	gchar *cResult = cairo_dock_launch_command_sync (cCommand);
- 	g_free (cCommand);

=== removed file 'debian/patches/02-weather-fix_upstream-version-2.3.0~2.2.patch'
--- debian/patches/02-weather-fix_upstream-version-2.3.0~2.2.patch	2011-06-06 10:13:07 +0000
+++ debian/patches/02-weather-fix_upstream-version-2.3.0~2.2.patch	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-From: Matthieu Baerts <[e-mail]>
-Subject: Weather: prevent a crash if there is an error (thanks to Tsu Jan)
-Origin: upstream, http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-plug-ins/2.3.x/revision/1940
-Bug: https://bugs.launchpad.net/ubuntu/+source/cairo-dock-plug-ins/+bug/788437
-Forwarded: yes
-
-Index: cairo-dock-plug-ins/weather/src/applet-read-data.c
-===================================================================
---- cairo-dock-plug-ins.orig/weather/src/applet-read-data.c	2011-06-04 02:16:45.821196928 +0200
-+++ cairo-dock-plug-ins/weather/src/applet-read-data.c	2011-06-04 02:17:05.891226364 +0200
-@@ -304,13 +304,13 @@
- 	{
- 		gchar *cURL = g_strdup_printf (CD_WEATHER_BASE_URL"/weather/local/%s?cc=*%s", pSharedMemory->cLocationCode, (pSharedMemory->bISUnits ? "&unit=m" : ""));
- 		cCCData = cairo_dock_get_url_data (cURL, &erreur);
--		g_free (cURL);
- 		if (erreur != NULL)
- 		{
- 			cd_warning ("while downloading current conditions data:\n%s -> %s", cURL, erreur->message);
- 			g_error_free (erreur);
- 			erreur = NULL;
- 		}
-+		g_free (cURL);
- 		if (cCCData == NULL)
- 		{
- 			pSharedMemory->bErrorInThread = TRUE;
-@@ -324,7 +324,6 @@
- 	{
- 		gchar *cURL = g_strdup_printf (CD_WEATHER_BASE_URL"/weather/local/%s?dayf=%d%s", pSharedMemory->cLocationCode, pSharedMemory->iNbDays, (pSharedMemory->bISUnits ? "&unit=m" : ""));
- 		cForecastData = cairo_dock_get_url_data (cURL, &erreur);
--		g_free (cURL);
- 		if (erreur != NULL)
- 		{
- 			cd_warning ("while downloading forecast data:\n%s ->  %s", cURL, erreur->message);
-@@ -332,6 +331,7 @@
- 			erreur = NULL;
- 			pSharedMemory->bErrorInThread = TRUE;
- 		}
-+		g_free (cURL);
- 		if (cForecastData == NULL)
- 		{
- 			pSharedMemory->bErrorInThread = TRUE;

=== added file 'debian/patches/fix_uppix_dnd2share_backend.patch'
--- debian/patches/fix_uppix_dnd2share_backend.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_uppix_dnd2share_backend.patch	2011-07-28 10:10:29 +0000
@@ -0,0 +1,18 @@
+From: Matthieu Baerts (matttbe) <[e-mail]>
+Subject: Fixed uppix DND2Share backend.
+Origin: upstream, http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-plug-ins/plug-ins/revision/2041
+Forwarded: yes
+
+Index: cairo-dock-plug-ins/dnd2share/src/applet-backend-uppix.c
+===================================================================
+--- cairo-dock-plug-ins.orig/dnd2share/src/applet-backend-uppix.c	2011-07-27 23:51:15.675945270 +0200
++++ cairo-dock-plug-ins/dnd2share/src/applet-backend-uppix.c	2011-07-27 23:52:18.904258832 +0200
+@@ -44,7 +44,7 @@
+ 	close(fds);
+ 	
+ 	// On lance la commande d'upload.
+-	gchar *cCommand = g_strdup_printf ("curl --connect-timeout 5 --retry 2 --limit-rate %dk uppix.net -F myimage=@\"%s\" -F submit=Upload -F formup=1 -o \"%s\"", iLimitRate, cFilePath, cLogFile);  /// peut-on ajouter le nom de l'auteur dans le formulaire ?...
++	gchar *cCommand = g_strdup_printf ("curl --connect-timeout 5 --retry 2 --limit-rate %dk uppix.net -H Expect: -F myimage=@\"%s\" -F submit=Upload -F formup=1 -o \"%s\"", iLimitRate, cFilePath, cLogFile);
+ 	cd_debug ("%s", cCommand);
+ 	int r = system (cCommand);
+ 	g_free (cCommand);

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-07-28 10:10:29 +0000
@@ -0,0 +1,1 @@
+fix_uppix_dnd2share_backend.patch

=== modified file 'dnd2share/src/applet-backend-uppix.c'
--- dnd2share/src/applet-backend-uppix.c	2011-04-20 20:46:51 +0000
+++ dnd2share/src/applet-backend-uppix.c	2011-07-28 10:10:29 +0000
@@ -44,7 +44,7 @@
 	close(fds);
 	
 	// On lance la commande d'upload.
-	gchar *cCommand = g_strdup_printf ("curl --connect-timeout 5 --retry 2 --limit-rate %dk uppix.net -F myimage=@\"%s\" -F submit=Upload -F formup=1 -o \"%s\"", iLimitRate, cFilePath, cLogFile);  /// peut-on ajouter le nom de l'auteur dans le formulaire ?...
+	gchar *cCommand = g_strdup_printf ("curl --connect-timeout 5 --retry 2 --limit-rate %dk uppix.net -H Expect: -F myimage=@\"%s\" -F submit=Upload -F formup=1 -o \"%s\"", iLimitRate, cFilePath, cLogFile);
 	cd_debug ("%s", cCommand);
 	int r = system (cCommand);
 	g_free (cCommand);

=== 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-28 10:10:29 +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-28 10:10:29 +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);