aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-05-26 16:44:08 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-06-01 17:58:09 +0800
commit9087cb85bdd1483a7e3a1852aac0dca0454b5231 (patch)
tree16ce61ed9d8cb3a77da44115df3b5e9263442fab
parent405df12b4627f6f6361e8be54f27bce928cd6e5e (diff)
downloadgsoc2013-empathy-9087cb85bdd1483a7e3a1852aac0dca0454b5231.tar
gsoc2013-empathy-9087cb85bdd1483a7e3a1852aac0dca0454b5231.tar.gz
gsoc2013-empathy-9087cb85bdd1483a7e3a1852aac0dca0454b5231.tar.bz2
gsoc2013-empathy-9087cb85bdd1483a7e3a1852aac0dca0454b5231.tar.lz
gsoc2013-empathy-9087cb85bdd1483a7e3a1852aac0dca0454b5231.tar.xz
gsoc2013-empathy-9087cb85bdd1483a7e3a1852aac0dca0454b5231.tar.zst
gsoc2013-empathy-9087cb85bdd1483a7e3a1852aac0dca0454b5231.zip
avatar-chooser: replace finalize by dispose
It just unref objects.
-rw-r--r--libempathy-gtk/empathy-avatar-chooser.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 222ef14f6..6ea013250 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -170,17 +170,15 @@ avatar_chooser_set_property (GObject *object,
}
static void
-avatar_chooser_finalize (GObject *object)
+avatar_chooser_dispose (GObject *object)
{
EmpathyAvatarChooser *self = (EmpathyAvatarChooser *) object;
- avatar_chooser_set_connection (EMPATHY_AVATAR_CHOOSER (object), NULL);
- g_assert (self->priv->connection == NULL);
-
+ tp_clear_object (&self->priv->connection);
tp_clear_pointer (&self->priv->avatar, empathy_avatar_unref);
tp_clear_object (&self->priv->gsettings_ui);
- G_OBJECT_CLASS (empathy_avatar_chooser_parent_class)->finalize (object);
+ G_OBJECT_CLASS (empathy_avatar_chooser_parent_class)->dispose (object);
}
static void
@@ -189,7 +187,7 @@ empathy_avatar_chooser_class_init (EmpathyAvatarChooserClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GParamSpec *param_spec;
- object_class->finalize = avatar_chooser_finalize;
+ object_class->dispose = avatar_chooser_dispose;
object_class->get_property = avatar_chooser_get_property;
object_class->set_property = avatar_chooser_set_property;