[Monodevelop-patches-list] r814 - trunk/MonoDevelop/gdldock/sources/gdl

[commit-watcher at mono-cvs.ximian.com]

Author: jzwart
Date: 2004-02-07 18:57:58 -0500 (Sat, 07 Feb 2004)
New Revision: 814

Modified:
   trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-bar.c
   trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item.c
Log:
Updates from gdl module.



Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-bar.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-bar.c	2004-02-07 23:25:01 UTC (rev 813)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-bar.c	2004-02-07 23:57:58 UTC (rev 814)
@@ -286,8 +286,12 @@
     for (l = items; l != NULL; l = l->next) {
         GdlDockItem *item = GDL_DOCK_ITEM (l->data);
         
-        if (GDL_DOCK_ITEM_ICONIFIED (item))
-	        gdl_dock_bar_add_item (dockbar, item);
+        if (g_slist_index (dockbar->_priv->items, item) != -1 &&
+            !GDL_DOCK_ITEM_ICONIFIED (item))
+	    gdl_dock_bar_remove_item (dockbar, item);
+	else if (g_slist_index (dockbar->_priv->items, item) == -1 &&
+	    GDL_DOCK_ITEM_ICONIFIED (item))
+	    gdl_dock_bar_add_item (dockbar, item);
     }
     
     g_list_free (items);

Modified: trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item.c
===================================================================
--- trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item.c	2004-02-07 23:25:01 UTC (rev 813)
+++ trunk/MonoDevelop/gdldock/sources/gdl/gdl-dock-item.c	2004-02-07 23:57:58 UTC (rev 814)
@@ -1605,6 +1605,8 @@
 {
     g_return_if_fail (item != NULL);
 
+    GDL_DOCK_OBJECT_UNSET_FLAGS (item, GDL_DOCK_ICONIFIED);
+
     if (item->_priv->ph) {
         gtk_container_add (GTK_CONTAINER (item->_priv->ph), GTK_WIDGET (item));
         g_object_unref (item->_priv->ph);