[gdl] Fix bgo #667158 - Constructor for GdlDockBar loses 'dock' argument with gobject introspection

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 4ed3a2d82eba460c96779703470a1c0b2da5f726
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Fri Aug 3 21:55:20 2012 +0200

    Fix bgo #667158 - Constructor for GdlDockBar loses 'dock' argument with gobject introspection

 gdl/gdl-dock-bar.c |   46 +++++++++++++++++++++++++++++-----------------
 gdl/gdl-dock-bar.h |   19 ++++++++++---------
 gdl/test-dock.c    |    2 +-
 3 files changed, 40 insertions(+), 27 deletions(-)
---
diff --git a/gdl/gdl-dock-bar.c b/gdl/gdl-dock-bar.c
index 6a6f61b..f1e7a2e 100644
--- a/gdl/gdl-dock-bar.c
+++ b/gdl/gdl-dock-bar.c
@@ -37,10 +37,14 @@
  * @title: GdlDockBar
  * @short_description: A docking bar
  * @stability: Unstable
+ * @see_also: #GdlDockMaster
  *
- * A docking bar contains buttons representing minimized dock widgets.
- * The widget can be re-opened by clicking on it. A dock bar is associated
- * to one #GdlDock and will get all minimized widgets of this dock object.
+ * This docking bar is a widget containing a button for each iconified 
+ * #GdlDockItem widget. The widget can be re-opened by clicking on it.
+ * 
+ * A dock bar is associated with one #GdlDockMaster and will get all iconified
+ * widgets of this master. This can includes widgets from several #GdlDock
+ * objects.
  */
 
 
@@ -66,7 +70,7 @@ static void  gdl_dock_bar_set_property    (GObject         *object,
 static void  gdl_dock_bar_dispose         (GObject         *object);
 
 static void  gdl_dock_bar_attach          (GdlDockBar      *dockbar,
-                                           GdlDockMaster   *master);
+                                           GObject         *master);
 static void gdl_dock_bar_remove_item      (GdlDockBar      *dockbar,
                                            GdlDockItem     *item);
 
@@ -123,7 +127,7 @@ gdl_dock_bar_class_init (GdlDockBarClass *klass)
         g_param_spec_object ("master", _("Master"),
                              _("GdlDockMaster object which the dockbar widget "
                                "is attached to"),
-                             GDL_TYPE_DOCK_MASTER,
+                             G_TYPE_OBJECT,
                              G_PARAM_READWRITE));
 
     /**
@@ -409,10 +413,10 @@ gdl_dock_bar_layout_changed_cb (GdlDockMaster *master,
 
 static void
 gdl_dock_bar_attach (GdlDockBar    *dockbar,
-                     GdlDockMaster *master)
+                     GObject       *master)
 {
     g_return_if_fail (dockbar != NULL);
-    g_return_if_fail (master == NULL || GDL_IS_DOCK_MASTER (master));
+    g_return_if_fail (master == NULL || GDL_IS_DOCK_MASTER (master) || GDL_IS_DOCK_OBJECT (master));
 
     if (dockbar->priv->master) {
         g_signal_handler_disconnect (dockbar->priv->master,
@@ -420,7 +424,12 @@ gdl_dock_bar_attach (GdlDockBar    *dockbar,
         g_object_unref (dockbar->priv->master);
     }
 
-    dockbar->priv->master = master;
+    /* Accept a GdlDockObject instead of a GdlDockMaster */
+    if (GDL_IS_DOCK_OBJECT (master)) {
+        master = gdl_dock_object_get_master (GDL_DOCK_OBJECT (master));
+    }
+    
+    dockbar->priv->master = (GdlDockMaster *)master;
     if (dockbar->priv->master) {
         g_object_ref (dockbar->priv->master);
         dockbar->priv->layout_changed_id =
@@ -435,20 +444,17 @@ gdl_dock_bar_attach (GdlDockBar    *dockbar,
 
 /**
  * gdl_dock_bar_new:
- * @dock: The associated #GdlDock object
+ * @master: (allow-node): The associated #GdlDockMaster or #GdlDockObject object
  *
- * Creates a new GDL dock bar.
+ * Creates a new GDL dock bar. If a #GdlDockObject is used, the dock bar will
+ * be associated with the master of this object.
  *
  * Returns: The newly created dock bar.
  */
 GtkWidget *
-gdl_dock_bar_new (GdlDock *dock)
+gdl_dock_bar_new (GObject *master)
 {
-    GdlDockMaster *master = NULL;
-
-    /* get the master of the given dock */
-    if (dock)
-        master = GDL_DOCK_MASTER (gdl_dock_object_get_master (GDL_DOCK_OBJECT (dock)));
+    g_return_val_if_fail (master == NULL || GDL_IS_DOCK_MASTER (master) || GDL_IS_DOCK_OBJECT (master), NULL);
 
     return g_object_new (GDL_TYPE_DOCK_BAR,
                          "master", master, NULL);
@@ -462,8 +468,10 @@ gdl_dock_bar_new (GdlDock *dock)
  * Set the style of the @dockbar.
  */
 void gdl_dock_bar_set_style(GdlDockBar* dockbar,
-			    GdlDockBarStyle style)
+                            GdlDockBarStyle style)
 {
+    g_return_if_fail (GDL_IS_DOCK_BAR (dockbar));
+
     g_object_set(G_OBJECT(dockbar), "dockbar-style", style, NULL);
 }
 
@@ -478,6 +486,10 @@ void gdl_dock_bar_set_style(GdlDockBar* dockbar,
 GdlDockBarStyle gdl_dock_bar_get_style(GdlDockBar* dockbar)
 {
     GdlDockBarStyle style;
+
+    g_return_if_fail (GDL_IS_DOCK_BAR (dockbar));
+
     g_object_get(G_OBJECT(dockbar), "dockbar-style", &style, NULL);
+
     return style;
 }
diff --git a/gdl/gdl-dock-bar.h b/gdl/gdl-dock-bar.h
index 2d78789..1e4f63a 100644
--- a/gdl/gdl-dock-bar.h
+++ b/gdl/gdl-dock-bar.h
@@ -63,8 +63,9 @@ struct _GdlDockBar {
     GtkBox parent;
 
     /*< private >*/
+#ifndef GDL_DISABLE_DEPRECATED    
     GdlDock *dock;
-
+#endif
     GdlDockBarPrivate *priv;
 };
 
@@ -72,18 +73,18 @@ struct _GdlDockBarClass {
     GtkBoxClass parent_class;
 };
 
-GType      gdl_dock_bar_get_type            (void);
+GType           gdl_dock_bar_get_type       (void);
 
-GtkWidget *gdl_dock_bar_new                 (GdlDock     *dock);
+GtkWidget      *gdl_dock_bar_new            (GObject           *master);
 
-void           gdl_dock_bar_set_style       (GdlDockBar *dockbar,
-                                             GdlDockBarStyle style);
-GdlDockBarStyle gdl_dock_bar_get_style      (GdlDockBar *dockbar);
+void            gdl_dock_bar_set_style      (GdlDockBar        *dockbar,
+                                             GdlDockBarStyle    style);
+GdlDockBarStyle gdl_dock_bar_get_style      (GdlDockBar        *dockbar);
 
 #ifndef GDL_DISABLE_DEPRECATED
-GtkOrientation gdl_dock_bar_get_orientation (GdlDockBar *dockbar) G_GNUC_DEPRECATED_FOR(gtk_orientable_get_orientation);
-void           gdl_dock_bar_set_orientation (GdlDockBar *dockbar,
-                                             GtkOrientation orientation) G_GNUC_DEPRECATED_FOR(gtk_orientable_set_orientation);
+GtkOrientation gdl_dock_bar_get_orientation (GdlDockBar        *dockbar) G_GNUC_DEPRECATED_FOR(gtk_orientable_get_orientation);
+void           gdl_dock_bar_set_orientation (GdlDockBar        *dockbar,
+                                             GtkOrientation     orientation) G_GNUC_DEPRECATED_FOR(gtk_orientable_set_orientation);
 #endif
 
 G_END_DECLS
diff --git a/gdl/test-dock.c b/gdl/test-dock.c
index 953f563..b92100c 100644
--- a/gdl/test-dock.c
+++ b/gdl/test-dock.c
@@ -205,7 +205,7 @@ main (int argc, char **argv)
 	layout = gdl_dock_layout_new (GDL_DOCK (dock));
 
 	/* create the dockbar */
-	dockbar = gdl_dock_bar_new (GDL_DOCK (dock));
+	dockbar = gdl_dock_bar_new (G_OBJECT (dock));
     gdl_dock_bar_set_style(GDL_DOCK_BAR(dockbar), GDL_DOCK_BAR_TEXT);
 
 	box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);