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
This commit is contained in:
Matthias Clasen 2007-12-10 06:19:53 +00:00 committed by Matthias Clasen
parent 494b0e4ca9
commit 2a702dcd42
2 changed files with 14 additions and 6 deletions

View File

@ -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:

View File

@ -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),