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

diff --git a/lib/gtksheet/ChangeLog b/lib/gtksheet/ChangeLog
index 910c15d9a314f964deea5eb4ab6118f33ee8f789..b5ba1c82cae8030b8f492bccf24aac31475db382 100644 (file)
--- a/lib/gtksheet/ChangeLog
+++ b/lib/gtksheet/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-08  Ben Pfaff  <blp@gnu.org>
+
+       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  <blp@gnu.org>
 
        * gtksheet.c (gtk_sheet_dispose): Set the sheet's entry_container

diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c
index 1f0e83fac72d6651c3e3ef79b19c240c96e00e0a..942b0233117b4641a61b9dadccbec4fed9f51866 100644 (file)
--- a/lib/gtksheet/gtksheet.c
+++ b/lib/gtksheet/gtksheet.c
@@ -2725,7 +2725,8 @@ gtk_sheet_unrealize (GtkWidget * widget)
   sheet->bg_gc = NULL;
 
   gtk_widget_unparent (sheet->entry_widget);
-  gtk_widget_unparent (sheet->button);
+  if (sheet->button != NULL)
+    gtk_widget_unparent (sheet->button);
 
   if (GTK_WIDGET_CLASS (parent_class)->unrealize)
     (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);