[Pkg-xfce-commits] r1381 - in desktop/trunk/xfce4-panel/debian: . patches

[corsac-guest at alioth.debian.org]

Author: corsac-guest
Date: 2007-10-13 20:47:54 +0000 (Sat, 13 Oct 2007)
New Revision: 1381

Added:
   desktop/trunk/xfce4-panel/debian/patches/02_fix-segfault-gtk2.11.patch
Modified:
   desktop/trunk/xfce4-panel/debian/changelog
   desktop/trunk/xfce4-panel/debian/patches/series
Log:
fix segfault with gtk 2.11+


Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog	2007-10-13 12:51:41 UTC (rev 1380)
+++ desktop/trunk/xfce4-panel/debian/changelog	2007-10-13 20:47:54 UTC (rev 1381)
@@ -5,13 +5,15 @@
 
   [ Yves-Alexis Perez ]
   * debian/xfce4-panel.1: update bug reporting in manpage.
-  * debian/xfce4-panel.postinst: use posix kill -s            closes:  #374618
+  * debian/xfce4-panel.postinst: use posix kill -s              closes: #374618
+  * debian/patches: added 02_fix-segfault-gtk2.11.patch, fix segfault when
+    removing a panel.                                           closes: #446536
 
   [ Simon Huggins ]
   * debian/xfce4-panel.prerm: Use kill -s to keep Hurd and lintian happy at
     the same time.
 
- -- Simon Huggins <huggie at earth.li>  Mon, 08 Oct 2007 18:46:21 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net>  Sat, 13 Oct 2007 22:32:53 +0200
 
 xfce4-panel (4.4.1-1) unstable; urgency=low
 

Added: desktop/trunk/xfce4-panel/debian/patches/02_fix-segfault-gtk2.11.patch
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/02_fix-segfault-gtk2.11.patch	                        (rev 0)
+++ desktop/trunk/xfce4-panel/debian/patches/02_fix-segfault-gtk2.11.patch	2007-10-13 20:47:54 UTC (rev 1381)
@@ -0,0 +1,13 @@
+Index: xfce4-panel/panel/panel-dialogs.c
+===================================================================
+--- xfce4-panel/panel/panel-dialogs.c	(revision 26045)
++++ xfce4-panel/panel/panel-dialogs.c	(revision 26046)
+@@ -1429,7 +1429,7 @@
+ {
+     int n = gtk_combo_box_get_active (combo);
+ 
+-    if (n == pmd->current)
++    if (n == pmd->current || n < 0)
+         return;
+ 
+     pmd->current = n;

Modified: desktop/trunk/xfce4-panel/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/series	2007-10-13 12:51:41 UTC (rev 1380)
+++ desktop/trunk/xfce4-panel/debian/patches/series	2007-10-13 20:47:54 UTC (rev 1381)
@@ -0,0 +1 @@
+02_fix-segfault-gtk2.11.patch