diff options
author | Vitaly Minko <vitaly.minko@gmail.com> | 2010-11-11 01:23:39 +0800 |
---|---|---|
committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-01-28 18:26:03 +0800 |
commit | 5be47bde51c996bbb0be0d90f87e86ae982286a4 (patch) | |
tree | 283499ce10fd7f900df90c4fb57f3fef888f8198 /libempathy-gtk/empathy-contact-dialogs.c | |
parent | 6bad52391b6cc7a0c0d5c8e011fc9d6f2df973dd (diff) | |
download | gsoc2013-empathy-5be47bde51c996bbb0be0d90f87e86ae982286a4.tar gsoc2013-empathy-5be47bde51c996bbb0be0d90f87e86ae982286a4.tar.gz gsoc2013-empathy-5be47bde51c996bbb0be0d90f87e86ae982286a4.tar.bz2 gsoc2013-empathy-5be47bde51c996bbb0be0d90f87e86ae982286a4.tar.lz gsoc2013-empathy-5be47bde51c996bbb0be0d90f87e86ae982286a4.tar.xz gsoc2013-empathy-5be47bde51c996bbb0be0d90f87e86ae982286a4.tar.zst gsoc2013-empathy-5be47bde51c996bbb0be0d90f87e86ae982286a4.zip |
Make AccountChooser filters asynchronous to let them handle newly connected accounts properly (#633481).
Diffstat (limited to 'libempathy-gtk/empathy-contact-dialogs.c')
-rw-r--r-- | libempathy-gtk/empathy-contact-dialogs.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c index 9189d41e6..7aba1fd7c 100644 --- a/libempathy-gtk/empathy-contact-dialogs.c +++ b/libempathy-gtk/empathy-contact-dialogs.c @@ -331,24 +331,28 @@ empathy_contact_personal_dialog_show (GtkWindow *parent) * New contact dialog */ -static gboolean -can_add_contact_to_account (TpAccount *account, - gpointer user_data) +static void +can_add_contact_to_account (TpAccount *account, + EmpathyAccountChooserFilterResultCallback callback, + gpointer callback_data, + gpointer user_data) { EmpathyContactManager *contact_manager; TpConnection *connection; gboolean result; connection = tp_account_get_connection (account); - if (connection == NULL) - return FALSE; + if (connection == NULL) { + callback (FALSE, callback_data); + return; + } contact_manager = empathy_contact_manager_dup_singleton (); result = empathy_contact_manager_get_flags_for_connection ( contact_manager, connection) & EMPATHY_CONTACT_LIST_CAN_ADD; g_object_unref (contact_manager); - return result; + callback (result, callback_data); } static void |