[Pkg-xfce-commits] r6210 - in goodies/trunk/squeeze/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-11-16 21:44:16 +0000 (Wed, 16 Nov 2011)
New Revision: 6210

Added:
   goodies/trunk/squeeze/debian/patches/02_fix-segfault-open-files.patch
Modified:
   goodies/trunk/squeeze/debian/changelog
   goodies/trunk/squeeze/debian/patches/series
Log:
* debian/patches:
  - 02_fix-segfault-open-files added, thanks to Ibragimov Rinat, fix
    segfault when trying to open files in an archive.         closes: #475072

Modified: goodies/trunk/squeeze/debian/changelog
===================================================================
--- goodies/trunk/squeeze/debian/changelog	2011-11-16 06:14:47 UTC (rev 6209)
+++ goodies/trunk/squeeze/debian/changelog	2011-11-16 21:44:16 UTC (rev 6210)
@@ -1,3 +1,11 @@
+squeeze (0.2.3-11) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 02_fix-segfault-open-files added, thanks to Ibragimov Rinat, fix
+      segfault when trying to open files in an archive.         closes: #475072
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 15 Nov 2011 14:51:07 +0100
+
 squeeze (0.2.3-10) unstable; urgency=low
 
   * debian/rules:

Added: goodies/trunk/squeeze/debian/patches/02_fix-segfault-open-files.patch
===================================================================
--- goodies/trunk/squeeze/debian/patches/02_fix-segfault-open-files.patch	                        (rev 0)
+++ goodies/trunk/squeeze/debian/patches/02_fix-segfault-open-files.patch	2011-11-16 21:44:16 UTC (rev 6210)
@@ -0,0 +1,38 @@
+diff --git a/libsqueeze/xfce-launch-command.c b/libsqueeze/xfce-launch-command.c
+index 26587a7..3aff671 100644
+--- a/libsqueeze/xfce-launch-command.c
++++ b/libsqueeze/xfce-launch-command.c
+@@ -157,6 +157,6 @@ lsq_xfce_launch_command_execute(LSQArchiveCommand *command)
+ 	LSQXfceLaunchCommand *xfce_launch_command = LSQ_XFCE_LAUNCH_COMMAND(command);
+ 	
+ 	/* args */
+-	dbus_g_proxy_call(xfce_launch_command->proxy, "Launch", NULL, G_TYPE_STRING, xfce_launch_command->files, G_TYPE_STRING, "",  NULL);
++	dbus_g_proxy_call(xfce_launch_command->proxy, "Launch", NULL, G_TYPE_STRING, xfce_launch_command->files, G_TYPE_STRING, "", G_TYPE_STRING, "", NULL);
+ 	return TRUE;
+ }
+diff --git a/src/archive_store.c b/src/archive_store.c
+index a9d0794..58956fb 100644
+--- a/src/archive_store.c
++++ b/src/archive_store.c
+@@ -312,7 +312,7 @@ sq_archive_store_class_init(SQArchiveStoreClass *as_class)
+ 		 g_cclosure_marshal_VOID__POINTER,
+ 		 G_TYPE_NONE,
+ 		 1,
+-		 G_TYPE_STRING,
++		 G_TYPE_POINTER,
+ 		 NULL);
+ }
+ 
+diff --git a/src/notebook.c b/src/notebook.c
+index bff5ef8..045f984 100644
+--- a/src/notebook.c
++++ b/src/notebook.c
+@@ -160,7 +160,7 @@ sq_notebook_class_init(SQNotebookClass *notebook_class)
+ 			G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 0,
+ 			NULL, NULL,
+ 			g_cclosure_marshal_VOID__POINTER,
+-			G_TYPE_NONE, 1, G_TYPE_STRING, NULL);
++			G_TYPE_NONE, 1, G_TYPE_POINTER, NULL);
+ 
+ 	sq_notebook_signals[SQ_NOTEBOOK_SIGNAL_STATE_CHANGED] = g_signal_new("archive-state-changed",
+ 			G_TYPE_FROM_CLASS(notebook_class),

Modified: goodies/trunk/squeeze/debian/patches/series
===================================================================
--- goodies/trunk/squeeze/debian/patches/series	2011-11-16 06:14:47 UTC (rev 6209)
+++ goodies/trunk/squeeze/debian/patches/series	2011-11-16 21:44:16 UTC (rev 6210)
@@ -1 +1,2 @@
 01_fix-format-string.patch
+02_fix-segfault-open-files.patch