From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 20 Jun 2015 01:56:29 +0000 (-0400)
Subject: GtkAssistant: Fix criticals on dispose
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~9326
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f8e4f2685a38d92bfb7b03159bc2640f6eff011;p=gtk4.git

GtkAssistant: Fix criticals on dispose

After the recent change thta introduced boxes between the pages
and the notebook, we were no longer careful enough when disposing
the assistant. Fix that up.
---

diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 3d989637d2..b6d2d82d6a 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -1472,7 +1472,9 @@ gtk_assistant_remove (GtkContainer *container,
 
   /* Forward this removal to the content notebook */
   box = gtk_widget_get_parent (page);
-  if (gtk_widget_get_parent (box) == assistant->priv->content)
+  if (GTK_IS_BOX (box) &&
+      assistant->priv->content != NULL &&
+      gtk_widget_get_parent (box) == assistant->priv->content)
     {
       container = (GtkContainer *) assistant->priv->content;
       gtk_container_remove (container, box);