aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-contact-selector-dialog.c
diff options
context:
space:
mode:
authorVitaly Minko <vitaly.minko@gmail.com>2010-11-11 01:23:39 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-01-28 18:26:03 +0800
commit5be47bde51c996bbb0be0d90f87e86ae982286a4 (patch)
tree283499ce10fd7f900df90c4fb57f3fef888f8198 /libempathy-gtk/empathy-contact-selector-dialog.c
parent6bad52391b6cc7a0c0d5c8e011fc9d6f2df973dd (diff)
downloadgsoc2013-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-selector-dialog.c')
-rw-r--r--libempathy-gtk/empathy-contact-selector-dialog.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-contact-selector-dialog.c b/libempathy-gtk/empathy-contact-selector-dialog.c
index 62b902746..3ed7f30e5 100644
--- a/libempathy-gtk/empathy-contact-selector-dialog.c
+++ b/libempathy-gtk/empathy-contact-selector-dialog.c
@@ -243,8 +243,10 @@ entry_activate_cb (GtkEntry *entry,
gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_ACCEPT);
}
-static gboolean
+static void
account_chooser_filter (TpAccount *account,
+ EmpathyAccountChooserFilterResultCallback callback,
+ gpointer callback_data,
gpointer user_data)
{
EmpathyContactSelectorDialog *self = user_data;
@@ -252,9 +254,13 @@ account_chooser_filter (TpAccount *account,
EMPATHY_CONTACT_SELECTOR_DIALOG_GET_CLASS (self);
if (class->account_filter == NULL)
- return empathy_account_chooser_filter_is_connected (account, user_data);
+ {
+ empathy_account_chooser_filter_is_connected (
+ account,callback, callback_data, user_data);
+ return;
+ }
- return class->account_filter (self, account);
+ class->account_filter (self, callback, callback_data, account);
}
static gboolean