aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-03-27 16:26:58 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-03-27 16:38:22 +0800
commit900cbf83e3373abb5143dda986c1a1bced308948 (patch)
tree5abb0fba043f1e0d3763c5894d04ba214ba06bd5
parenteb8eb7616bc94544e15da3b81e37b61f26ae45ce (diff)
downloadgsoc2013-empathy-900cbf83e3373abb5143dda986c1a1bced308948.tar
gsoc2013-empathy-900cbf83e3373abb5143dda986c1a1bced308948.tar.gz
gsoc2013-empathy-900cbf83e3373abb5143dda986c1a1bced308948.tar.bz2
gsoc2013-empathy-900cbf83e3373abb5143dda986c1a1bced308948.tar.lz
gsoc2013-empathy-900cbf83e3373abb5143dda986c1a1bced308948.tar.xz
gsoc2013-empathy-900cbf83e3373abb5143dda986c1a1bced308948.tar.zst
gsoc2013-empathy-900cbf83e3373abb5143dda986c1a1bced308948.zip
import-widget: don't manually prepare the account manager
empathy-accounts already does it for us. https://bugzilla.gnome.org/show_bug.cgi?id=672839
-rw-r--r--src/empathy-import-widget.c27
1 files changed, 4 insertions, 23 deletions
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 041c51003..40956f9ee 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -92,24 +92,15 @@ import_widget_account_id_in_list (GList *accounts,
}
static void
-account_manager_prepared_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+import_widget_add_accounts_to_model (EmpathyImportWidget *self)
{
- TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
- EmpathyImportWidget *self = user_data;
+ TpAccountManager *manager;
GtkTreeModel *model;
GtkTreeIter iter;
GList *l;
EmpathyImportWidgetPriv *priv = GET_PRIV (self);
- GError *error = NULL;
- if (!tp_proxy_prepare_finish (manager, result, &error))
- {
- DEBUG ("Failed to prepare account manager: %s", error->message);
- g_error_free (error);
- return;
- }
+ manager = tp_account_manager_dup ();
model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
@@ -147,18 +138,8 @@ account_manager_prepared_cb (GObject *source_object,
COL_SOURCE, data->source,
COL_ACCOUNT_DATA, data,
-1);
- }
-}
-static void
-import_widget_add_accounts_to_model (EmpathyImportWidget *self)
-{
- TpAccountManager *manager;
-
- manager = tp_account_manager_dup ();
-
- tp_proxy_prepare_async (manager, NULL,
- account_manager_prepared_cb, self);
+ }
g_object_unref (manager);
}