summaryrefslogtreecommitdiff
path: root/gtk/gtkitemfactory.c
diff options
context:
space:
mode:
authorTim Janik <timj@imendio.com>2005-11-23 18:06:58 +0000
committerTim Janik <timj@src.gnome.org>2005-11-23 18:06:58 +0000
commitfbb2e3f4f51a4c0ccc8f2bf511f4766293fc4af0 (patch)
tree72b9ee7fa6999a36e3080048d07c27497e1843cf /gtk/gtkitemfactory.c
parent9856c1b25a242b8ba030ea7bb2567c3de80f54ae (diff)
downloadgtk+-fbb2e3f4f51a4c0ccc8f2bf511f4766293fc4af0.tar.gz
deprecated floating/sink API and implemented it in terms of the GObject
Wed Nov 23 18:55:47 2005 Tim Janik <timj@imendio.com> * gtk/gtkobject.[hc]: deprecated floating/sink API and implemented it in terms of the GObject floating/sink API. * gtk/gtkaboutdialog.c: * gtk/gtkaction.c: * gtk/gtkcellview.c: * gtk/gtkclist.c: * gtk/gtkcolorsel.c: * gtk/gtkcombobox.c: * gtk/gtkfilechooserdefault.c: * gtk/gtkiconview.c: * gtk/gtkinvisible.c: * gtk/gtkitemfactory.c: * gtk/gtklayout.c: * gtk/gtkmenu.c: * gtk/gtkmenutoolbutton.c: * gtk/gtknotebook.c: * gtk/gtkprogress.c: * gtk/gtkrange.c: * gtk/gtkspinbutton.c: * gtk/gtkstatusicon.c: * gtk/gtktext.c: * gtk/gtktextview.c: * gtk/gtktoolbar.c: * gtk/gtktoolbutton.c: * gtk/gtktoolitem.c: * gtk/gtktreeitem.c: * gtk/gtktreeview.c: * gtk/gtktreeviewcolumn.c: * gtk/gtkuimanager.c: * gtk/gtkviewport.c: * gtk/gtkwidget.c: * gtk/gtkwindow.c: ported to use GObject's g_object_ref_sink(). * gtk/gtkcolorsel.c: * gtk/gtkfilechooserdefault.c: * gtk/gtkaboutdialog.c: fixed compiler warnings.
Diffstat (limited to 'gtk/gtkitemfactory.c')
-rw-r--r--gtk/gtkitemfactory.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index 548000379f..2bfc856f9e 100644
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -453,8 +453,7 @@ gtk_item_factory_construct (GtkItemFactory *ifactory,
ifactory->widget = g_object_connect (gtk_widget_new (container_type, NULL),
"signal::destroy", gtk_widget_destroyed, &ifactory->widget,
NULL);
- g_object_ref (ifactory);
- gtk_object_sink (GTK_OBJECT (ifactory));
+ g_object_ref_sink (ifactory);
gtk_item_factory_add_item (ifactory,
"", NULL,
@@ -525,8 +524,7 @@ gtk_item_factory_destroy (GtkObject *object)
dobj = GTK_OBJECT (ifactory->widget);
- g_object_ref (dobj);
- gtk_object_sink (dobj);
+ g_object_ref_sink (dobj);
gtk_object_destroy (dobj);
g_object_unref (dobj);