diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-13 14:32:45 +0100 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-13 14:32:45 +0100 |
commit | 892c022246793a07a6c087bb13a97e6440fd0322 (patch) | |
tree | 7b1b2640cbf9a3615beef6fef4bdc313d65c132f /telepathy-glib/base-contact-list.c | |
parent | 12297c1d9cd9db58cf8be07cf05586ebc080bf72 (diff) | |
parent | f6038c7c1a4302e298fbdadc81e5e89fc844e6b2 (diff) |
Merge branch 'telepathy-glib-0.16'
Diffstat (limited to 'telepathy-glib/base-contact-list.c')
-rw-r--r-- | telepathy-glib/base-contact-list.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/telepathy-glib/base-contact-list.c b/telepathy-glib/base-contact-list.c index d10c5752b..5039f9b47 100644 --- a/telepathy-glib/base-contact-list.c +++ b/telepathy-glib/base-contact-list.c @@ -4441,6 +4441,7 @@ emulate_rename_group_remove_cb (GObject *source, } g_simple_async_result_complete (rename_result); + g_object_unref (rename_result); } static void @@ -4457,12 +4458,15 @@ emulate_rename_group_add_cb (GObject *source, g_simple_async_result_set_from_error (rename_result, error); g_clear_error (&error); g_simple_async_result_complete (rename_result); - return; + goto out; } tp_base_contact_list_remove_group_async (self, g_simple_async_result_get_op_res_gpointer (rename_result), - emulate_rename_group_remove_cb, rename_result); + emulate_rename_group_remove_cb, g_object_ref (rename_result)); + +out: + g_object_unref (rename_result); } static void @@ -4493,7 +4497,7 @@ tp_base_contact_list_emulate_rename_group (TpBaseContactList *self, old_members = tp_base_contact_list_dup_group_members (self, old_name); tp_base_contact_list_add_to_group_async (self, new_name, old_members, - emulate_rename_group_add_cb, result); + emulate_rename_group_add_cb, g_object_ref (result)); g_object_unref (result); tp_handle_set_destroy (old_members); } |