aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-01-10 00:16:20 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-01-10 00:16:20 +0800
commitd20b7b80bd20ecac6b80d3b1914d073597bebc4d (patch)
treeee97f4946cf1c02b4a295ea23503674822f4050a /libempathy
parent9804017880d3d954a8d2ce580f31d94720eabd02 (diff)
downloadgsoc2013-empathy-d20b7b80bd20ecac6b80d3b1914d073597bebc4d.tar
gsoc2013-empathy-d20b7b80bd20ecac6b80d3b1914d073597bebc4d.tar.gz
gsoc2013-empathy-d20b7b80bd20ecac6b80d3b1914d073597bebc4d.tar.bz2
gsoc2013-empathy-d20b7b80bd20ecac6b80d3b1914d073597bebc4d.tar.lz
gsoc2013-empathy-d20b7b80bd20ecac6b80d3b1914d073597bebc4d.tar.xz
gsoc2013-empathy-d20b7b80bd20ecac6b80d3b1914d073597bebc4d.tar.zst
gsoc2013-empathy-d20b7b80bd20ecac6b80d3b1914d073597bebc4d.zip
Only unref things in dispose
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2205
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-chat.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index bfcdd1a4c..a8bbd7b28 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -924,6 +924,10 @@ tp_chat_dispose (GObject *object)
g_object_unref (priv->account);
priv->account = NULL;
+ if (priv->contact_monitor)
+ g_object_unref (priv->contact_monitor);
+ priv->contact_monitor = NULL;
+
if (!g_queue_is_empty (priv->messages_queue)) {
EmpathyMessage *message;
EmpathyContact *contact;
@@ -966,20 +970,7 @@ tp_chat_finalize (GObject *object)
g_ptr_array_free (priv->properties, TRUE);
}
- if (priv->remote_contact) {
- g_object_unref (priv->remote_contact);
- }
- if (priv->group) {
- g_object_unref (priv->group);
- }
-
- if (priv->contact_monitor) {
- g_object_unref (priv->contact_monitor);
- }
- g_object_unref (priv->factory);
- g_object_unref (priv->user);
- g_object_unref (priv->account);
g_free (priv->id);
g_queue_free (priv->messages_queue);
g_queue_free (priv->pending_messages_queue);