summaryrefslogtreecommitdiff
path: root/gtk/gtkcombobox.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/gtkcombobox.c
parent9856c1b25a242b8ba030ea7bb2567c3de80f54ae (diff)
downloadgdk-pixbuf-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/gtkcombobox.c')
-rw-r--r--gtk/gtkcombobox.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 526b16c75..2a09ed166 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2535,8 +2535,7 @@ gtk_combo_box_menu_setup (GtkComboBox *combo_box,
/* the column is needed in tree_column_row_is_sensitive() */
combo_box->priv->column = gtk_tree_view_column_new ();
- g_object_ref (combo_box->priv->column);
- gtk_object_sink (GTK_OBJECT (combo_box->priv->column));
+ g_object_ref_sink (combo_box->priv->column);
gtk_combo_box_sync_cells (combo_box,
GTK_CELL_LAYOUT (combo_box->priv->column));
@@ -3837,8 +3836,7 @@ gtk_combo_box_cell_layout_pack_start (GtkCellLayout *layout,
combo_box = GTK_COMBO_BOX (layout);
- g_object_ref (cell);
- gtk_object_sink (GTK_OBJECT (cell));
+ g_object_ref_sink (cell);
info = g_new0 (ComboCellInfo, 1);
info->cell = cell;
@@ -3894,8 +3892,7 @@ gtk_combo_box_cell_layout_pack_end (GtkCellLayout *layout,
combo_box = GTK_COMBO_BOX (layout);
- g_object_ref (cell);
- gtk_object_sink (GTK_OBJECT (cell));
+ g_object_ref_sink (cell);
info = g_new0 (ComboCellInfo, 1);
info->cell = cell;