Add chains to the parent's ::finalize() handler (#134901, Morten Welinder,

Sun Feb 22 03:03:29 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkaction.c: (gtk_action_finalize):
	* gtk/gtkclipboard.c: (gtk_clipboard_finalize):
	* gtk/gtkentrycompletion.c: (gtk_entry_completion_class_init),
	(gtk_entry_completion_finalize):
	* gtk/gtkfilechooserwidget.c: (gtk_file_chooser_widget_finalize):
	* gtk/gtkfilesystemmodel.c: (gtk_file_system_model_class_init),
	(gtk_file_system_model_finalize):
	* gtk/gtkicontheme.c: (gtk_icon_theme_class_init),
	(gtk_icon_theme_finalize):
	* gtk/gtktextchild.c: (gtk_text_child_anchor_finalize):
	* gtk/gtkuimanager.c: (gtk_ui_manager_class_init),
	(gtk_ui_manager_finalize):
	* modules/input/gtkimcontextxim.c: (gtk_im_context_xim_finalize):
	Add chains to the parent's ::finalize() handler  (#134901, Morten Welinder,
	patch by Jan Arne Petersen)

8 files changed, 30 insertions, 1 deletions

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 7c5a2076eb..089b2a27ed 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -379,6 +379,8 @@ gtk_action_finalize (GObject *object)
   g_closure_unref (action->private_data->accel_closure);
   if (action->private_data->accel_group)
     g_object_unref (action->private_data->accel_group);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);  
 }
 
 static void
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 808c493118..1a955fa8c8 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -143,6 +143,8 @@ static void
 gtk_clipboard_finalize   (GObject *object)
 {
   clipboard_unset (GTK_CLIPBOARD (object));
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index a4bf298111..c1ee65a588 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -118,6 +118,7 @@ static void     gtk_entry_completion_action_data_func    (GtkTreeViewColumn
                                                           gpointer                 data);
 
 
+static GObjectClass *parent_class = NULL;
 static guint entry_completion_signals[LAST_SIGNAL] = { 0 };
 
 
@@ -165,6 +166,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass)
 {
   GObjectClass *object_class;
 
+  parent_class = g_type_class_peek_parent (klass);
   object_class = (GObjectClass *)klass;
 
   object_class->set_property = gtk_entry_completion_set_property;
@@ -384,6 +386,8 @@ gtk_entry_completion_finalize (GObject *object)
 
   if (completion->priv->popup_window)
     gtk_widget_destroy (completion->priv->popup_window);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 /* implement cell layout interface */
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 41bf628674..c8ca59fc5e 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -119,6 +119,8 @@ gtk_file_chooser_widget_finalize (GObject *object)
   GtkFileChooserWidget *chooser = GTK_FILE_CHOOSER_WIDGET (object);
 
   g_free (chooser->priv->file_system);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static GObject*
diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index 1d28fd7851..a692bdf419 100644
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -174,6 +174,8 @@ static void root_files_removed_callback (GtkFileFolder      *folder,
 					 GSList             *paths,
 					 GtkFileSystemModel *model);
 
+static GObjectClass *parent_class = NULL;
+
 GType
 _gtk_file_system_model_get_type (void)
 {
@@ -216,7 +218,9 @@ static void
 gtk_file_system_model_class_init (GtkFileSystemModelClass *class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-  
+
+  parent_class = g_type_class_peek_parent (class);
+
   gobject_class->finalize = gtk_file_system_model_finalize;
 }
 
@@ -269,6 +273,8 @@ gtk_file_system_model_finalize (GObject *object)
       file_model_node_free (children);
       children = next;
     }
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 /*
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 36ff1440cd..994176f397 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -212,6 +212,8 @@ static BuiltinIcon *find_builtin_icon (const gchar *icon_name,
 				       gint        *min_difference_p,
 				       gboolean    *has_larger_p);
 
+static GObjectClass *parent_class = NULL;
+
 static guint signal_changed = 0;
 
 static GHashTable *icon_theme_builtin_icons;
@@ -330,6 +332,8 @@ gtk_icon_theme_class_init (GtkIconThemeClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
+  parent_class = g_type_class_peek_parent (klass);
+
   gobject_class->finalize = gtk_icon_theme_finalize;
 
 /**
@@ -608,6 +612,8 @@ gtk_icon_theme_finalize (GObject *object)
   priv->search_path = NULL;
 
   blow_themes (icon_theme);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);  
 }
 
 /**
diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c
index a92944e3d5..c33aa5117f 100644
--- a/gtk/gtktextchild.c
+++ b/gtk/gtktextchild.c
@@ -400,6 +400,8 @@ gtk_text_child_anchor_finalize (GObject *obj)
     }
 
   anchor->segment = NULL;
+
+  G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 /**
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index dbb8a8c951..4af675301a 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -153,6 +153,7 @@ enum
   PROP_UI
 };
 
+static GObjectClass *parent_class = NULL;
 static guint ui_manager_signals[LAST_SIGNAL] = { 0 };
 
 static GMemChunk *merge_node_chunk = NULL;
@@ -190,6 +191,8 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
 {
   GObjectClass *gobject_class;
 
+  parent_class = g_type_class_peek_parent (klass);
+
   gobject_class = G_OBJECT_CLASS (klass);
 
   if (!merge_node_chunk)
@@ -405,6 +408,8 @@ gtk_ui_manager_finalize (GObject *object)
 
   g_object_unref (self->private_data->accel_group);
   self->private_data->accel_group = NULL;
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void