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

diff --git a/ChangeLog b/ChangeLog
index c954c4f1d5220cc4e540588c2209ff2bd0e3f1d6..c5e4feb9a57782ad9640056404d198187244357d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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().
+
 2008-08-07  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkclist.c

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index 630ab3012eb7e179a11172ae03091ffe8b0d1faa..7a23c26c5329d69218d27c1f44893e491e43ad7a 100644 (file)
--- 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 674d443263a561588f498e0f9894d2bde21a4f06..9d208457ac58c7f53d92c88043be0be854a23866 100644 (file)
--- 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 68daa9fea6cf61769ea4604c19b9e0904da92605..4e3b6d5288f3156818549efbb412e6d2e7e1bacd 100644 (file)
--- 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 f21b316a75fc429be9eb64a7b8c072dacae20e9e..4409ae06d8623be3909fa1ae826a51aa766fdb6d 100644 (file)
--- 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