Set child visibility to FALSE here; it will be turned back on in

2007-03-08  Matthias Clasen <mclasen@redhat.com>

        * gtk/gtknotebook.c (gtk_notebook_real_insert_page):
        Set child visibility to FALSE here; it will be turned
        back on in switch_page.  (#413664, Carlos Garnacho)

svn path=/trunk/; revision=17434

diff --git a/ChangeLog b/ChangeLog
index 7a8a6179fe4033a4ccf510a2b77bcebfc5960457..ded01546c7d11b9538a307ce2bcdd2abe7fd7e9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-08  Matthias Clasen <mclasen@redhat.com>
+
+       * gtk/gtknotebook.c (gtk_notebook_real_insert_page):
+       Set child visibility to FALSE here; it will be turned
+       back on in switch_page.  (#413664, Carlos Garnacho)
+       
 2007-03-08  Mathias Hasselmann <mathias.hasselmann@gmx.de>
 
        * modules/engines/ms-windows/msw_style.c: Use proper border style

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index c1c95a4b191ea2c27a1ea08e5da30a4563214509..cb25de0e6d1187be0711ddbe08817dcce5879a92 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -3969,9 +3969,10 @@ gtk_notebook_real_insert_page (GtkNotebook *notebook,
   if (!menu_label)
     page->default_menu = TRUE;
   else  
-    {
-      g_object_ref_sink (page->menu_label);
-    }
+    g_object_ref_sink (page->menu_label);
+
+  /* child visible will be turned on by switch_page below */
+  gtk_widget_set_child_visible (child, FALSE);
 
   if (notebook->menu)
     gtk_notebook_menu_item_create (notebook,
@@ -3986,9 +3987,6 @@ gtk_notebook_real_insert_page (GtkNotebook *notebook,
   if (!notebook->first_tab)
     notebook->first_tab = notebook->children;
 
-  /* child visible will be turned on by switch_page below */
-  gtk_widget_set_child_visible (child, FALSE);
-  
   if (tab_label)
     {
       if (notebook->show_tabs && GTK_WIDGET_VISIBLE (child))