From b2f4e11df326d42dedf0bde3b1162244dac4fe6f Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 30 Oct 2007 12:25:39 +0000 Subject: [PATCH] Chain up to the parent's finalize virtual function. 2007-10-30 Emmanuele Bassi * gtk/gtkbuilder.c (gtk_builder_finalize): Chain up to the parent's finalize virtual function. svn path=/trunk/; revision=18952 --- ChangeLog | 5 +++++ gtk/gtkbuilder.c | 25 ++++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index f57dbc771..826b0c2ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-30 Emmanuele Bassi + + * gtk/gtkbuilder.c (gtk_builder_finalize): Chain up to the + parent's finalize virtual function. + 2007-10-28 Owen Taylor * gtk/gtktextbuffer.c (gtk_text_buffer_delete_interactive): Allow diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index ad1e6fe82..e5b51cab9 100644 --- a/gtk/gtkbuilder.c +++ b/gtk/gtkbuilder.c @@ -129,19 +129,22 @@ gtk_builder_init (GtkBuilder *builder) static void gtk_builder_finalize (GObject *object) { - GtkBuilder *builder = GTK_BUILDER (object); + GtkBuilderPrivate *priv = GTK_BUILDER (object)->priv; - g_free (builder->priv->domain); + g_free (priv->domain); + g_free (priv->current_root); + g_free (priv->filename); + + g_hash_table_destroy (priv->objects); + g_hash_table_destroy (priv->delayed_properties); - g_free (builder->priv->current_root); - g_hash_table_destroy (builder->priv->delayed_properties); - builder->priv->delayed_properties = NULL; - g_slist_foreach (builder->priv->signals, (GFunc)_free_signal_info, NULL); - g_slist_free (builder->priv->signals); - g_hash_table_destroy (builder->priv->objects); - g_slist_foreach (builder->priv->root_objects, (GFunc)g_object_unref, NULL); - g_slist_free (builder->priv->root_objects); - g_free (builder->priv->filename); + g_slist_foreach (priv->signals, (GFunc) _free_signal_info, NULL); + g_slist_free (priv->signals); + + g_slist_foreach (priv->root_objects, (GFunc) g_object_unref, NULL); + g_slist_free (priv->root_objects); + + G_OBJECT_CLASS (gtk_builder_parent_class)->finalize (object); } static void -- 2.43.2