GDL: rebase on upstream commit 19723 (2010-04-18)

(bzr r10789)

3 files changed, 19 insertions, 20 deletions

diff --git a/src/libgdl/gdl-dock-item-grip.c b/src/libgdl/gdl-dock-item-grip.c
index c5eb6f370..1272b950a 100644
--- a/src/libgdl/gdl-dock-item-grip.c
+++ b/src/libgdl/gdl-dock-item-grip.c
@@ -491,13 +491,13 @@ gdl_dock_item_grip_size_request (GtkWidget      *widget,
 
     gtk_widget_size_request (grip->_priv->close_button, &child_requisition);
     layout_height = MAX (layout_height, child_requisition.height);
-    if (GTK_WIDGET_VISIBLE (grip->_priv->close_button)) {
+    if (gtk_widget_get_visible (grip->_priv->close_button)) {
        requisition->width += child_requisition.width;
     }
     
     gtk_widget_size_request (grip->_priv->iconify_button, &child_requisition);
     layout_height = MAX (layout_height, child_requisition.height);
-    if (GTK_WIDGET_VISIBLE (grip->_priv->iconify_button)) {
+    if (gtk_widget_get_visible (grip->_priv->iconify_button)) {
         requisition->width += child_requisition.width;
     }
    
@@ -547,7 +547,7 @@ gdl_dock_item_grip_size_allocate (GtkWidget     *widget,
     child_allocation.y = container->border_width;
 
     /* Layout Close Button */
-    if (GTK_WIDGET_VISIBLE (grip->_priv->close_button)) {
+    if (gtk_widget_get_visible (grip->_priv->close_button)) {
 
         if(space_for_buttons) {
             if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL)
@@ -566,7 +566,7 @@ gdl_dock_item_grip_size_allocate (GtkWidget     *widget,
     }    
 
     /* Layout Iconify Button */
-    if (GTK_WIDGET_VISIBLE (grip->_priv->iconify_button)) {
+    if (gtk_widget_get_visible (grip->_priv->iconify_button)) {
 
         if(space_for_buttons) {
             if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL)
diff --git a/src/libgdl/gdl-dock-item.c b/src/libgdl/gdl-dock-item.c
index 22f261b32..d946c0c01 100644
--- a/src/libgdl/gdl-dock-item.c
+++ b/src/libgdl/gdl-dock-item.c
@@ -896,8 +896,8 @@ gdl_dock_item_map (GtkWidget *widget)
         gtk_widget_map (item->child);
 
     if (item->_priv->grip
-        && gtk_widget_get_visible (item->_priv->grip)
-        && !gtk_widget_get_mapped (item->_priv->grip))
+        && gtk_widget_get_visible (GTK_WIDGET (item->_priv->grip))
+        && !gtk_widget_get_mapped (GTK_WIDGET (item->_priv->grip)))
         gtk_widget_map (item->_priv->grip);
 }
 
@@ -954,7 +954,7 @@ gdl_dock_item_realize (GtkWidget *widget)
   
     widget->style = gtk_style_attach (widget->style, widget->window);
     gtk_style_set_background (widget->style, widget->window, 
-                              gtk_widget_get_state (GTK_WIDGET(item)));
+                              gtk_widget_get_state (GTK_WIDGET (item)));
     gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
 
     if (item->child)
@@ -973,7 +973,9 @@ gdl_dock_item_style_set (GtkWidget *widget,
     g_return_if_fail (widget != NULL);
     g_return_if_fail (GDL_IS_DOCK_ITEM (widget));
 
-    if (gtk_widget_get_realized (widget) && gtk_widget_get_has_window (widget)) {
+    if (gtk_widget_get_realized (widget) &&
+            gtk_widget_get_has_window (widget))
+    {
         gtk_style_set_background (widget->style, widget->window,
                                   widget->state);
         if (gtk_widget_is_drawable (widget))
@@ -1481,7 +1483,7 @@ gdl_dock_item_dock (GdlDockObject    *object,
             gtk_container_add (GTK_CONTAINER (parent), GTK_WIDGET (new_parent));
 
         /* show automatic object */
-	if (gtk_widget_get_visible (GTK_WIDGET (object)))
+        if (gtk_widget_get_visible (GTK_WIDGET (object)))
         {
             gtk_widget_show (GTK_WIDGET (new_parent));
             GDL_DOCK_OBJECT_UNSET_FLAGS (object, GDL_DOCK_IN_REFLOW);
@@ -1803,7 +1805,7 @@ gdl_dock_item_new_with_pixbuf_icon (const gchar         *name,
 /**
  * gdl_dock_item_dock_to:
  * @item: The dock item that will be relocated to the dock position.
- * @target: The dock item that will be used as the point of reference.
+ * @target: (allow-none): The dock item that will be used as the point of reference.
  * @position: The position to dock #item, relative to #target.
  * @docking_param: This value is unused, and will be ignored.
  * 
diff --git a/src/libgdl/gdl-dock.c b/src/libgdl/gdl-dock.c
index 47a4f5b3d..37d17a983 100644
--- a/src/libgdl/gdl-dock.c
+++ b/src/libgdl/gdl-dock.c
@@ -551,7 +551,7 @@ gdl_dock_size_request (GtkWidget      *widget,
     border_width = container->border_width;
 
     /* make request to root */
-    if (dock->root && gtk_widget_get_visible( GTK_WIDGET(dock->root) ))
+    if (dock->root && gtk_widget_get_visible (GTK_WIDGET (dock->root)))
         gtk_widget_size_request (GTK_WIDGET (dock->root), requisition);
     else {
         requisition->width = 0;
@@ -587,9 +587,8 @@ gdl_dock_size_allocate (GtkWidget     *widget,
     allocation->width = MAX (1, allocation->width - 2 * border_width);
     allocation->height = MAX (1, allocation->height - 2 * border_width);
 
-    if (dock->root && gtk_widget_get_visible( GTK_WIDGET(dock->root) )) {
+    if (dock->root && gtk_widget_get_visible (GTK_WIDGET (dock->root)))
         gtk_widget_size_allocate (GTK_WIDGET (dock->root), allocation);
-    }
 }
 
 static void
@@ -921,16 +920,15 @@ gdl_dock_dock (GdlDockObject    *object,
 
         /* Realize the item (create its corresponding GdkWindow) when 
            GdlDock has been realized. */
-        if ( gtk_widget_get_realized( GTK_WIDGET(dock) )) {
+        if (gtk_widget_get_realized (GTK_WIDGET (dock)))
             gtk_widget_realize (widget);
-        }
 
         /* Map the widget if it's visible and the parent is visible and has 
            been mapped. This is done to make sure that the GdkWindow is 
            visible. */
-        if (gtk_widget_get_visible( GTK_WIDGET(dock) ) && 
+        if (gtk_widget_get_visible (GTK_WIDGET (dock)) && 
             gtk_widget_get_visible (widget)) {
-            if (gtk_widget_get_mapped( GTK_WIDGET(dock) ))
+            if (gtk_widget_get_mapped (GTK_WIDGET (dock)))
                 gtk_widget_map (widget);
             
             /* Make the widget resize. */
@@ -1260,11 +1258,10 @@ gdl_dock_add_floating_item (GdlDock        *dock,
                                        "floaty", y,
                                        NULL));
     
-    if (gtk_widget_get_visible( GTK_WIDGET(dock) )) {
+    if (gtk_widget_get_visible (GTK_WIDGET (dock))) {
         gtk_widget_show (GTK_WIDGET (new_dock));
-        if (gtk_widget_get_mapped( GTK_WIDGET(dock) )) {
+        if (gtk_widget_get_mapped (GTK_WIDGET (dock)))
             gtk_widget_map (GTK_WIDGET (new_dock));
-        }
         
         /* Make the widget resize. */
         gtk_widget_queue_resize (GTK_WIDGET (new_dock));