aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-29 15:50:04 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-29 15:50:04 +0800
commit8b529506fbc4265b44ab35cda5bdc99978192680 (patch)
treee472a57a6b6b150e8016330e38b441a4feff77c8 /libempathy
parent22370808b807c31c111fea61a33aa19d2dec1f03 (diff)
parent5c9cc71dd871671cf6654fbe968755654081946e (diff)
downloadgsoc2013-empathy-8b529506fbc4265b44ab35cda5bdc99978192680.tar
gsoc2013-empathy-8b529506fbc4265b44ab35cda5bdc99978192680.tar.gz
gsoc2013-empathy-8b529506fbc4265b44ab35cda5bdc99978192680.tar.bz2
gsoc2013-empathy-8b529506fbc4265b44ab35cda5bdc99978192680.tar.lz
gsoc2013-empathy-8b529506fbc4265b44ab35cda5bdc99978192680.tar.xz
gsoc2013-empathy-8b529506fbc4265b44ab35cda5bdc99978192680.tar.zst
gsoc2013-empathy-8b529506fbc4265b44ab35cda5bdc99978192680.zip
Merge branch 'muc-crash-633329'
Diffstat (limited to 'libempathy')
-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)
{