From: Ben Pfaff <blp@gnu.org>
Date: Fri, 9 May 2008 00:00:32 +0000 (+0000)
Subject: Don't call gtk_widget_unparent on sheet->button if it's null.
X-Git-Tag: v0.6.0~18
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00defa614a40d7c4d6c6932c3405bbd8c1415811;p=pspp-builds.git

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

diff --git a/lib/gtksheet/ChangeLog b/lib/gtksheet/ChangeLog
index 910c15d9..b5ba1c82 100644
--- 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 1f0e83fa..942b0233 100644
--- 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);