aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-01-24 18:56:39 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-01-24 20:24:59 +0800
commita58af6c844170f7451307f07a43e3416f5694ddf (patch)
tree82f5cdd830b38f64c5f1f57448797d46b7384e1a /src
parent6de7927ded5e15783b4d9d93233856d9bd373641 (diff)
downloadgsoc2013-empathy-a58af6c844170f7451307f07a43e3416f5694ddf.tar
gsoc2013-empathy-a58af6c844170f7451307f07a43e3416f5694ddf.tar.gz
gsoc2013-empathy-a58af6c844170f7451307f07a43e3416f5694ddf.tar.bz2
gsoc2013-empathy-a58af6c844170f7451307f07a43e3416f5694ddf.tar.lz
gsoc2013-empathy-a58af6c844170f7451307f07a43e3416f5694ddf.tar.xz
gsoc2013-empathy-a58af6c844170f7451307f07a43e3416f5694ddf.tar.zst
gsoc2013-empathy-a58af6c844170f7451307f07a43e3416f5694ddf.zip
accounts-dialog: no more need to manually prepare TpAccount
The factory does it for us now. https://bugzilla.gnome.org/show_bug.cgi?id=668372
Diffstat (limited to 'src')
-rw-r--r--src/empathy-accounts-dialog.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 0e33de2a6..c79ac4078 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -1980,31 +1980,12 @@ accounts_dialog_add_account (EmpathyAccountsDialog *dialog,
}
static void
-account_prepare_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
-{
- EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (user_data);
- TpAccount *account = TP_ACCOUNT (source_object);
- GError *error = NULL;
-
- if (!tp_proxy_prepare_finish (account, result, &error))
- {
- DEBUG ("Failed to prepare account: %s", error->message);
- g_error_free (error);
- return;
- }
-
- accounts_dialog_add_account (dialog, account);
-}
-
-static void
accounts_dialog_account_validity_changed_cb (TpAccountManager *manager,
TpAccount *account,
gboolean valid,
EmpathyAccountsDialog *dialog)
{
- tp_proxy_prepare_async (account, NULL, account_prepare_cb, dialog);
+ accounts_dialog_add_account (dialog, account);
}
static void