Merge remote-tracking branch 'glassrose/add-All-service-selection-in-debug-window'

[empathy.git] / src / empathy-accounts-common.c

diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index a08a1ef77eef2ac74931cc8fe48eb230e365a6a7..f6bb4027846cd0f5bb30ca427958167dcac984fe 100644 (file)
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -41,8 +41,6 @@
 
 #include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"
-#include "empathy-account-assistant.h"
-#include "empathy-auto-salut-account-helper.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include <libempathy/empathy-debug.h>
@@ -82,74 +80,23 @@ empathy_accounts_has_accounts (TpAccountManager *manager)
   return has_accounts;
 }
 
-static void
-do_show_accounts_ui (TpAccountManager *manager,
-    TpAccount *account,
-    GCallback window_destroyed_cb)
-{
-  static GtkWidget *accounts_window = NULL;
-
-  if (accounts_window == NULL)
-    accounts_window = empathy_accounts_dialog_show (NULL, account);
-
-  if (window_destroyed_cb)
-    g_signal_connect (accounts_window, "destroy", window_destroyed_cb, NULL);
-
-  gtk_window_present (GTK_WINDOW (accounts_window));
-}
-
-static GtkWidget *
-show_account_assistant (EmpathyConnectionManagers *connection_mgrs,
-    GCallback assistant_destroy_cb)
-{
-  GtkWidget *assistant;
-
-  assistant = empathy_account_assistant_show (NULL, connection_mgrs);
-  if (assistant_destroy_cb)
-    g_signal_connect (assistant, "destroy", assistant_destroy_cb, NULL);
-
-  return assistant;
-}
-
-static void
-connection_managers_prepare_for_accounts (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyConnectionManagers *cm_mgr = EMPATHY_CONNECTION_MANAGERS (source);
-  GCallback assistant_destroy_cb = G_CALLBACK (user_data);
-
-  if (!empathy_connection_managers_prepare_finish (cm_mgr, result, NULL))
-    goto out;
-
-  show_account_assistant (cm_mgr, assistant_destroy_cb);
-  DEBUG ("would show the account assistant");
-
-out:
-  g_object_unref (cm_mgr);
-}
-
 void
 empathy_accounts_show_accounts_ui (TpAccountManager *manager,
     TpAccount *account,
-    gboolean assistant,
-    GCallback window_destroyed_cb)
+    GApplication *app)
 {
+  static GtkWidget *accounts_window = NULL;
+
   g_return_if_fail (TP_IS_ACCOUNT_MANAGER (manager));
   g_return_if_fail (!account || TP_IS_ACCOUNT (account));
 
-  if ((empathy_accounts_has_non_salut_accounts (manager) && !assistant) ||
-          account != NULL)
-    {
-      do_show_accounts_ui (manager, account, window_destroyed_cb);
-    }
-  else
+  if (accounts_window == NULL)
     {
-      EmpathyConnectionManagers *cm_mgr;
+      accounts_window = empathy_accounts_dialog_show (NULL, account);
 
-      cm_mgr = empathy_connection_managers_dup_singleton ();
-
-      empathy_connection_managers_prepare_async (cm_mgr,
-          connection_managers_prepare_for_accounts, window_destroyed_cb);
+      gtk_application_add_window (GTK_APPLICATION (app),
+          GTK_WINDOW (accounts_window));
     }
+
+  gtk_window_present (GTK_WINDOW (accounts_window));
 }