diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-11-15 17:12:05 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-11-15 17:12:05 +0800 |
| commit | cb0e2e0239d2bdad3aa4afbd683684f9ca2d1815 (patch) | |
| tree | 0909fd3977d3cbca2b5194f4896c7cda0919d6ce /libempathy-gtk/empathy-individual-dialogs.c | |
| parent | bf03b8eec2f65636fde1abd1c9daddc7e2e2310d (diff) | |
| parent | 875bf697d54f1c4ca98478ded849bc733828f758 (diff) | |
| download | gsoc2013-empathy-cb0e2e0239d2bdad3aa4afbd683684f9ca2d1815.tar gsoc2013-empathy-cb0e2e0239d2bdad3aa4afbd683684f9ca2d1815.tar.gz gsoc2013-empathy-cb0e2e0239d2bdad3aa4afbd683684f9ca2d1815.tar.bz2 gsoc2013-empathy-cb0e2e0239d2bdad3aa4afbd683684f9ca2d1815.tar.lz gsoc2013-empathy-cb0e2e0239d2bdad3aa4afbd683684f9ca2d1815.tar.xz gsoc2013-empathy-cb0e2e0239d2bdad3aa4afbd683684f9ca2d1815.tar.zst gsoc2013-empathy-cb0e2e0239d2bdad3aa4afbd683684f9ca2d1815.zip | |
Merge remote branch 'vminko/fix-633481-v2'
Diffstat (limited to 'libempathy-gtk/empathy-individual-dialogs.c')
| -rw-r--r-- | libempathy-gtk/empathy-individual-dialogs.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c index 85ed7d1d4..2c9801059 100644 --- a/libempathy-gtk/empathy-individual-dialogs.c +++ b/libempathy-gtk/empathy-individual-dialogs.c @@ -43,8 +43,10 @@ static GtkWidget *new_individual_dialog = NULL; * New contact dialog */ -static gboolean +static void can_add_contact_to_account (TpAccount *account, + EmpathyAccountChooserFilterResultCallback callback, + gpointer callback_data, gpointer user_data) { EmpathyIndividualManager *individual_manager; @@ -53,13 +55,16 @@ can_add_contact_to_account (TpAccount *account, connection = tp_account_get_connection (account); if (connection == NULL) - return FALSE; + { + callback (FALSE, callback_data); + return; + } individual_manager = empathy_individual_manager_dup_singleton (); result = empathy_connection_can_add_personas (connection); g_object_unref (individual_manager); - return result; + callback (result, callback_data); } static void |