[empathy] accounts-dialog: no more need to manually prepare TpAccount
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] accounts-dialog: no more need to manually prepare TpAccount
- Date: Tue, 24 Jan 2012 12:25:13 +0000 (UTC)
commit a58af6c844170f7451307f07a43e3416f5694ddf
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue Jan 24 11:56:39 2012 +0100
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
src/empathy-accounts-dialog.c | 21 +--------------------
1 files changed, 1 insertions(+), 20 deletions(-)
---
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 0e33de2..c79ac40 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]