[Pspp-cvs] pspp/lib/gtksheet ChangeLog gtksheet.c

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 08/05/09 00:00:33

Modified files:
        lib/gtksheet   : ChangeLog gtksheet.c 

Log message:
        Don't call gtk_widget_unparent on sheet->button if it's null.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/ChangeLog?cvsroot=pspp&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gtksheet.c?cvsroot=pspp&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/lib/gtksheet/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- ChangeLog   7 May 2008 00:09:00 -0000       1.25
+++ ChangeLog   9 May 2008 00:00:32 -0000       1.26
@@ -1,3 +1,10 @@
+2008-05-08  Ben Pfaff  <address@hidden>
+
+       Patch #6506.  Reviewed by John Darrington.
+
+       * gtksheet.c (gtk_sheet_unrealize): Don't call gtk_widget_unparent
+       on sheet->button if it's null.
+
 2008-05-06  Ben Pfaff  <address@hidden>
 
        * gtksheet.c (gtk_sheet_dispose): Set the sheet's entry_container

Index: gtksheet.c
===================================================================
RCS file: /cvsroot/pspp/pspp/lib/gtksheet/gtksheet.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- gtksheet.c  7 May 2008 00:09:00 -0000       1.47
+++ gtksheet.c  9 May 2008 00:00:33 -0000       1.48
@@ -2725,6 +2725,7 @@
   sheet->bg_gc = NULL;
 
   gtk_widget_unparent (sheet->entry_widget);
+  if (sheet->button != NULL)
   gtk_widget_unparent (sheet->button);
 
   if (GTK_WIDGET_CLASS (parent_class)->unrealize)