[Xfce4-commits] r26046 - in xfce4-panel/branches/xfce_4_4: . panel

[Nick Schermer]

Author: nick
Date: 2007-09-05 11:54:36 +0000 (Wed, 05 Sep 2007)
New Revision: 26046

Modified:
   xfce4-panel/branches/xfce_4_4/NEWS
   xfce4-panel/branches/xfce_4_4/panel/panel-dialogs.c
Log:
* Fix crash in Gtk 2.11. The combobox returns -1 when
  removing the panel, which results in a wrong pointer
  and ends in a segfault.


Modified: xfce4-panel/branches/xfce_4_4/NEWS
===================================================================
--- xfce4-panel/branches/xfce_4_4/NEWS	2007-09-04 22:43:30 UTC (rev 26045)
+++ xfce4-panel/branches/xfce_4_4/NEWS	2007-09-05 11:54:36 UTC (rev 26046)
@@ -18,7 +18,7 @@
 - Fix possible buffer overflow in launcher tooltips (bug #3324). (Jasper)
 - Use 'exo-open --launch TerminalEmulator' in the default configuration
   (Bug #3384). (Nick)
--
+- Fix crash when removing a panel in Gtk+ 2.11.x (Nick)
 
 
 4.4.1

Modified: xfce4-panel/branches/xfce_4_4/panel/panel-dialogs.c
===================================================================
--- xfce4-panel/branches/xfce_4_4/panel/panel-dialogs.c	2007-09-04 22:43:30 UTC (rev 26045)
+++ xfce4-panel/branches/xfce_4_4/panel/panel-dialogs.c	2007-09-05 11:54:36 UTC (rev 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;