Another fix to avoid further fallout from the fix for bug 388321.

2007-12-10  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtknotebook.c (gtk_notebook_real_remove): Another fix
        to avoid further fallout from the fix for bug 388321.

svn path=/trunk/; revision=19139

diff --git a/ChangeLog b/ChangeLog
index 27ab377642be9d7ec6ea6ad0549ffe4f3b0aa2a2..a2acf30e7b673f789b85294b76585517d46d072d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-10  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_real_remove): Another fix
+       to avoid further fallout from the fix for bug 388321.
+
 2007-12-09 09:56:06  Attilio Fiandrotti  <attilio.fiandrotti@gmail.com>
 
        * gdk/directfb/gdkgc-directfb.c:

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 55acbf5b99847e21158da813d336ab91b2ecfbe8..80e18fdba595b7553a827eda11f2e6b5268a6954 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -4349,12 +4349,15 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
   gtk_widget_unparent (page->child);
 
   tab_label = page->tab_label;
-  g_object_ref (tab_label);
-  gtk_notebook_remove_tab_label (notebook, page);
-  if (destroying)
-    gtk_widget_destroy (tab_label);
-  g_object_unref (tab_label);
-  
+  if (tab_label)
+    {
+      g_object_ref (tab_label);
+      gtk_notebook_remove_tab_label (notebook, page);
+      if (destroying)
+        gtk_widget_destroy (tab_label);
+      g_object_unref (tab_label);
+    } 
+
   if (notebook->menu)
     {
       gtk_container_remove (GTK_CONTAINER (notebook->menu),