gtk+ r21036 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Thu Aug  7 14:21:47 2008
New Revision: 21036
URL: http://svn.gnome.org/viewvc/gtk+?rev=21036&view=rev

Log:
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().



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkactiongroup.c
   trunk/gtk/gtkcellrendererspin.c
   trunk/gtk/gtkfilechooserbutton.c
   trunk/gtk/gtktoolitem.c

Modified: trunk/gtk/gtkactiongroup.c
==============================================================================
--- trunk/gtk/gtkactiongroup.c	(original)
+++ trunk/gtk/gtkactiongroup.c	Thu Aug  7 14:21:47 2008
@@ -498,8 +498,7 @@
   if (private->translate_notify)
     private->translate_notify (private->translate_data);
 
-  if (parent_class->finalize)
-    (* parent_class->finalize) (object);
+  parent_class->finalize (object);
 }
 
 static void

Modified: trunk/gtk/gtkcellrendererspin.c
==============================================================================
--- trunk/gtk/gtkcellrendererspin.c	(original)
+++ trunk/gtk/gtkcellrendererspin.c	Thu Aug  7 14:21:47 2008
@@ -150,8 +150,7 @@
   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

Modified: trunk/gtk/gtkfilechooserbutton.c
==============================================================================
--- trunk/gtk/gtkfilechooserbutton.c	(original)
+++ trunk/gtk/gtkfilechooserbutton.c	Thu Aug  7 14:21:47 2008
@@ -883,8 +883,7 @@
   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);
 }
 
 /* ********************* *

Modified: trunk/gtk/gtktoolitem.c
==============================================================================
--- trunk/gtk/gtktoolitem.c	(original)
+++ trunk/gtk/gtktoolitem.c	Thu Aug  7 14:21:47 2008
@@ -284,12 +284,11 @@
   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