[gdl] Deprecated GDL_DOCK_IN_REFLOW

[Sebastien Granjoux <sgranjoux src gnome org>]

commit ae62347889cd9124efd707f37cde81433f5bece9
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Fri Aug 3 16:34:04 2012 +0200

    Deprecated GDL_DOCK_IN_REFLOW

 gdl/gdl-dock-item.c   |    2 --
 gdl/gdl-dock-master.c |    4 ++--
 gdl/gdl-dock-object.c |    2 --
 gdl/gdl-dock-object.h |    4 ++++
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gdl/gdl-dock-item.c b/gdl/gdl-dock-item.c
index c25abb4..b17253a 100644
--- a/gdl/gdl-dock-item.c
+++ b/gdl/gdl-dock-item.c
@@ -1591,7 +1591,6 @@ gdl_dock_item_dock (GdlDockObject    *object,
     {
         /* ref ourselves since we could be destroyed when detached */
         g_object_ref (object);
-        GDL_DOCK_OBJECT_SET_FLAGS (object, GDL_DOCK_IN_REFLOW);
         gdl_dock_object_detach (object, FALSE);
 
         /* freeze the new parent, so reduce won't get called before it's
@@ -1618,7 +1617,6 @@ gdl_dock_item_dock (GdlDockObject    *object,
 
         /* show automatic object */
         gtk_widget_show (GTK_WIDGET (new_parent));
-        GDL_DOCK_OBJECT_UNSET_FLAGS (object, GDL_DOCK_IN_REFLOW);
         gdl_dock_object_thaw (new_parent);
 
         /* use extra docking parameter */
diff --git a/gdl/gdl-dock-master.c b/gdl/gdl-dock-master.c
index 4b3b7d8..f616b5d 100644
--- a/gdl/gdl-dock-master.c
+++ b/gdl/gdl-dock-master.c
@@ -736,7 +736,7 @@ item_dock_cb (GdlDockObject    *object,
     /* here we are in fact interested in the requestor, since it's
      * assumed that object will not change its visibility... for the
      * requestor, however, could mean that it's being shown */
-    if (!GDL_DOCK_OBJECT_IN_REFLOW (requestor) &&
+    if (!gdl_dock_object_is_frozen (requestor) &&
         !gdl_dock_object_is_automatic (requestor)) {
         if (!master->priv->idle_layout_changed_id)
             master->priv->idle_layout_changed_id =
@@ -754,7 +754,7 @@ item_detach_cb (GdlDockObject *object,
     g_return_if_fail (object && GDL_IS_DOCK_OBJECT (object));
     g_return_if_fail (master && GDL_IS_DOCK_MASTER (master));
 
-    if (!GDL_DOCK_OBJECT_IN_REFLOW (object) &&
+    if (!gdl_dock_object_is_frozen (object) &&
         !gdl_dock_object_is_automatic (object)) {
         if (!master->priv->idle_layout_changed_id)
             master->priv->idle_layout_changed_id =
diff --git a/gdl/gdl-dock-object.c b/gdl/gdl-dock-object.c
index b5066e6..61b17ce 100644
--- a/gdl/gdl-dock-object.c
+++ b/gdl/gdl-dock-object.c
@@ -501,10 +501,8 @@ gdl_dock_object_real_reduce (GdlDockObject *object)
 
             g_object_ref (child);
             gdl_dock_object_detach (child, FALSE);
-            GDL_DOCK_OBJECT_SET_FLAGS (child, GDL_DOCK_IN_REFLOW);
             if (parent)
                 dchildren = g_list_append (dchildren, child);
-            GDL_DOCK_OBJECT_UNSET_FLAGS (child, GDL_DOCK_IN_REFLOW);
         }
         /* Now it can be detached */
         gdl_dock_object_detach (object, FALSE);
diff --git a/gdl/gdl-dock-object.h b/gdl/gdl-dock-object.h
index c5eb7d6..877d247 100644
--- a/gdl/gdl-dock-object.h
+++ b/gdl/gdl-dock-object.h
@@ -211,14 +211,18 @@ struct _GdlDockObjectClass {
     ((GDL_DOCK_OBJECT_FLAGS (obj) & GDL_DOCK_ATTACHED) != 0)
 #endif
 
+#ifndef GDL_DISABLE_DEPRECATED
 /**
  * GDL_DOCK_OBJECT_IN_REFLOW:
  * @obj: A #GdlDockObject
  *
  * Evaluates to %TRUE if the object is currently rearranged.
+ *
+ * Deprecated: 3.6: Use gdl_dock_object_is_frozen()
  */
 #define GDL_DOCK_OBJECT_IN_REFLOW(obj) \
     ((GDL_DOCK_OBJECT_FLAGS (obj) & GDL_DOCK_IN_REFLOW) != 0)
+#endif
 
 #ifndef GDL_DISABLE_DEPRECATED
 /**