[libgd] GdStackSwitcher: cleanup in dispose
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgd] GdStackSwitcher: cleanup in dispose
- Date: Tue, 19 Feb 2013 07:34:20 +0000 (UTC)
commit 9c947c7a6bff307f6606d6b1fa5655a4ae4f965e
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Tue Feb 19 08:32:33 2013 +0100
GdStackSwitcher: cleanup in dispose
libgd/gd-stack-switcher.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/libgd/gd-stack-switcher.c b/libgd/gd-stack-switcher.c
index ba44c50..3218ad0 100644
--- a/libgd/gd-stack-switcher.c
+++ b/libgd/gd-stack-switcher.c
@@ -320,22 +320,19 @@ static void
gd_stack_switcher_dispose (GObject *object)
{
GdStackSwitcher *switcher = GD_STACK_SWITCHER (object);
+ GdStackSwitcherPrivate *priv = switcher->priv;
disconnect_stack_signals (switcher);
- G_OBJECT_CLASS (gd_stack_switcher_parent_class)->dispose (object);
-}
-
-static void
-gd_stack_switcher_finalize (GObject *object)
-{
- GdStackSwitcher *self = GD_STACK_SWITCHER (object);
- GdStackSwitcherPrivate *priv = self->priv;
+ if (priv->buttons != NULL)
+ {
+ g_hash_table_unref (priv->buttons);
+ priv->buttons = 0;
+ }
- g_hash_table_destroy (priv->buttons);
g_clear_object (&priv->stack);
- G_OBJECT_CLASS (gd_stack_switcher_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gd_stack_switcher_parent_class)->dispose (object);
}
static void
@@ -348,7 +345,6 @@ gd_stack_switcher_class_init (GdStackSwitcherClass *class)
object_class->get_property = gd_stack_switcher_get_property;
object_class->set_property = gd_stack_switcher_set_property;
object_class->dispose = gd_stack_switcher_dispose;
- object_class->finalize = gd_stack_switcher_finalize;
g_object_class_install_property (object_class,
PROP_STACK,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]