aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-chatroom-manager.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-28 15:31:54 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-28 15:31:54 +0800
commit43810b24c12d81f26f4d38035ae911a1a7a0bbcc (patch)
treeca1379349a0e24ffc3414b75b8259c17330655b9 /libempathy/empathy-chatroom-manager.c
parent8fcbe3e7f71eeb6bca559dd6c36711b7fa5078c4 (diff)
downloadgsoc2013-empathy-43810b24c12d81f26f4d38035ae911a1a7a0bbcc.tar
gsoc2013-empathy-43810b24c12d81f26f4d38035ae911a1a7a0bbcc.tar.gz
gsoc2013-empathy-43810b24c12d81f26f4d38035ae911a1a7a0bbcc.tar.bz2
gsoc2013-empathy-43810b24c12d81f26f4d38035ae911a1a7a0bbcc.tar.lz
gsoc2013-empathy-43810b24c12d81f26f4d38035ae911a1a7a0bbcc.tar.xz
gsoc2013-empathy-43810b24c12d81f26f4d38035ae911a1a7a0bbcc.tar.zst
gsoc2013-empathy-43810b24c12d81f26f4d38035ae911a1a7a0bbcc.zip
chatroom-manager: ensure that we stay alive while preparing the AM
This manager uses to be always alive but that's not longer tree since we splitted the chat client (#633329).
Diffstat (limited to 'libempathy/empathy-chatroom-manager.c')
-rw-r--r--libempathy/empathy-chatroom-manager.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 115e4158c..1107c4fa2 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -421,10 +421,13 @@ account_manager_ready_cb (GObject *source_object,
{
DEBUG ("Failed to prepare account manager: %s", error->message);
g_error_free (error);
- return;
+ goto out;
}
chatroom_manager_get_all (self);
+
+out:
+ g_object_unref (self);
}
static GObject *
@@ -454,7 +457,7 @@ empathy_chatroom_manager_constructor (GType type,
priv->account_manager = tp_account_manager_dup ();
tp_account_manager_prepare_async (priv->account_manager, NULL,
- account_manager_ready_cb, self);
+ account_manager_ready_cb, g_object_ref (self));
if (priv->file == NULL)
{