diff options
author | Xavier Claessens <xclaesse@gmail.com> | 2009-03-09 23:16:12 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2009-04-22 18:21:14 +0800 |
commit | 2914c6d76ae6a76e551ccaad01bc9edf2f375d08 (patch) | |
tree | 8cf4c2381d4804009be2f4660f32b5f4331dc862 /libempathy | |
parent | 9b9fcd3ce3b9c7fdc62836821d83377bec58d0a5 (diff) | |
download | gsoc2013-empathy-2914c6d76ae6a76e551ccaad01bc9edf2f375d08.tar gsoc2013-empathy-2914c6d76ae6a76e551ccaad01bc9edf2f375d08.tar.gz gsoc2013-empathy-2914c6d76ae6a76e551ccaad01bc9edf2f375d08.tar.bz2 gsoc2013-empathy-2914c6d76ae6a76e551ccaad01bc9edf2f375d08.tar.lz gsoc2013-empathy-2914c6d76ae6a76e551ccaad01bc9edf2f375d08.tar.xz gsoc2013-empathy-2914c6d76ae6a76e551ccaad01bc9edf2f375d08.tar.zst gsoc2013-empathy-2914c6d76ae6a76e551ccaad01bc9edf2f375d08.zip |
Also accept local-pending of publish if adding a contact
Diffstat (limited to 'libempathy')
-rw-r--r-- | libempathy/empathy-tp-contact-list.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index a0b40b026..0237570a0 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -877,6 +877,11 @@ tp_contact_list_add (EmpathyContactList *list, tp_cli_channel_interface_group_call_add_members (priv->subscribe, -1, &handles, message, NULL, NULL, NULL, NULL); } + if (priv->publish && + g_hash_table_lookup (priv->pendings, GUINT_TO_POINTER (handle))) { + tp_cli_channel_interface_group_call_add_members (priv->publish, + -1, &handles, message, NULL, NULL, NULL, NULL); + } } static void |