From a35539698a3198861638badc4e3b94d61add7622 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 23 Jul 2004 14:45:50 +0000 Subject: [PATCH] Remove unnecessary checks. (#148175, Morten Welinder) Fri Jul 23 10:28:43 2004 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_finalize): * gtk/gtkradioaction.c (gtk_radio_action_finalize): * gtk/gtkfontsel.c (gtk_font_selection_finalize): * gtk/gtkcellview.c (gtk_cell_view_finalize): * gtk/gtkcalendar.c (gtk_calendar_finalize): * gtk/gtkactiongroup.c (gtk_action_group_finalize): Remove unnecessary checks. (#148175, Morten Welinder) --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gtk/gtkactiongroup.c | 3 +-- gtk/gtkcalendar.c | 3 +-- gtk/gtkcellview.c | 3 +-- gtk/gtkfontsel.c | 3 +-- gtk/gtkradioaction.c | 3 +-- gtk/gtktreeview.c | 3 +-- 10 files changed, 46 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d24bfd3d8..9536b9fa53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Fri Jul 23 10:28:43 2004 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_finalize): + * gtk/gtkradioaction.c (gtk_radio_action_finalize): + * gtk/gtkfontsel.c (gtk_font_selection_finalize): + * gtk/gtkcellview.c (gtk_cell_view_finalize): + * gtk/gtkcalendar.c (gtk_calendar_finalize): + * gtk/gtkactiongroup.c (gtk_action_group_finalize): Remove + unnecessary checks. (#148175, Morten Welinder) + Thu Jul 22 01:42:16 2004 Matthias Clasen * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2d24bfd3d8..9536b9fa53 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Fri Jul 23 10:28:43 2004 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_finalize): + * gtk/gtkradioaction.c (gtk_radio_action_finalize): + * gtk/gtkfontsel.c (gtk_font_selection_finalize): + * gtk/gtkcellview.c (gtk_cell_view_finalize): + * gtk/gtkcalendar.c (gtk_calendar_finalize): + * gtk/gtkactiongroup.c (gtk_action_group_finalize): Remove + unnecessary checks. (#148175, Morten Welinder) + Thu Jul 22 01:42:16 2004 Matthias Clasen * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2d24bfd3d8..9536b9fa53 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Fri Jul 23 10:28:43 2004 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_finalize): + * gtk/gtkradioaction.c (gtk_radio_action_finalize): + * gtk/gtkfontsel.c (gtk_font_selection_finalize): + * gtk/gtkcellview.c (gtk_cell_view_finalize): + * gtk/gtkcalendar.c (gtk_calendar_finalize): + * gtk/gtkactiongroup.c (gtk_action_group_finalize): Remove + unnecessary checks. (#148175, Morten Welinder) + Thu Jul 22 01:42:16 2004 Matthias Clasen * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2d24bfd3d8..9536b9fa53 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Fri Jul 23 10:28:43 2004 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_finalize): + * gtk/gtkradioaction.c (gtk_radio_action_finalize): + * gtk/gtkfontsel.c (gtk_font_selection_finalize): + * gtk/gtkcellview.c (gtk_cell_view_finalize): + * gtk/gtkcalendar.c (gtk_calendar_finalize): + * gtk/gtkactiongroup.c (gtk_action_group_finalize): Remove + unnecessary checks. (#148175, Morten Welinder) + Thu Jul 22 01:42:16 2004 Matthias Clasen * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index 42af150dbc..de0d40fec4 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -308,8 +308,7 @@ gtk_action_group_finalize (GObject *object) if (self->private_data->translate_notify) self->private_data->translate_notify (self->private_data->translate_data); - if (parent_class->finalize) - (* parent_class->finalize) (object); + (* parent_class->finalize) (object); } static void diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 88afc9b8de..c49eeb7286 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -3094,8 +3094,7 @@ gtk_calendar_finalize (GObject *object) g_free (private_data); - if (G_OBJECT_CLASS (parent_class)->finalize) - (* G_OBJECT_CLASS (parent_class)->finalize) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } static gboolean diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index 2771c893e6..cfa82d5de2 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -303,8 +303,7 @@ gtk_cell_view_finalize (GObject *object) if (cellview->priv->displayed_row) gtk_tree_row_reference_free (cellview->priv->displayed_row); - if (G_OBJECT_CLASS (parent_class)->finalize) - (* G_OBJECT_CLASS (parent_class)->finalize) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } static void diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 06890deb32..b18200ebc0 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -597,8 +597,7 @@ gtk_font_selection_finalize (GObject *object) if (fontsel->font) gdk_font_unref (fontsel->font); - if (G_OBJECT_CLASS (font_selection_parent_class)->finalize) - (* G_OBJECT_CLASS (font_selection_parent_class)->finalize) (object); + (* G_OBJECT_CLASS (font_selection_parent_class)->finalize) (object); } static void diff --git a/gtk/gtkradioaction.c b/gtk/gtkradioaction.c index 8492a7ff16..1efd12cc9c 100644 --- a/gtk/gtkradioaction.c +++ b/gtk/gtkradioaction.c @@ -244,8 +244,7 @@ gtk_radio_action_finalize (GObject *object) tmp_action->private_data->group = action->private_data->group; } - if (parent_class->finalize) - (* parent_class->finalize) (object); + (* parent_class->finalize) (object); } static void diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 9e3894814c..23f4336a7a 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1246,8 +1246,7 @@ gtk_tree_view_finalize (GObject *object) g_free (tree_view->priv); - if (G_OBJECT_CLASS (parent_class)->finalize) - (* G_OBJECT_CLASS (parent_class)->finalize) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); }