diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-08-07 14:21:47 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-08-07 14:21:47 +0000 |
| commit | 81934ca8c6fc1827ff260428216823a3f8dd0461 (patch) | |
| tree | fa63ee87b4d90c09082234738fa2121db432cff3 /gtk | |
| parent | 8371b465dc0919aadb99cf2aeae5623c65ebaa92 (diff) | |
| download | gtk+-81934ca8c6fc1827ff260428216823a3f8dd0461.tar.gz | |
gtk/gtkactiongroup.c gtk/gtkcellrendererspin.c gtk/gtkfilechooserbutton.c
2008-08-07 Michael Natterer <mitch@imendio.com>
* gtk/gtkactiongroup.c
* gtk/gtkcellrendererspin.c
* gtk/gtkfilechooserbutton.c
* gtk/gtktoolitem.c: chain up unconditionally in finalize().
svn path=/trunk/; revision=21036
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkactiongroup.c | 3 | ||||
| -rw-r--r-- | gtk/gtkcellrendererspin.c | 3 | ||||
| -rw-r--r-- | gtk/gtkfilechooserbutton.c | 3 | ||||
| -rw-r--r-- | gtk/gtktoolitem.c | 7 |
4 files changed, 6 insertions, 10 deletions
diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index 630ab3012e..7a23c26c53 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -498,8 +498,7 @@ gtk_action_group_finalize (GObject *object) if (private->translate_notify) private->translate_notify (private->translate_data); - if (parent_class->finalize) - (* parent_class->finalize) (object); + parent_class->finalize (object); } static void diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c index 674d443263..9d208457ac 100644 --- a/gtk/gtkcellrendererspin.c +++ b/gtk/gtkcellrendererspin.c @@ -150,8 +150,7 @@ gtk_cell_renderer_spin_finalize (GObject *object) if (priv && priv->adjustment) g_object_unref (priv->adjustment); - if (G_OBJECT_CLASS (gtk_cell_renderer_spin_parent_class)->finalize) - (* G_OBJECT_CLASS (gtk_cell_renderer_spin_parent_class)->finalize) (object); + G_OBJECT_CLASS (gtk_cell_renderer_spin_parent_class)->finalize (object); } static void diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 68daa9fea6..4e3b6d5288 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -883,8 +883,7 @@ gtk_file_chooser_button_finalize (GObject *object) if (priv->old_file) g_object_unref (priv->old_file); - if (G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->finalize != NULL) - (*G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->finalize) (object); + G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->finalize (object); } /* ********************* * diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c index f21b316a75..4409ae06d8 100644 --- a/gtk/gtktoolitem.c +++ b/gtk/gtktoolitem.c @@ -284,12 +284,11 @@ gtk_tool_item_finalize (GObject *object) GtkToolItem *item = GTK_TOOL_ITEM (object); g_free (item->priv->menu_item_id); - + if (item->priv->menu_item) g_object_unref (item->priv->menu_item); - - if (G_OBJECT_CLASS (gtk_tool_item_parent_class)->finalize) - G_OBJECT_CLASS (gtk_tool_item_parent_class)->finalize (object); + + G_OBJECT_CLASS (gtk_tool_item_parent_class)->finalize (object); } static void |