1 files changed, 48 insertions, 58 deletions

diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 3cad96744..3b25201c5 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -54,38 +54,40 @@
 static gboolean only_if_needed = FALSE;
 static gboolean hidden = FALSE;
 static gchar *selected_account_name = NULL;
-static gboolean account_manager_prepared = FALSE;
 static gboolean assistant = FALSE;
 
 static void
-account_prepare_cb (GObject *source_object,
-    GAsyncResult *result,
-    gpointer user_data)
+maybe_show_accounts_ui (TpAccountManager *manager,
+    GApplication *app)
 {
-  TpAccountManager *manager = TP_ACCOUNT_MANAGER (user_data);
-  TpAccount *account = TP_ACCOUNT (source_object);
-  GError *error = NULL;
+  if (hidden)
+    return;
 
-  if (!tp_proxy_prepare_finish (account, result, &error))
-    {
-      DEBUG ("Failed to prepare account: %s", error->message);
-      g_error_free (error);
+  if (only_if_needed && empathy_accounts_has_non_salut_accounts (manager))
+    return;
 
-      account = NULL;
-    }
-
-  empathy_accounts_show_accounts_ui (manager, account, assistant,
-      G_CALLBACK (gtk_main_quit));
+  empathy_accounts_show_accounts_ui (manager, NULL, assistant, app);
 }
 
-static void
-maybe_show_accounts_ui (TpAccountManager *manager)
+static TpAccount *
+find_account (TpAccountManager *mgr,
+    const gchar *path)
 {
-  if (hidden ||
-      (only_if_needed && empathy_accounts_has_non_salut_accounts (manager)))
-    gtk_main_quit ();
-  else
-    empathy_accounts_show_accounts_ui (manager, NULL, assistant, gtk_main_quit);
+  GList *accounts, *l;
+  TpAccount *found = NULL;
+
+  accounts = tp_account_manager_get_valid_accounts (mgr);
+  for (l = accounts; l != NULL; l = g_list_next (l))
+    {
+      if (!tp_strdiff (tp_proxy_get_object_path (l->data), path))
+        {
+          found = l->data;
+          break;
+        }
+    }
+
+  g_list_free (accounts);
+  return found;
 }
 
 static void
@@ -95,21 +97,19 @@ account_manager_ready_for_accounts_cb (GObject *source_object,
 {
   TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
   GError *error = NULL;
+  GApplication *app = G_APPLICATION (user_data);
 
   if (!tp_proxy_prepare_finish (manager, result, &error))
     {
       DEBUG ("Failed to prepare account manager: %s", error->message);
       g_clear_error (&error);
-      return;
+      goto out;
     }
 
-  account_manager_prepared = TRUE;
-
   if (selected_account_name != NULL)
     {
       gchar *account_path;
-      TpAccount *account = NULL;
-      TpDBusDaemon *bus;
+      TpAccount *account;
 
       /* create and prep the corresponding TpAccount so it's fully ready by the
        * time we try to select it in the accounts dialog */
@@ -119,49 +119,48 @@ account_manager_ready_for_accounts_cb (GObject *source_object,
         account_path = g_strdup_printf ("%s%s", TP_ACCOUNT_OBJECT_PATH_BASE,
             selected_account_name);
 
-      bus = tp_dbus_daemon_dup (NULL);
-      if ((account = tp_account_new (bus, account_path, &error)))
+      account = find_account (manager, account_path);
+
+      if (account != NULL)
         {
-          tp_proxy_prepare_async (account, NULL, account_prepare_cb, manager);
-          g_object_unref (bus);
-          return;
+          empathy_accounts_show_accounts_ui (manager, account, assistant, app);
+          goto out;
         }
       else
         {
-          DEBUG ("Failed to find account with path %s: %s", account_path,
-              error->message);
+          DEBUG ("Failed to find account with path %s", account_path);
+
           g_clear_error (&error);
 
-          maybe_show_accounts_ui (manager);
+          maybe_show_accounts_ui (manager, app);
         }
 
-      g_object_unref (bus);
       g_free (account_path);
     }
   else
     {
-      maybe_show_accounts_ui (manager);
+      maybe_show_accounts_ui (manager, app);
     }
+
+out:
+  g_application_release (app);
 }
 
 static int
 app_command_line_cb (GApplication *app,
     GApplicationCommandLine *cmdline)
 {
-  g_application_hold (app);
+  TpAccountManager *account_manager;
 
-  /* if the window is ready, present it; otherwise, it will be presented when
-   * the accounts manager is prepared */
-  if (account_manager_prepared)
-    {
-      TpAccountManager *account_manager;
+  account_manager = tp_account_manager_dup ();
 
-      account_manager = tp_account_manager_dup ();
-      empathy_accounts_show_accounts_ui (account_manager, NULL, assistant,
-              G_CALLBACK (gtk_main_quit));
+  /* Hold the application while preparing the AM */
+  g_application_hold (app);
 
-      g_object_unref (account_manager);
-    }
+  tp_proxy_prepare_async (account_manager, NULL,
+    account_manager_ready_for_accounts_cb, app);
+
+  g_object_unref (account_manager);
 
   return 0;
 }
@@ -223,12 +222,9 @@ local_cmdline (GApplication *app,
   return retval;
 }
 
-#define COMMAND_ACCOUNTS_DIALOG 1
-
 int
 main (int argc, char *argv[])
 {
-  TpAccountManager *account_manager;
   GtkApplication *app;
   GObjectClass *app_class;
   gint retval;
@@ -251,17 +247,11 @@ main (int argc, char *argv[])
   app_class = G_OBJECT_GET_CLASS (app);
   G_APPLICATION_CLASS (app_class)->local_command_line = local_cmdline;
 
-  account_manager = tp_account_manager_dup ();
-
-  tp_proxy_prepare_async (account_manager, NULL,
-    account_manager_ready_for_accounts_cb, NULL);
-
   g_signal_connect (app, "command-line", G_CALLBACK (app_command_line_cb),
       NULL);
 
   retval = g_application_run (G_APPLICATION (app), argc, argv);
 
-  g_object_unref (account_manager);
   g_object_unref (app);
 
   return retval;