[gtksourceview] Move some cleanup to the dispose method
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] Move some cleanup to the dispose method
- Date: Mon, 17 Sep 2012 20:19:37 +0000 (UTC)
commit dbf9028dc2d1b33f2355f7833d65c4f61a329da0
Author: Paolo Borelli <pborelli gnome org>
Date: Mon Sep 17 22:14:20 2012 +0200
Move some cleanup to the dispose method
In particular make sure to set the lists to NULL after freeing them
gtksourceview/gtksourcecompletion.c | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
---
diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c
index d777a33..03b80d2 100644
--- a/gtksourceview/gtksourcecompletion.c
+++ b/gtksourceview/gtksourcecompletion.c
@@ -1924,28 +1924,22 @@ gtk_source_completion_dispose (GObject *object)
g_list_foreach (completion->priv->providers, (GFunc)g_object_unref, NULL);
}
- g_list_free (completion->priv->active_providers);
- g_list_free (completion->priv->interactive_providers);
-
- G_OBJECT_CLASS (gtk_source_completion_parent_class)->dispose (object);
-}
-
-static void
-gtk_source_completion_finalize (GObject *object)
-{
- GtkSourceCompletion *completion = GTK_SOURCE_COMPLETION (object);
-
if (completion->priv->show_timed_out_id != 0)
{
g_source_remove (completion->priv->show_timed_out_id);
+ completion->priv->show_timed_out_id = 0;
}
- g_list_free (completion->priv->providers);
- g_list_free (completion->priv->active_providers);
-
g_clear_object (&completion->priv->default_info);
- G_OBJECT_CLASS (gtk_source_completion_parent_class)->finalize (object);
+ g_list_free (completion->priv->active_providers);
+ g_list_free (completion->priv->interactive_providers);
+ g_list_free (completion->priv->providers);
+ completion->priv->active_providers = NULL;
+ completion->priv->interactive_providers = NULL;
+ completion->priv->providers = NULL;
+
+ G_OBJECT_CLASS (gtk_source_completion_parent_class)->dispose (object);
}
static void
@@ -2197,7 +2191,6 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass)
object_class->get_property = gtk_source_completion_get_property;
object_class->set_property = gtk_source_completion_set_property;
- object_class->finalize = gtk_source_completion_finalize;
object_class->dispose = gtk_source_completion_dispose;
klass->show = gtk_source_completion_show_default;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]