]> git.0d.be Git - empathy.git/commitdiff
account-chooser: replace finalize by dispose
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 24 Oct 2011 12:17:26 +0000 (14:17 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 27 Oct 2011 11:44:29 +0000 (13:44 +0200)
It just unref one object so dispose is the best place.

https://bugzilla.gnome.org/show_bug.cgi?id=662609

libempathy-gtk/empathy-account-chooser.c

index c075768b9d2b3cd01fb07dd109f8e99b2ac4bc25..8b0359276a98ac744b36895e69d2a9937b3585ea 100644 (file)
@@ -321,13 +321,13 @@ account_chooser_constructed (GObject *object)
 }
 
 static void
 }
 
 static void
-account_chooser_finalize (GObject *object)
+account_chooser_dispose (GObject *object)
 {
 {
-  EmpathyAccountChooser *self = (EmpathyAccountChooser *) object;
+  EmpathyAccountChooser *self = EMPATHY_ACCOUNT_CHOOSER (object);
 
 
-  g_object_unref (self->priv->manager);
+  g_clear_object (&self->priv->manager);
 
 
-  G_OBJECT_CLASS (empathy_account_chooser_parent_class)->finalize (object);
+  G_OBJECT_CLASS (empathy_account_chooser_parent_class)->dispose (object);
 }
 
 static void
 }
 
 static void
@@ -373,7 +373,7 @@ empathy_account_chooser_class_init (EmpathyAccountChooserClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->constructed = account_chooser_constructed;
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->constructed = account_chooser_constructed;
-  object_class->finalize = account_chooser_finalize;
+  object_class->dispose = account_chooser_dispose;
   object_class->get_property = account_chooser_get_property;
   object_class->set_property = account_chooser_set_property;
 
   object_class->get_property = account_chooser_get_property;
   object_class->set_property = account_chooser_set_property;