gtk/gtkclist.c gtk/gtkcontainer.c gtk/gtkfilechooserbutton.c

2008-08-07  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkclist.c
	* gtk/gtkcontainer.c
	* gtk/gtkfilechooserbutton.c
	* gtk/gtkgamma.c
	* gtk/gtkmenutoolbutton.c
	* gtk/gtkoptionmenu.c
	* gtk/gtkradiobutton.c
	* gtk/gtkradiomenuitem.c
	* gtk/gtktipsquery.c
	* gtk/gtktree.c
	* gtk/gtktreeview.c: chain up unconditionally in destroy().

	* gtk/gtkhandlebox.c: remove empty destroy() implementation.

svn path=/trunk/; revision=21035

diff --git a/ChangeLog b/ChangeLog
index 8c31ca34fef51c75f928709178bec58a37a1af0e..c954c4f1d5220cc4e540588c2209ff2bd0e3f1d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-08-07  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkclist.c
+       * gtk/gtkcontainer.c
+       * gtk/gtkfilechooserbutton.c
+       * gtk/gtkgamma.c
+       * gtk/gtkmenutoolbutton.c
+       * gtk/gtkoptionmenu.c
+       * gtk/gtkradiobutton.c
+       * gtk/gtkradiomenuitem.c
+       * gtk/gtktipsquery.c
+       * gtk/gtktree.c
+       * gtk/gtktreeview.c: chain up unconditionally in destroy().
+
+       * gtk/gtkhandlebox.c: remove empty destroy() implementation.
+
 2008-08-07  Michael Natterer  <mitch@imendio.com>
 
        Bug 546756 – gnome-panel crashed with SIGSEGV in

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index d4c274cb0e1a43735b04066bda07ec01a37d405c..d8350a3694856f3db5800a20cc24f36c86d4502c 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -4402,8 +4402,7 @@ gtk_clist_destroy (GtkObject *object)
        clist->column[i].button = NULL;
       }
 
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
 static void

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index ddaee28f14412a32a245c3803e61a3d17d82bc39..64b296e6c3c93a25d32fd31d4d806d19988c9f9c 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1009,7 +1009,7 @@ static void
 gtk_container_destroy (GtkObject *object)
 {
   GtkContainer *container = GTK_CONTAINER (object);
-  
+
   if (GTK_CONTAINER_RESIZE_PENDING (container))
     _gtk_container_dequeue_resize_handler (container);
 
@@ -1018,11 +1018,10 @@ gtk_container_destroy (GtkObject *object)
    */
   if (container->has_focus_chain)
     gtk_container_unset_focus_chain (container);
-  
+
   gtk_container_foreach (container, (GtkCallback) gtk_widget_destroy, NULL);
-  
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
 static void

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index aa1b114e7a478febe4d9301151addfb29412855b..68daa9fea6cf61769ea4604c19b9e0904da92605 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -954,8 +954,7 @@ gtk_file_chooser_button_destroy (GtkObject *object)
       priv->fs = NULL;
     }
 
-  if (GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy != NULL)
-    (*GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy (object);
 }
 
 

diff --git a/gtk/gtkgamma.c b/gtk/gtkgamma.c
index fb733c852a9dad721f79d567c5af0f73169b31f1..6bc00404add571c583c383e892728fed9ab843d0 100644 (file)
--- a/gtk/gtkgamma.c
+++ b/gtk/gtkgamma.c
@@ -485,8 +485,7 @@ gtk_gamma_curve_destroy (GtkObject *object)
   if (c->gamma_dialog)
     gtk_widget_destroy (c->gamma_dialog);
 
-  if (GTK_OBJECT_CLASS (gtk_gamma_curve_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_gamma_curve_parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (gtk_gamma_curve_parent_class)->destroy (object);
 }
 
 #define __GTK_GAMMA_CURVE_C__

diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index d5188a4334d277b8281d9c000100578820bf530b..77ffe56634eb1c6996e87949f04aeafafc2a8ee8 100644 (file)
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -113,7 +113,6 @@ static void gtk_handle_box_get_property   (GObject     *object,
                                           guint        param_id,
                                           GValue      *value,
                                           GParamSpec  *pspec);
-static void gtk_handle_box_destroy        (GtkObject         *object);
 static void gtk_handle_box_map            (GtkWidget         *widget);
 static void gtk_handle_box_unmap          (GtkWidget         *widget);
 static void gtk_handle_box_realize        (GtkWidget         *widget);
@@ -152,12 +151,10 @@ static void
 gtk_handle_box_class_init (GtkHandleBoxClass *class)
 {
   GObjectClass *gobject_class;
-  GtkObjectClass *object_class;
   GtkWidgetClass *widget_class;
   GtkContainerClass *container_class;
 
   gobject_class = (GObjectClass *) class;
-  object_class = (GtkObjectClass *) class;
   widget_class = (GtkWidgetClass *) class;
   container_class = (GtkContainerClass *) class;
 
@@ -214,8 +211,6 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
                                                         FALSE,
                                                         GTK_PARAM_READABLE));
 
-  object_class->destroy = gtk_handle_box_destroy;
-
   widget_class->map = gtk_handle_box_map;
   widget_class->unmap = gtk_handle_box_unmap;
   widget_class->realize = gtk_handle_box_realize;
@@ -347,13 +342,6 @@ gtk_handle_box_new (void)
   return g_object_new (GTK_TYPE_HANDLE_BOX, NULL);
 }
 
-static void
-gtk_handle_box_destroy (GtkObject *object)
-{
-  if (GTK_OBJECT_CLASS (gtk_handle_box_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_handle_box_parent_class)->destroy) (object);
-}
-
 static void
 gtk_handle_box_map (GtkWidget *widget)
 {

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index b3d7ab25e02dc9f7221c88337e9a312ea721203e..d3c347f2c2b3779a172149a10f803e0348294b14 100644 (file)
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -423,9 +423,8 @@ gtk_menu_tool_button_destroy (GtkObject *object)
                                            arrow_button_button_press_event_cb, 
                                            button);
     }
-  
-  if (GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy)
-    (*GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy) (object);
+
+  GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy (object);
 }
 
 /**

diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 896d17ae71e36bd6630345ba83dea69074fc9b2c..4e63e0d55c4d3d5589f8234c40fb32aa21ab7eae 100644 (file)
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -377,8 +377,7 @@ gtk_option_menu_destroy (GtkObject *object)
   if (option_menu->menu)
     gtk_widget_destroy (option_menu->menu);
 
-  if (GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy (object);
 }
 
 static void

diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 6fd857dece5be92d10fbd8a3369777b92c6d5809..0d7277846b031f7dfb4bdebddd6b6b085a680ba5 100644 (file)
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -384,9 +384,8 @@ gtk_radio_button_destroy (GtkObject *object)
     g_signal_emit (old_group_singleton, group_changed_signal, 0);
   if (was_in_group)
     g_signal_emit (radio_button, group_changed_signal, 0);
-  
-  if (GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy) (object);
+
+  GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy (object);
 }
 
 static void

diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
index 6e7579c9a4477b478dde336b16e02c2973bcf770..0b33dc6c9347abeb6646e47082e0cccf4998edcc 100644 (file)
--- a/gtk/gtkradiomenuitem.c
+++ b/gtk/gtkradiomenuitem.c
@@ -410,9 +410,8 @@ gtk_radio_menu_item_destroy (GtkObject *object)
     g_signal_emit (old_group_singleton, group_changed_signal, 0);
   if (was_in_group)
     g_signal_emit (radio_menu_item, group_changed_signal, 0);
-  
-  if (GTK_OBJECT_CLASS (gtk_radio_menu_item_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_radio_menu_item_parent_class)->destroy) (object);
+
+  GTK_OBJECT_CLASS (gtk_radio_menu_item_parent_class)->destroy (object);
 }
 
 static void

diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c
index 73b7fdc53727c77c535f365f25f7aac1fc1e0fe5..fea78d6f26b531774ee8598b0de5148779a81aea 100644 (file)
--- a/gtk/gtktipsquery.c
+++ b/gtk/gtktipsquery.c
@@ -265,8 +265,7 @@ gtk_tips_query_destroy (GtkObject   *object)
   g_free (tips_query->label_no_tip);
   tips_query->label_no_tip = NULL;
 
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
 GtkWidget*

diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index 663a2b58aab1189cbb065c8a6c50d07193c15efa..b6a96a053a682f978f869365a86fe28f77721021 100644 (file)
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -408,9 +408,8 @@ gtk_tree_destroy (GtkObject *object)
       g_list_free (tree->selection);
       tree->selection = NULL;
     }
-  
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
 static void

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 4aa6c195f9daeb550a8969cb3c38407bd811085d..8257216c27104bb1025a232e13dda6a925819960 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1692,8 +1692,7 @@ gtk_tree_view_destroy (GtkObject *object)
       tree_view->priv->vadjustment = NULL;
     }
 
-  if (GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy) (object);
+  GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy (object);
 }
 
 \f