[gdl] Fix automatic flags in GdlDockItem



commit 012c40ede62ccad22ecdbf66e1c634df7e6d1a29
Author: Johannes Schmid <jhs gnome org>
Date:   Sun May 2 21:56:04 2010 +0200

    Fix automatic flags in GdlDockItem
    
    Actually only widgets that are construted by the _new methods should have the automatic flag
    unset. Maybe if would be better to make this a construct property but that fixes layout loading
    for now at least.

 gdl/gdl-dock-item.c        |    4 +++-
 gdl/gdl-dock-placeholder.c |    3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gdl/gdl-dock-item.c b/gdl/gdl-dock-item.c
index 7c8f786..70f335e 100644
--- a/gdl/gdl-dock-item.c
+++ b/gdl/gdl-dock-item.c
@@ -479,7 +479,6 @@ gdl_dock_item_constructor (GType                  type,
         else {
             item->_priv->grip_shown = FALSE;
         }
-        GDL_DOCK_OBJECT_UNSET_FLAGS (item, GDL_DOCK_AUTOMATIC);
 
         g_object_get (g_object, "long-name", &long_name, "stock-id", &stock_id, NULL);
 
@@ -1687,6 +1686,7 @@ gdl_dock_item_new (const gchar         *name,
                                         "long-name", long_name,
                                         "behavior", behavior,
                                         NULL));
+    GDL_DOCK_OBJECT_UNSET_FLAGS (item, GDL_DOCK_AUTOMATIC);
 
     return GTK_WIDGET (item);
 }
@@ -1717,6 +1717,8 @@ gdl_dock_item_new_with_stock (const gchar         *name,
                                         "stock-id", stock_id,
                                         "behavior", behavior,
                                         NULL));
+    GDL_DOCK_OBJECT_UNSET_FLAGS (item, GDL_DOCK_AUTOMATIC);
+    
     return GTK_WIDGET (item);
 }
 
diff --git a/gdl/gdl-dock-placeholder.c b/gdl/gdl-dock-placeholder.c
index b265b09..58cf586 100644
--- a/gdl/gdl-dock-placeholder.c
+++ b/gdl/gdl-dock-placeholder.c
@@ -220,8 +220,6 @@ gdl_dock_placeholder_instance_init (GdlDockPlaceholder *ph)
     GTK_WIDGET_UNSET_FLAGS (ph, GTK_CAN_FOCUS);
     
     ph->_priv = g_new0 (GdlDockPlaceholderPrivate, 1);
-
-    GDL_DOCK_OBJECT_UNSET_FLAGS (ph, GDL_DOCK_AUTOMATIC);
 }
 
 static void 
@@ -554,6 +552,7 @@ gdl_dock_placeholder_new (const gchar     *name,
                                              "next-placement", position,
                                              "host", object,
                                              NULL));
+    GDL_DOCK_OBJECT_UNSET_FLAGS (ph, GDL_DOCK_AUTOMATIC);
     
     return GTK_WIDGET (ph);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]