diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2011-07-03 11:48:35 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2011-07-03 11:48:35 +0000 |
| commit | 1cbae999d86d7804a6c9cfe8a6f8de7c4a8a4c2c (patch) | |
| tree | b7bc4440f9673385eec1ac8983fb9ef7676d567e /src/libgdl | |
| parent | GTK+ cleanup: gtk_box_pack_start_defaults (diff) | |
| download | inkscape-1cbae999d86d7804a6c9cfe8a6f8de7c4a8a4c2c.tar.gz inkscape-1cbae999d86d7804a6c9cfe8a6f8de7c4a8a4c2c.zip | |
GTK+ cleanup: gtk_object_sink
(bzr r10411)
Diffstat (limited to 'src/libgdl')
| -rw-r--r-- | src/libgdl/gdl-dock-item.c | 14 | ||||
| -rw-r--r-- | src/libgdl/gdl-dock-master.c | 3 | ||||
| -rw-r--r-- | src/libgdl/gdl-dock-object.c | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/src/libgdl/gdl-dock-item.c b/src/libgdl/gdl-dock-item.c index 3c508c0cd..c01737636 100644 --- a/src/libgdl/gdl-dock-item.c +++ b/src/libgdl/gdl-dock-item.c @@ -1786,13 +1786,12 @@ gdl_dock_item_set_tablabel (GdlDockItem *item, 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) { - g_object_ref (G_OBJECT (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); @@ -1887,8 +1886,7 @@ gdl_dock_item_hide_item (GdlDockItem *item) "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)); @@ -1992,8 +1990,7 @@ gdl_dock_item_set_default_position (GdlDockItem *item, 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 ( @@ -2001,8 +1998,7 @@ gdl_dock_item_set_default_position (GdlDockItem *item, "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); } } } diff --git a/src/libgdl/gdl-dock-master.c b/src/libgdl/gdl-dock-master.c index 4b36e4f8b..78cbf69ec 100644 --- a/src/libgdl/gdl-dock-master.c +++ b/src/libgdl/gdl-dock-master.c @@ -807,8 +807,7 @@ gdl_dock_master_add (GdlDockMaster *master, 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); } } diff --git a/src/libgdl/gdl-dock-object.c b/src/libgdl/gdl-dock-object.c index 233d03b3b..9bdcd18ed 100644 --- a/src/libgdl/gdl-dock-object.c +++ b/src/libgdl/gdl-dock-object.c @@ -416,7 +416,7 @@ gdl_dock_object_real_reduce (GdlDockObject *object) g_object_unref (child); } /* 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); |