gdl r546 - in trunk: . gdl

[jhs svn gnome org]

Author: jhs
Date: Thu Apr  2 22:09:44 2009
New Revision: 546
URL: http://svn.gnome.org/viewvc/gdl?rev=546&view=rev

Log:
2009-04-03  Johannes Schmid  <jhs gnome org>

	* gdl/gdl-dock-bar.c (gdl_dock_bar_add_item):
	* gdl/gdl-dock-item-grip.c (gdl_dock_item_grip_set_label):
	* gdl/gdl-dock-item.c (gdl_dock_item_set_tablabel),
	(gdl_dock_item_hide_item), (gdl_dock_item_set_default_position):
	* gdl/gdl-dock-master.c (gdl_dock_master_add):
	* gdl/gdl-dock-object.c (gdl_dock_object_real_reduce):
	* gdl/gdl-dock-object.h:
	* gdl/gdl-dock-placeholder.c (gdl_dock_placeholder_dock):
	* gdl/gdl-stock.c (icon_set_from_data):
	#577469 â Remove deprecated GTK+ symbols

Modified:
   trunk/ChangeLog
   trunk/gdl/gdl-dock-bar.c
   trunk/gdl/gdl-dock-item-grip.c
   trunk/gdl/gdl-dock-item.c
   trunk/gdl/gdl-dock-master.c
   trunk/gdl/gdl-dock-object.c
   trunk/gdl/gdl-dock-object.h
   trunk/gdl/gdl-dock-placeholder.c
   trunk/gdl/gdl-stock.c

Modified: trunk/gdl/gdl-dock-bar.c
==============================================================================
--- trunk/gdl/gdl-dock-bar.c	(original)
+++ trunk/gdl/gdl-dock-bar.c	Thu Apr  2 22:09:44 2009
@@ -299,7 +299,7 @@
         label = gtk_label_new (name);
         if (dockbar->_priv->orientation == GTK_ORIENTATION_VERTICAL)
             gtk_label_set_angle (GTK_LABEL (label), 90);
-        gtk_box_pack_start_defaults (GTK_BOX (box), label);
+        gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
     }
     
     /* FIXME: For now AUTO behaves same as BOTH */
@@ -315,7 +315,7 @@
             image = gtk_image_new_from_stock (GTK_STOCK_NEW,
                                               GTK_ICON_SIZE_SMALL_TOOLBAR);
         }
-        gtk_box_pack_start_defaults (GTK_BOX (box), image);
+        gtk_box_pack_start (GTK_BOX (box), image, TRUE, TRUE, 0);
     }
     
     gtk_container_add (GTK_CONTAINER (button), box);

Modified: trunk/gdl/gdl-dock-item-grip.c
==============================================================================
--- trunk/gdl/gdl-dock-item-grip.c	(original)
+++ trunk/gdl/gdl-dock-item-grip.c	Thu Apr  2 22:09:44 2009
@@ -571,12 +571,12 @@
 
     if (grip->_priv->label) {
         gtk_widget_unparent(grip->_priv->label);
-        gtk_widget_unref (grip->_priv->label);
+        g_object_unref (grip->_priv->label);
         grip->_priv->label = NULL;
     }
     
     if (label) {
-        gtk_widget_ref (label);
+        g_object_ref (label);
         gtk_widget_set_parent (label, GTK_WIDGET (grip));
         gtk_widget_show (label);
         grip->_priv->label = label;

Modified: trunk/gdl/gdl-dock-item.c
==============================================================================
--- trunk/gdl/gdl-dock-item.c	(original)
+++ trunk/gdl/gdl-dock-item.c	Thu Apr  2 22:09:44 2009
@@ -1772,13 +1772,12 @@
                                                   NULL, item);
             g_object_set (item->_priv->tab_label, "item", NULL, NULL);
         }
-        gtk_widget_unref (item->_priv->tab_label);
+        g_object_unref (item->_priv->tab_label);
         item->_priv->tab_label = NULL;
     }
     
     if (tablabel) {
-        gtk_widget_ref (tablabel);
-        gtk_object_sink (GTK_OBJECT (tablabel));
+        g_object_ref_sink (G_OBJECT (tablabel));
         item->_priv->tab_label = tablabel;
         if (GDL_IS_DOCK_TABLABEL (tablabel)) {
             g_object_set (tablabel, "item", item, NULL);
@@ -1925,8 +1924,7 @@
                           "floatx", x,
                           "floaty", y,
                           NULL));
-        g_object_ref (item->_priv->ph);
-        gtk_object_sink (GTK_OBJECT (item->_priv->ph));
+        g_object_ref_sink (item->_priv->ph);
     }
     
     gdl_dock_object_freeze (GDL_DOCK_OBJECT (item));
@@ -2069,8 +2067,7 @@
 
     if (reference && GDL_DOCK_OBJECT_ATTACHED (reference)) {
         if (GDL_IS_DOCK_PLACEHOLDER (reference)) {
-            g_object_ref (reference);
-            gtk_object_sink (GTK_OBJECT (reference));
+            g_object_ref_sink (reference);
             item->_priv->ph = GDL_DOCK_PLACEHOLDER (reference);
         } else {
             item->_priv->ph = GDL_DOCK_PLACEHOLDER (
@@ -2078,8 +2075,7 @@
                               "sticky", TRUE,
                               "host", reference,
                               NULL));
-            g_object_ref (item->_priv->ph);
-            gtk_object_sink (GTK_OBJECT (item->_priv->ph));
+            g_object_ref_sink (item->_priv->ph);
         }
     }
 }

Modified: trunk/gdl/gdl-dock-master.c
==============================================================================
--- trunk/gdl/gdl-dock-master.c	(original)
+++ trunk/gdl/gdl-dock-master.c	Thu Apr  2 22:09:44 2009
@@ -763,8 +763,7 @@
                        master, object, object->name, found_object);
         }
         else {
-            g_object_ref (object);
-            gtk_object_sink (GTK_OBJECT (object));
+            g_object_ref_sink (object);
             g_hash_table_insert (master->dock_objects, g_strdup (object->name), object);
         }
     }

Modified: trunk/gdl/gdl-dock-object.c
==============================================================================
--- trunk/gdl/gdl-dock-object.c	(original)
+++ trunk/gdl/gdl-dock-object.c	Thu Apr  2 22:09:44 2009
@@ -425,7 +425,7 @@
         
         
         /* sink the widget, so any automatic floating widget is destroyed */
-        gtk_object_sink (GTK_OBJECT (object));
+        g_object_ref_sink (object);
         /* don't reenter */
         object->reduce_pending = FALSE;
         gdl_dock_object_thaw (object);

Modified: trunk/gdl/gdl-dock-object.h
==============================================================================
--- trunk/gdl/gdl-dock-object.h	(original)
+++ trunk/gdl/gdl-dock-object.h	Thu Apr  2 22:09:44 2009
@@ -212,7 +212,7 @@
 	   __PRETTY_FUNCTION__,               \
            G_OBJECT_TYPE_NAME (object), object, \
            G_OBJECT (object)->ref_count, \
-           (GTK_IS_OBJECT (object) && GTK_OBJECT_FLOATING (object)) ? "(float)" : "", \
+           (GTK_IS_OBJECT (object) && g_object_is_floating (object)) ? "(float)" : "", \
            GDL_IS_DOCK_OBJECT (object) ? GDL_DOCK_OBJECT (object)->freeze_count : -1, \
 	   ##args); } G_STMT_END                   
     

Modified: trunk/gdl/gdl-dock-placeholder.c
==============================================================================
--- trunk/gdl/gdl-dock-placeholder.c	(original)
+++ trunk/gdl/gdl-dock-placeholder.c	Thu Apr  2 22:09:44 2009
@@ -491,7 +491,7 @@
         GdlDockObject *toplevel;
         
         if (!gdl_dock_object_is_bound (GDL_DOCK_OBJECT (ph))) {
-            g_warning (_("Attempt to dock a dock object to an unbound placeholder"));
+            g_warning ("%s", _("Attempt to dock a dock object to an unbound placeholder"));
             return;
         }
         

Modified: trunk/gdl/gdl-stock.c
==============================================================================
--- trunk/gdl/gdl-stock.c	(original)
+++ trunk/gdl/gdl-stock.c	Thu Apr  2 22:09:44 2009
@@ -59,7 +59,7 @@
 	
 	pixbuf = gdk_pixbuf_new_from_inline (data_size, icon_data, FALSE, &err);
 	if (err) {
-	    g_warning (err->message);
+	    g_warning ("%s", err->message);
 	    g_error_free (err);
 	    err = NULL;
 	    g_object_unref (source);