]> git.0d.be Git - empathy.git/blobdiff - src/empathy-accounts-dialog.c
Merge commit 'jtellier/confirm-lose-accounts-settings'
[empathy.git] / src / empathy-accounts-dialog.c
index 98e848566c0443e094f9dc0090382d830ae8fb28..a00c1b5ebe8e82365f18e9f39523216a49bcf966 100644 (file)
@@ -1,7 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2007-2008 Collabora Ltd.
+ * Copyright (C) 2007-2009 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -20,6 +19,8 @@
  *
  * Authors: Martyn Russell <martyn@imendio.com>
  *          Xavier Claessens <xclaesse@gmail.com>
+ *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
+ *          Jonathan Tellier <jonathan.tellier@gmail.com>
  */
 
 #include <config.h>
 #include <glib/gi18n.h>
 #include <dbus/dbus-glib.h>
 
-#include <libmissioncontrol/mc-profile.h>
 #include <telepathy-glib/util.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-account-manager.h>
+#include <libempathy/empathy-connection-managers.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-profile-chooser.h>
+
+#include <libempathy-gtk/empathy-protocol-chooser.h>
 #include <libempathy-gtk/empathy-account-widget.h>
 #include <libempathy-gtk/empathy-account-widget-irc.h>
 #include <libempathy-gtk/empathy-account-widget-sip.h>
+#include <libempathy-gtk/empathy-cell-renderer-activatable.h>
 #include <libempathy-gtk/empathy-conf.h>
+#include <libempathy-gtk/empathy-images.h>
 
 #include "empathy-accounts-dialog.h"
 #include "empathy-import-dialog.h"
+#include "empathy-import-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include <libempathy/empathy-debug.h>
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500
 
+/* The primary text of the dialog shown to the user when he is about to lose
+ * unsaved changes */
+#define PENDING_CHANGES_QUESTION_PRIMARY_TEXT \
+  _("There are unsaved modification regarding your %s account.")
+
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountsDialog)
+G_DEFINE_TYPE (EmpathyAccountsDialog, empathy_accounts_dialog, G_TYPE_OBJECT);
+
+static EmpathyAccountsDialog *dialog_singleton = NULL;
+
 typedef struct {
-       GtkWidget        *window;
+  GtkWidget *window;
+
+  GtkWidget *alignment_settings;
+
+  GtkWidget *vbox_details;
+  GtkWidget *frame_no_protocol;
 
-       GtkWidget        *alignment_settings;
+  GtkWidget *treeview;
 
-       GtkWidget        *vbox_details;
-       GtkWidget        *frame_no_profile;
+  GtkWidget *button_add;
 
-       GtkWidget        *treeview;
+  GtkWidget *frame_new_account;
+  GtkWidget *combobox_protocol;
+  GtkWidget *hbox_type;
+  GtkWidget *button_create;
+  GtkWidget *button_back;
+  GtkWidget *radiobutton_reuse;
+  GtkWidget *radiobutton_register;
 
-       GtkWidget        *button_add;
-       GtkWidget        *button_remove;
-       GtkWidget        *button_import;
+  GtkWidget *image_type;
+  GtkWidget *label_name;
+  GtkWidget *label_type;
+  GtkWidget *settings_widget;
 
-       GtkWidget        *frame_new_account;
-       GtkWidget        *combobox_profile;
-       GtkWidget        *hbox_type;
-       GtkWidget        *button_create;
-       GtkWidget        *button_back;
-       GtkWidget        *radiobutton_reuse;
-       GtkWidget        *radiobutton_register;
+  /* We have to keep a reference on the actual EmpathyAccountWidget, not just
+   * his GtkWidget. It is the only reliable source we can query to know if
+   * there are any unsaved changes to the currently selected account. We can't
+   * look at the account settings because it does not contain everything that
+   * can be changed using the EmpathyAccountWidget. For instance, it does not
+   * contain the state of the "Enabled" checkbox. */
+  EmpathyAccountWidget *setting_widget_object;
 
-       GtkWidget        *image_type;
-       GtkWidget        *label_name;
-       GtkWidget        *label_type;
-       GtkWidget        *settings_widget;
+  gboolean  connecting_show;
+  guint connecting_id;
 
-       gboolean          connecting_show;
-       guint             connecting_id;
+  gulong  settings_ready_id;
+  EmpathyAccountSettings *settings_ready;
 
-       EmpathyAccountManager *account_manager;
-       MissionControl    *mc;
-} EmpathyAccountsDialog;
+  EmpathyAccountManager *account_manager;
+  EmpathyConnectionManagers *cms;
+
+  GtkWindow *parent_window;
+  EmpathyAccount *initial_selection;
+
+  /* Those are needed when changing the selected row. When a user selects
+   * another account and there are unsaved changes on the currently selected
+   * one, a confirmation message box is presented to him. Since his answer
+   * is retrieved asynchronously, we keep some information as member of the
+   * EmpathyAccountsDialog object. */
+  gboolean force_change_row;
+  GtkTreeRowReference *destination_row;
+
+
+} EmpathyAccountsDialogPriv;
 
 enum {
-       COL_ENABLED,
-       COL_NAME,
-       COL_STATUS,
-       COL_ACCOUNT_POINTER,
-       COL_COUNT
+  COL_NAME,
+  COL_STATUS,
+  COL_ACCOUNT_POINTER,
+  COL_ACCOUNT_SETTINGS_POINTER,
+  COL_COUNT
 };
 
-static void       accounts_dialog_update_account            (EmpathyAccountsDialog    *dialog,
-                                                            EmpathyAccount           *account);
-static void       accounts_dialog_model_setup               (EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_model_add_columns         (EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_name_editing_started_cb   (GtkCellRenderer          *renderer,
-                                                            GtkCellEditable          *editable,
-                                                            gchar                    *path,
-                                                            EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_model_select_first        (EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_model_pixbuf_data_func    (GtkTreeViewColumn        *tree_column,
-                                                            GtkCellRenderer          *cell,
-                                                            GtkTreeModel             *model,
-                                                            GtkTreeIter              *iter,
-                                                            EmpathyAccountsDialog    *dialog);
-static EmpathyAccount *accounts_dialog_model_get_selected        (EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_model_set_selected        (EmpathyAccountsDialog    *dialog,
-                                                            EmpathyAccount           *account);
-static gboolean   accounts_dialog_model_remove_selected     (EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_model_selection_changed   (GtkTreeSelection         *selection,
-                                                            EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_add_or_update_account     (EmpathyAccountsDialog    *dialog,
-                                                            EmpathyAccount           *account);
-static void       accounts_dialog_account_added_cb          (EmpathyAccountManager    *manager,
-                                                            EmpathyAccount           *account,
-                                                            EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_account_removed_cb        (EmpathyAccountManager    *manager,
-                                                            EmpathyAccount           *account,
-                                                            EmpathyAccountsDialog    *dialog);
-static gboolean   accounts_dialog_row_changed_foreach       (GtkTreeModel             *model,
-                                                            GtkTreePath              *path,
-                                                            GtkTreeIter              *iter,
-                                                            gpointer                  user_data);
-static gboolean   accounts_dialog_flash_connecting_cb       (EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_connection_changed_cb     (EmpathyAccountManager    *manager,
-                                                            EmpathyAccount           *account,
-                                                            TpConnectionStatusReason  reason,
-                                                            TpConnectionStatus        current,
-                                                            TpConnectionStatus        previous,
-                                                            EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_button_create_clicked_cb  (GtkWidget                *button,
-                                                            EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_button_back_clicked_cb    (GtkWidget                *button,
-                                                            EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_button_add_clicked_cb     (GtkWidget                *button,
-                                                            EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_button_help_clicked_cb    (GtkWidget                *button,
-                                                            EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_button_remove_clicked_cb  (GtkWidget                *button,
-                                                            EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_button_import_clicked_cb  (GtkWidget                *button,
-                                                            EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_response_cb               (GtkWidget                *widget,
-                                                            gint                      response,
-                                                            EmpathyAccountsDialog    *dialog);
-static void       accounts_dialog_destroy_cb                (GtkWidget                *widget,
-                                                            EmpathyAccountsDialog    *dialog);
+enum {
+  PROP_PARENT = 1
+};
+
+static void accounts_dialog_account_display_name_changed_cb (
+    EmpathyAccount *account,
+    GParamSpec *pspec,
+    gpointer user_data);
+
+static EmpathyAccountSettings * accounts_dialog_model_get_selected_settings (
+    EmpathyAccountsDialog *dialog);
+
+static gboolean accounts_dialog_get_settings_iter (
+    EmpathyAccountsDialog *dialog,
+    EmpathyAccountSettings *settings,
+    GtkTreeIter *iter);
+
+static void accounts_dialog_model_select_first (EmpathyAccountsDialog *dialog);
+
+static void accounts_dialog_update (EmpathyAccountsDialog *dialog,
+    EmpathyAccountSettings *settings);
+
+static void accounts_dialog_update_settings (EmpathyAccountsDialog *dialog,
+    EmpathyAccountSettings *settings);
 
 static void
 accounts_dialog_update_name_label (EmpathyAccountsDialog *dialog,
-                                  EmpathyAccount        *account)
+    const gchar *display_name)
 {
-       gchar *text;
+  gchar *text;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  text = g_markup_printf_escaped ("<big><b>%s</b></big>", display_name);
+  gtk_label_set_markup (GTK_LABEL (priv->label_name), text);
+
+  g_free (text);
+}
 
-       text = g_markup_printf_escaped ("<big><b>%s</b></big>",
-                       empathy_account_get_display_name (account));
-       gtk_label_set_markup (GTK_LABEL (dialog->label_name), text);
+static void
+empathy_account_dialog_widget_cancelled_cb (EmpathyAccountWidget *widget_object,
+    EmpathyAccountsDialog *dialog)
+{
+  GtkTreeView *view;
+  GtkTreeModel *model;
+  GtkTreeSelection *selection;
+  GtkTreeIter iter;
+  EmpathyAccountSettings *settings;
+  EmpathyAccount *account;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  view = GTK_TREE_VIEW (priv->treeview);
+  selection = gtk_tree_view_get_selection (view);
+
+  if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+    return;
+
+  gtk_tree_model_get (model, &iter,
+      COL_ACCOUNT_SETTINGS_POINTER, &settings,
+      COL_ACCOUNT_POINTER, &account, -1);
+
+  empathy_account_widget_discard_pending_changes (priv->setting_widget_object);
+
+  if (account == NULL)
+    {
+      /* We were creating an account. We remove the selected row */
+      gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+    }
+  else
+    {
+      /* We were modifying an account. We discard the changes by reloading the
+       * settings and the UI. */
+      accounts_dialog_update_settings (dialog, settings);
+      g_object_unref (account);
+    }
+
+  if (settings != NULL)
+    g_object_unref (settings);
+}
 
-       g_free (text);
+static gchar *
+get_default_display_name (EmpathyAccountSettings *settings)
+{
+  const gchar *login_id;
+  const gchar *protocol;
+  gchar *default_display_name;
+
+  login_id = empathy_account_settings_get_string (settings, "account");
+  protocol = empathy_account_settings_get_protocol (settings);
+
+  if (login_id != NULL)
+    {
+      if (!tp_strdiff (protocol, "irc"))
+        {
+          const gchar* server;
+          server = empathy_account_settings_get_string (settings, "server");
+
+          /* To translators: The first parameter is the login id and the
+           * second one is the server. The resulting string will be something
+           * like: "MyUserName on chat.freenode.net".
+           * You should reverse the order of these arguments if the
+           * server should come before the login id in your locale.*/
+          default_display_name = g_strdup_printf (_("%1$s on %2$s"),
+              login_id, server);
+        }
+      else
+        {
+          default_display_name = g_strdup (login_id);
+        }
+    }
+  else if (protocol != NULL)
+    {
+      /* To translators: The parameter is the protocol name. The resulting
+       * string will be something like: "Jabber Account" */
+      default_display_name = g_strdup_printf (_("%s Account"), protocol);
+    }
+  else
+    {
+      default_display_name = g_strdup (_("New account"));
+    }
+
+  return default_display_name;
 }
 
 static void
-accounts_dialog_update_account (EmpathyAccountsDialog *dialog,
-                               EmpathyAccount       *account)
+empathy_account_dialog_account_created_cb (EmpathyAccountWidget *widget_object,
+    EmpathyAccountsDialog *dialog)
 {
-       McProfile   *profile;
-       const gchar *config_ui;
-
-       if (!account) {
-               GtkTreeView  *view;
-               GtkTreeModel *model;
-
-               view = GTK_TREE_VIEW (dialog->treeview);
-               model = gtk_tree_view_get_model (view);
-
-               if (gtk_tree_model_iter_n_children (model, NULL) > 0) {
-                       /* We have configured accounts, select the first one */
-                       accounts_dialog_model_select_first (dialog);
-                       return;
-               }
-               if (empathy_profile_chooser_n_profiles (
-                       EMPATHY_PROFILE_CHOOSER (dialog->combobox_profile)) > 0) {
-                       /* We have no account configured but we have some
-                        * profiles instsalled. The user obviously wants to add
-                        * an account. Click on the Add button for him. */
-                       accounts_dialog_button_add_clicked_cb (dialog->button_add,
-                                                              dialog);
-                       return;
-               }
-
-               /* No account and no profile, warn the user */
-               gtk_widget_hide (dialog->vbox_details);
-               gtk_widget_hide (dialog->frame_new_account);
-               gtk_widget_show (dialog->frame_no_profile);
-               gtk_widget_set_sensitive (dialog->button_add, FALSE);
-               gtk_widget_set_sensitive (dialog->button_remove, FALSE);
-               return;
-       }
-
-       /* We have an account selected, destroy old settings and create a new
-        * one for the account selected */
-       gtk_widget_hide (dialog->frame_new_account);
-       gtk_widget_hide (dialog->frame_no_profile);
-       gtk_widget_show (dialog->vbox_details);
-       gtk_widget_set_sensitive (dialog->button_add, TRUE);
-       gtk_widget_set_sensitive (dialog->button_remove, TRUE);
-
-       if (dialog->settings_widget) {
-               gtk_widget_destroy (dialog->settings_widget);
-               dialog->settings_widget = NULL;
-       }
-
-       profile = empathy_account_get_profile (account);
-       config_ui = mc_profile_get_configuration_ui (profile);
-       if (!tp_strdiff (config_ui, "jabber")) {
-               dialog->settings_widget =
-                       empathy_account_widget_jabber_new (account);
-       }
-       else if (!tp_strdiff (config_ui, "msn")) {
-               dialog ->settings_widget =
-                       empathy_account_widget_msn_new (account);
-       }
-       else if (!tp_strdiff (config_ui, "local-xmpp")) {
-               dialog->settings_widget =
-                       empathy_account_widget_salut_new (account);
-       }
-       else if (!tp_strdiff (config_ui, "irc")) {
-               dialog->settings_widget =
-                       empathy_account_widget_irc_new (account);
-       }
-       else if (!tp_strdiff (config_ui, "icq")) {
-               dialog->settings_widget =
-                       empathy_account_widget_icq_new (account);
-       }
-       else if (!tp_strdiff (config_ui, "aim")) {
-               dialog->settings_widget =
-                       empathy_account_widget_aim_new (account);
-       }
-       else if (!tp_strdiff (config_ui, "yahoo")) {
-               dialog->settings_widget =
-                       empathy_account_widget_yahoo_new (account);
-       }
-       else if  (!tp_strdiff (config_ui, "sofiasip")) {
-               dialog->settings_widget =
-                       empathy_account_widget_sip_new (account);
-       }
-       else if  (!tp_strdiff (config_ui, "groupwise")) {
-               dialog->settings_widget =
-                       empathy_account_widget_groupwise_new (account);
-       }
-       else {
-               dialog->settings_widget =
-                       empathy_account_widget_generic_new (account);
-       }
-
-       gtk_container_add (GTK_CONTAINER (dialog->alignment_settings),
-                          dialog->settings_widget);
-       gtk_widget_show (dialog->settings_widget);
-
-
-       gtk_image_set_from_icon_name (GTK_IMAGE (dialog->image_type),
-                                     mc_profile_get_icon_name (profile),
-                                     GTK_ICON_SIZE_DIALOG);
-       gtk_widget_set_tooltip_text (dialog->image_type,
-                                    mc_profile_get_display_name (profile));
-
-       accounts_dialog_update_name_label (dialog, account);
-
-       g_object_unref (profile);
+  gchar *display_name;
+  EmpathyAccountSettings *settings =
+      accounts_dialog_model_get_selected_settings (dialog);
+
+  display_name = get_default_display_name (settings);
+
+  empathy_account_settings_set_display_name_async (settings,
+      display_name, NULL, NULL);
+
+  g_free (display_name);
+
+  accounts_dialog_update_settings (dialog, settings);
+
+  if (settings)
+    g_object_unref (settings);
 }
 
 static void
-accounts_dialog_model_setup (EmpathyAccountsDialog *dialog)
+account_dialog_create_settings_widget (EmpathyAccountsDialog *dialog,
+    EmpathyAccountSettings *settings)
 {
-       GtkListStore     *store;
-       GtkTreeSelection *selection;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+  gchar *icon_name;
 
-       store = gtk_list_store_new (COL_COUNT,
-                                   G_TYPE_BOOLEAN,        /* enabled */
-                                   G_TYPE_STRING,         /* name */
-                                   G_TYPE_UINT,           /* status */
-                                   EMPATHY_TYPE_ACCOUNT); /* account */
+  priv->setting_widget_object =
+      empathy_account_widget_new_for_protocol (settings, FALSE);
 
-       gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->treeview),
-                                GTK_TREE_MODEL (store));
+  priv->settings_widget =
+      empathy_account_widget_get_widget (priv->setting_widget_object);
 
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->treeview));
-       gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+  priv->settings_widget =
+      empathy_account_widget_get_widget (priv->setting_widget_object);
+  g_signal_connect (priv->setting_widget_object, "account-created",
+        G_CALLBACK (empathy_account_dialog_account_created_cb), dialog);
+  g_signal_connect (priv->setting_widget_object, "cancelled",
+          G_CALLBACK (empathy_account_dialog_widget_cancelled_cb), dialog);
 
-       g_signal_connect (selection, "changed",
-                         G_CALLBACK (accounts_dialog_model_selection_changed),
-                         dialog);
+  gtk_container_add (GTK_CONTAINER (priv->alignment_settings),
+      priv->settings_widget);
+  gtk_widget_show (priv->settings_widget);
 
-       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
-                                             COL_NAME, GTK_SORT_ASCENDING);
+  icon_name = empathy_account_settings_get_icon_name (settings);
 
-       accounts_dialog_model_add_columns (dialog);
+  gtk_image_set_from_icon_name (GTK_IMAGE (priv->image_type),
+      icon_name, GTK_ICON_SIZE_DIALOG);
+  gtk_widget_set_tooltip_text (priv->image_type,
+      empathy_protocol_name_to_display_name
+      (empathy_account_settings_get_protocol (settings)));
 
-       g_object_unref (store);
+  accounts_dialog_update_name_label (dialog,
+      empathy_account_settings_get_display_name (settings));
 }
 
 static void
-accounts_dialog_name_edited_cb (GtkCellRendererText   *renderer,
-                               gchar                 *path,
-                               gchar                 *new_text,
-                               EmpathyAccountsDialog *dialog)
+account_dialog_settings_ready_cb (EmpathyAccountSettings *settings,
+    GParamSpec *spec,
+    EmpathyAccountsDialog *dialog)
 {
-       EmpathyAccount    *account;
-       GtkTreeModel *model;
-       GtkTreePath  *treepath;
-       GtkTreeIter   iter;
-
-       if (empathy_account_manager_get_connecting_accounts (dialog->account_manager) > 0) {
-               dialog->connecting_id = g_timeout_add (FLASH_TIMEOUT,
-                                                      (GSourceFunc) accounts_dialog_flash_connecting_cb,
-                                                      dialog);
-       }
-
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview));
-       treepath = gtk_tree_path_new_from_string (path);
-       gtk_tree_model_get_iter (model, &iter, treepath);
-       gtk_tree_model_get (model, &iter,
-                           COL_ACCOUNT_POINTER, &account,
-                           -1);
-       gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-                           COL_NAME, new_text,
-                           -1);
-       gtk_tree_path_free (treepath);
-
-       empathy_account_set_display_name (account, new_text);
-       g_object_unref (account);
+  if (empathy_account_settings_is_ready (settings))
+    account_dialog_create_settings_widget (dialog, settings);
 }
 
 static void
-accounts_dialog_enable_toggled_cb (GtkCellRendererToggle *cell_renderer,
-                                  gchar                 *path,
-                                  EmpathyAccountsDialog *dialog)
+accounts_dialog_model_select_first (EmpathyAccountsDialog *dialog)
 {
-       EmpathyAccount    *account;
-       GtkTreeModel *model;
-       GtkTreePath  *treepath;
-       GtkTreeIter   iter;
-       gboolean      enabled;
-
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview));
-       treepath = gtk_tree_path_new_from_string (path);
-       gtk_tree_model_get_iter (model, &iter, treepath);
-       gtk_tree_model_get (model, &iter,
-                           COL_ACCOUNT_POINTER, &account,
-                           -1);
-       gtk_tree_path_free (treepath);
-
-       enabled = empathy_account_is_enabled (account);
-       empathy_account_set_enabled (account, !enabled);
-
-       DEBUG ("%s account %s", enabled ? "Disabled" : "Enable",
-               empathy_account_get_display_name (account));
-
-       g_object_unref (account);
+  GtkTreeView      *view;
+  GtkTreeModel     *model;
+  GtkTreeSelection *selection;
+  GtkTreeIter       iter;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  /* select first */
+  view = GTK_TREE_VIEW (priv->treeview);
+  model = gtk_tree_view_get_model (view);
+
+  if (gtk_tree_model_get_iter_first (model, &iter))
+    {
+      selection = gtk_tree_view_get_selection (view);
+      gtk_tree_selection_select_iter (selection, &iter);
+    }
+  else
+    {
+      accounts_dialog_update_settings (dialog, NULL);
+    }
+}
+
+static gboolean
+accounts_dialog_has_pending_change (EmpathyAccountsDialog *dialog,
+    EmpathyAccount **account)
+{
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+  GtkTreeSelection *selection;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
+
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    gtk_tree_model_get (model, &iter, COL_ACCOUNT_POINTER, account, -1);
+
+  return *account != NULL && priv->setting_widget_object != NULL
+      && empathy_account_widget_contains_pending_changes (
+          priv->setting_widget_object);
 }
 
 static void
-accounts_dialog_name_editing_started_cb (GtkCellRenderer       *renderer,
-                                        GtkCellEditable       *editable,
-                                        gchar                 *path,
-                                        EmpathyAccountsDialog *dialog)
+accounts_dialog_protocol_changed_cb (GtkWidget *widget,
+    EmpathyAccountsDialog *dialog)
 {
-       if (dialog->connecting_id) {
-               g_source_remove (dialog->connecting_id);
-       }
-       DEBUG ("Editing account name started; stopping flashing");
+  TpConnectionManager *cm;
+  TpConnectionManagerProtocol *proto;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  cm = empathy_protocol_chooser_dup_selected (
+      EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto);
+
+  if (cm == NULL)
+    return;
+
+  if (proto == NULL)
+    {
+      g_object_unref (cm);
+      return;
+    }
+
+  if (tp_connection_manager_protocol_can_register (proto))
+    {
+      gtk_widget_show (priv->radiobutton_register);
+      gtk_widget_show (priv->radiobutton_reuse);
+    }
+  else
+    {
+      gtk_widget_hide (priv->radiobutton_register);
+      gtk_widget_hide (priv->radiobutton_reuse);
+    }
+  g_object_unref (cm);
 }
 
 static void
-accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog)
+accounts_dialog_setup_ui_to_add_account (EmpathyAccountsDialog *dialog)
 {
-       GtkTreeView       *view;
-       GtkTreeViewColumn *column;
-       GtkCellRenderer   *cell;
-
-       view = GTK_TREE_VIEW (dialog->treeview);
-       gtk_tree_view_set_headers_visible (view, TRUE);
-
-       /* Enabled column */
-       cell = gtk_cell_renderer_toggle_new ();
-       gtk_tree_view_insert_column_with_attributes (view, -1,
-                                                    _("Enabled"),
-                                                    cell,
-                                                    "active", COL_ENABLED,
-                                                    NULL);
-       g_signal_connect (cell, "toggled",
-                         G_CALLBACK (accounts_dialog_enable_toggled_cb),
-                         dialog);
-
-       /* Account column */
-       column = gtk_tree_view_column_new ();
-       gtk_tree_view_column_set_title (column, _("Accounts"));
-       gtk_tree_view_column_set_expand (column, TRUE);
-       gtk_tree_view_append_column (view, column);
-
-       /* Icon renderer */
-       cell = gtk_cell_renderer_pixbuf_new ();
-       gtk_tree_view_column_pack_start (column, cell, FALSE);
-       gtk_tree_view_column_set_cell_data_func (column, cell,
-                                                (GtkTreeCellDataFunc)
-                                                accounts_dialog_model_pixbuf_data_func,
-                                                dialog,
-                                                NULL);
-
-       /* Name renderer */
-       cell = gtk_cell_renderer_text_new ();
-       g_object_set (cell,
-                     "ellipsize", PANGO_ELLIPSIZE_END,
-                     "width-chars", 25,
-                     "editable", TRUE,
-                     NULL);
-       gtk_tree_view_column_pack_start (column, cell, TRUE);
-       gtk_tree_view_column_add_attribute (column, cell, "text", COL_NAME);
-       g_signal_connect (cell, "edited",
-                         G_CALLBACK (accounts_dialog_name_edited_cb),
-                         dialog);
-       g_signal_connect (cell, "editing-started",
-                         G_CALLBACK (accounts_dialog_name_editing_started_cb),
-                         dialog);
+  GtkTreeView *view;
+  GtkTreeModel *model;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  view = GTK_TREE_VIEW (priv->treeview);
+  model = gtk_tree_view_get_model (view);
+
+  gtk_widget_set_sensitive (priv->button_add, FALSE);
+  gtk_widget_hide (priv->vbox_details);
+  gtk_widget_hide (priv->frame_no_protocol);
+  gtk_widget_show (priv->frame_new_account);
+
+  /* If we have no account, no need of a back button */
+  if (gtk_tree_model_iter_n_children (model, NULL) > 0)
+    gtk_widget_show (priv->button_back);
+  else
+    gtk_widget_hide (priv->button_back);
+
+  accounts_dialog_protocol_changed_cb (priv->radiobutton_register, dialog);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->radiobutton_reuse),
+      TRUE);
+  gtk_combo_box_set_active (GTK_COMBO_BOX (priv->combobox_protocol), 0);
+  gtk_widget_grab_focus (priv->combobox_protocol);
 }
 
 static void
-accounts_dialog_model_select_first (EmpathyAccountsDialog *dialog)
+accounts_dialog_show_question_dialog (EmpathyAccountsDialog *dialog,
+    gchar *primary_text,
+    gchar *secondary_text,
+    GCallback response_callback,
+    gpointer user_data,
+    const gchar *first_button_text,
+    ...)
 {
-       GtkTreeView      *view;
-       GtkTreeModel     *model;
-       GtkTreeSelection *selection;
-       GtkTreeIter       iter;
-
-       /* select first */
-       view = GTK_TREE_VIEW (dialog->treeview);
-       model = gtk_tree_view_get_model (view);
-
-       if (gtk_tree_model_get_iter_first (model, &iter)) {
-               selection = gtk_tree_view_get_selection (view);
-               gtk_tree_selection_select_iter (selection, &iter);
-       } else {
-               accounts_dialog_update_account (dialog, NULL);
-       }
+  va_list button_args;
+  GtkWidget *message_dialog;
+  const gchar *button_text;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  message_dialog = gtk_message_dialog_new (GTK_WINDOW (priv->window),
+      GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+      GTK_MESSAGE_QUESTION,
+      GTK_BUTTONS_NONE,
+      primary_text);
+
+  gtk_message_dialog_format_secondary_text (
+      GTK_MESSAGE_DIALOG (message_dialog), secondary_text);
+
+  va_start (button_args, first_button_text);
+  for (button_text = first_button_text;
+       button_text;
+       button_text = va_arg (button_args, const gchar *))
+    {
+      gint response_id;
+      response_id = va_arg (button_args, gint);
+
+      gtk_dialog_add_button (GTK_DIALOG (message_dialog), button_text, response_id);
+    }
+  va_end (button_args);
+
+  g_signal_connect (message_dialog, "response", response_callback, user_data);
+
+  gtk_widget_show (message_dialog);
 }
 
 static void
-accounts_dialog_model_pixbuf_data_func (GtkTreeViewColumn    *tree_column,
-                                       GtkCellRenderer      *cell,
-                                       GtkTreeModel         *model,
-                                       GtkTreeIter          *iter,
-                                       EmpathyAccountsDialog *dialog)
+accounts_dialog_add_pending_changes_response_cb (GtkDialog *message_dialog,
+  gint response_id,
+  gpointer *user_data)
 {
-       EmpathyAccount     *account;
-       const gchar        *icon_name;
-       GdkPixbuf          *pixbuf;
-       TpConnectionStatus  status;
-
-       gtk_tree_model_get (model, iter,
-                           COL_STATUS, &status,
-                           COL_ACCOUNT_POINTER, &account,
-                           -1);
-
-       icon_name = empathy_icon_name_from_account (account);
-       pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
-
-       if (pixbuf) {
-               if (status == TP_CONNECTION_STATUS_DISCONNECTED ||
-                   (status == TP_CONNECTION_STATUS_CONNECTING &&
-                    !dialog->connecting_show)) {
-                       GdkPixbuf *modded_pixbuf;
-
-                       modded_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
-                                                       TRUE,
-                                                       8,
-                                                       gdk_pixbuf_get_width (pixbuf),
-                                                       gdk_pixbuf_get_height (pixbuf));
-
-                       gdk_pixbuf_saturate_and_pixelate (pixbuf,
-                                                         modded_pixbuf,
-                                                         1.0,
-                                                         TRUE);
-                       g_object_unref (pixbuf);
-                       pixbuf = modded_pixbuf;
-               }
-       }
-
-       g_object_set (cell,
-                     "visible", TRUE,
-                     "pixbuf", pixbuf,
-                     NULL);
-
-       g_object_unref (account);
-       if (pixbuf) {
-               g_object_unref (pixbuf);
-       }
+  EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (user_data);
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  gtk_widget_destroy (GTK_WIDGET (message_dialog));
+
+  if (response_id == GTK_RESPONSE_YES)
+    {
+      empathy_account_widget_discard_pending_changes (
+          priv->setting_widget_object);
+      accounts_dialog_setup_ui_to_add_account (dialog);
+    }
 }
 
-static gboolean
-accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog,
-                                EmpathyAccount        *account,
-                                GtkTreeIter           *iter)
+static void
+accounts_dialog_button_add_clicked_cb (GtkWidget *button,
+    EmpathyAccountsDialog *dialog)
 {
-       GtkTreeView      *view;
-       GtkTreeSelection *selection;
-       GtkTreeModel     *model;
-       gboolean          ok;
-
-       /* Update the status in the model */
-       view = GTK_TREE_VIEW (dialog->treeview);
-       selection = gtk_tree_view_get_selection (view);
-       model = gtk_tree_view_get_model (view);
-
-       for (ok = gtk_tree_model_get_iter_first (model, iter);
-            ok;
-            ok = gtk_tree_model_iter_next (model, iter)) {
-               EmpathyAccount *this_account;
-               gboolean   equal;
-
-               gtk_tree_model_get (model, iter,
-                                   COL_ACCOUNT_POINTER, &this_account,
-                                   -1);
-
-               equal = empathy_account_equal (this_account, account);
-               g_object_unref (this_account);
-
-               if (equal) {
-                       return TRUE;
-               }
-       }
-
-       return FALSE;
+  EmpathyAccount *account = NULL;
+
+  if (accounts_dialog_has_pending_change (dialog, &account))
+    {
+      gchar *question_dialog_primary_text = g_strdup_printf (
+          PENDING_CHANGES_QUESTION_PRIMARY_TEXT,
+          empathy_account_get_display_name (account));
+
+      accounts_dialog_show_question_dialog (dialog,
+          question_dialog_primary_text,
+          _("You are about to create a new account, which will discard\n"
+              "your changes. Are you sure you want to proceed?"),
+          G_CALLBACK (accounts_dialog_add_pending_changes_response_cb),
+          dialog,
+          GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
+          GTK_STOCK_DISCARD, GTK_RESPONSE_YES, NULL);
+
+      g_free (question_dialog_primary_text);
+    }
+  else
+    {
+      accounts_dialog_setup_ui_to_add_account (dialog);
+    }
 }
 
-static EmpathyAccount *
-accounts_dialog_model_get_selected (EmpathyAccountsDialog *dialog)
+static void
+accounts_dialog_update_settings (EmpathyAccountsDialog *dialog,
+    EmpathyAccountSettings *settings)
 {
-       GtkTreeView      *view;
-       GtkTreeModel     *model;
-       GtkTreeSelection *selection;
-       GtkTreeIter       iter;
-       EmpathyAccount   *account;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  if (priv->settings_ready != NULL)
+    {
+      g_signal_handler_disconnect (priv->settings_ready,
+          priv->settings_ready_id);
+      priv->settings_ready = NULL;
+      priv->settings_ready_id = 0;
+    }
+
+  if (!settings)
+    {
+      GtkTreeView  *view;
+      GtkTreeModel *model;
+
+      view = GTK_TREE_VIEW (priv->treeview);
+      model = gtk_tree_view_get_model (view);
+
+      if (gtk_tree_model_iter_n_children (model, NULL) > 0)
+        {
+          /* We have configured accounts, select the first one */
+          accounts_dialog_model_select_first (dialog);
+          return;
+        }
+      if (empathy_connection_managers_get_cms_num (priv->cms) > 0)
+        {
+          /* We have no account configured but we have some
+           * profiles installed. The user obviously wants to add
+           * an account. Click on the Add button for him. */
+          accounts_dialog_button_add_clicked_cb (priv->button_add,
+              dialog);
+          return;
+        }
+
+      /* No account and no profile, warn the user */
+      gtk_widget_hide (priv->vbox_details);
+      gtk_widget_hide (priv->frame_new_account);
+      gtk_widget_show (priv->frame_no_protocol);
+      gtk_widget_set_sensitive (priv->button_add, FALSE);
+      return;
+    }
+
+  /* We have an account selected, destroy old settings and create a new
+   * one for the account selected */
+  gtk_widget_hide (priv->frame_new_account);
+  gtk_widget_hide (priv->frame_no_protocol);
+  gtk_widget_show (priv->vbox_details);
+  gtk_widget_set_sensitive (priv->button_add, TRUE);
+
+  if (priv->settings_widget)
+    {
+      gtk_widget_destroy (priv->settings_widget);
+      priv->settings_widget = NULL;
+    }
+
+  if (empathy_account_settings_is_ready (settings))
+    {
+      account_dialog_create_settings_widget (dialog, settings);
+    }
+  else
+    {
+      priv->settings_ready = settings;
+      priv->settings_ready_id =
+        g_signal_connect (settings, "notify::ready",
+            G_CALLBACK (account_dialog_settings_ready_cb), dialog);
+    }
 
-       view = GTK_TREE_VIEW (dialog->treeview);
-       selection = gtk_tree_view_get_selection (view);
+}
 
-       if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
-               return NULL;
-       }
+static void
+accounts_dialog_name_editing_started_cb (GtkCellRenderer *renderer,
+    GtkCellEditable *editable,
+    gchar *path,
+    EmpathyAccountsDialog *dialog)
+{
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
 
-       gtk_tree_model_get (model, &iter, COL_ACCOUNT_POINTER, &account, -1);
+  if (priv->connecting_id)
+    g_source_remove (priv->connecting_id);
 
-       return account;
+  DEBUG ("Editing account name started; stopping flashing");
 }
 
 static void
-accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog,
-                                   EmpathyAccount        *account)
+accounts_dialog_model_pixbuf_data_func (GtkTreeViewColumn *tree_column,
+    GtkCellRenderer *cell,
+    GtkTreeModel *model,
+    GtkTreeIter *iter,
+    EmpathyAccountsDialog *dialog)
 {
-       GtkTreeSelection *selection;
-       GtkTreeIter       iter;
+  EmpathyAccountSettings  *settings;
+  gchar              *icon_name;
+  GdkPixbuf          *pixbuf;
+  TpConnectionStatus  status;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  gtk_tree_model_get (model, iter,
+      COL_STATUS, &status,
+      COL_ACCOUNT_SETTINGS_POINTER, &settings,
+      -1);
+
+  icon_name = empathy_account_settings_get_icon_name (settings);
+  pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+
+  if (pixbuf)
+    {
+      if (status == TP_CONNECTION_STATUS_DISCONNECTED ||
+          (status == TP_CONNECTION_STATUS_CONNECTING &&
+              !priv->connecting_show))
+        {
+          GdkPixbuf *modded_pixbuf;
+
+          modded_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+              TRUE,
+              8,
+              gdk_pixbuf_get_width (pixbuf),
+              gdk_pixbuf_get_height (pixbuf));
+
+          gdk_pixbuf_saturate_and_pixelate (pixbuf,
+              modded_pixbuf,
+              1.0,
+              TRUE);
+          g_object_unref (pixbuf);
+          pixbuf = modded_pixbuf;
+        }
+    }
+
+  g_object_set (cell,
+      "visible", TRUE,
+      "pixbuf", pixbuf,
+      NULL);
+
+  g_object_unref (settings);
+
+  if (pixbuf)
+    g_object_unref (pixbuf);
+}
 
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->treeview));
-       if (accounts_dialog_get_account_iter (dialog, account, &iter)) {
-               gtk_tree_selection_select_iter (selection, &iter);
-       }
+static gboolean
+accounts_dialog_row_changed_foreach (GtkTreeModel *model,
+    GtkTreePath *path,
+    GtkTreeIter *iter,
+    gpointer user_data)
+{
+  gtk_tree_model_row_changed (model, path, iter);
+
+  return FALSE;
 }
 
 static gboolean
-accounts_dialog_model_remove_selected (EmpathyAccountsDialog *dialog)
+accounts_dialog_flash_connecting_cb (EmpathyAccountsDialog *dialog)
 {
-       GtkTreeView      *view;
-       GtkTreeModel     *model;
-       GtkTreeSelection *selection;
-       GtkTreeIter       iter;
+  GtkTreeView  *view;
+  GtkTreeModel *model;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  priv->connecting_show = !priv->connecting_show;
 
-       view = GTK_TREE_VIEW (dialog->treeview);
-       selection = gtk_tree_view_get_selection (view);
+  view = GTK_TREE_VIEW (priv->treeview);
+  model = gtk_tree_view_get_model (view);
+
+  gtk_tree_model_foreach (model, accounts_dialog_row_changed_foreach, NULL);
+
+  return TRUE;
+}
+
+static void
+accounts_dialog_name_edited_cb (GtkCellRendererText *renderer,
+    gchar *path,
+    gchar *new_text,
+    EmpathyAccountsDialog *dialog)
+{
+  EmpathyAccountSettings    *settings;
+  GtkTreeModel *model;
+  GtkTreePath  *treepath;
+  GtkTreeIter   iter;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  if (empathy_account_manager_get_connecting_accounts
+      (priv->account_manager) > 0)
+    {
+      priv->connecting_id = g_timeout_add (FLASH_TIMEOUT,
+          (GSourceFunc) accounts_dialog_flash_connecting_cb,
+          dialog);
+    }
+
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+  treepath = gtk_tree_path_new_from_string (path);
+  gtk_tree_model_get_iter (model, &iter, treepath);
+  gtk_tree_model_get (model, &iter,
+      COL_ACCOUNT_SETTINGS_POINTER, &settings,
+      -1);
+  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+      COL_NAME, new_text,
+      -1);
+  gtk_tree_path_free (treepath);
+
+  empathy_account_settings_set_display_name_async (settings, new_text,
+      NULL, NULL);
+  g_object_set (settings, "display-name-overridden", TRUE, NULL);
+  g_object_unref (settings);
+}
 
-       if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
-               return FALSE;
-       }
+static void
+accounts_dialog_delete_account_response_cb (GtkDialog *message_dialog,
+  gint response_id,
+  gpointer user_data)
+{
+  EmpathyAccount *account;
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+  GtkTreeSelection *selection;
+  EmpathyAccountsDialog *account_dialog = EMPATHY_ACCOUNTS_DIALOG (user_data);
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (account_dialog);
+
+  if (response_id == GTK_RESPONSE_YES)
+    {
+      selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
+
+      if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+        return;
+
+      gtk_tree_model_get (model, &iter, COL_ACCOUNT_POINTER, &account, -1);
+
+      if (account != NULL)
+        {
+          g_signal_handlers_disconnect_by_func (account,
+              accounts_dialog_account_display_name_changed_cb, account_dialog);
+          empathy_account_remove_async (account, NULL, NULL);
+          g_object_unref (account);
+          account = NULL;
+        }
+
+      gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+      accounts_dialog_model_select_first (account_dialog);
+    }
+
+  gtk_widget_destroy (GTK_WIDGET (message_dialog));
+}
 
-       return gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+static void
+accounts_dialog_view_delete_activated_cb (EmpathyCellRendererActivatable *cell,
+    const gchar *path_string,
+    EmpathyAccountsDialog *dialog)
+{
+  EmpathyAccount *account;
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+  gchar *question_dialog_primary_text;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+
+  if (!gtk_tree_model_get_iter_from_string (model, &iter, path_string))
+    return;
+
+  gtk_tree_model_get (model, &iter, COL_ACCOUNT_POINTER, &account, -1);
+
+  if (account == NULL || !empathy_account_is_valid (account))
+    {
+      gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+      accounts_dialog_model_select_first (dialog);
+      return;
+    }
+
+  question_dialog_primary_text = g_strdup_printf (
+      _("You are about to remove your %s account!\n"
+          "Are you sure you want to proceed?"),
+      empathy_account_get_display_name (account));
+
+  accounts_dialog_show_question_dialog (dialog, question_dialog_primary_text,
+      _("Any associated conversations and chat rooms will NOT be "
+          "removed if you decide to proceed.\n"
+          "\n"
+          "Should you decide to add the account back at a later time, "
+          "they will still be available."),
+      G_CALLBACK (accounts_dialog_delete_account_response_cb),
+      dialog,
+      GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
+      GTK_STOCK_REMOVE, GTK_RESPONSE_YES, NULL);
+
+  g_free (question_dialog_primary_text);
+
+  if (account != NULL)
+    {
+      g_object_unref (account);
+      account = NULL;
+    }
 }
 
 static void
-accounts_dialog_model_selection_changed (GtkTreeSelection     *selection,
-                                        EmpathyAccountsDialog *dialog)
+accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog)
+{
+  GtkTreeView       *view;
+  GtkTreeViewColumn *column;
+  GtkCellRenderer   *cell;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  view = GTK_TREE_VIEW (priv->treeview);
+  gtk_tree_view_set_headers_visible (view, FALSE);
+
+  /* Account column */
+  column = gtk_tree_view_column_new ();
+  gtk_tree_view_column_set_expand (column, TRUE);
+  gtk_tree_view_append_column (view, column);
+
+  /* Icon renderer */
+  cell = gtk_cell_renderer_pixbuf_new ();
+  gtk_tree_view_column_pack_start (column, cell, FALSE);
+  gtk_tree_view_column_set_cell_data_func (column, cell,
+      (GtkTreeCellDataFunc)
+      accounts_dialog_model_pixbuf_data_func,
+      dialog,
+      NULL);
+
+  /* Name renderer */
+  cell = gtk_cell_renderer_text_new ();
+  g_object_set (cell,
+      "ellipsize", PANGO_ELLIPSIZE_END,
+      "width-chars", 25,
+      "editable", TRUE,
+      NULL);
+  gtk_tree_view_column_pack_start (column, cell, TRUE);
+  gtk_tree_view_column_add_attribute (column, cell, "text", COL_NAME);
+  g_signal_connect (cell, "edited",
+      G_CALLBACK (accounts_dialog_name_edited_cb),
+      dialog);
+  g_signal_connect (cell, "editing-started",
+      G_CALLBACK (accounts_dialog_name_editing_started_cb),
+      dialog);
+
+  /* Delete column */
+  cell = empathy_cell_renderer_activatable_new ();
+  gtk_tree_view_column_pack_start (column, cell, FALSE);
+  g_object_set (cell,
+        "icon-name", GTK_STOCK_DELETE,
+        NULL);
+
+  g_signal_connect (cell, "path-activated",
+      G_CALLBACK (accounts_dialog_view_delete_activated_cb),
+      dialog);
+}
+
+static EmpathyAccountSettings *
+accounts_dialog_model_get_selected_settings (EmpathyAccountsDialog *dialog)
 {
-       EmpathyAccount    *account;
-       GtkTreeModel *model;
-       GtkTreeIter   iter;
-       gboolean      is_selection;
+  GtkTreeView      *view;
+  GtkTreeModel     *model;
+  GtkTreeSelection *selection;
+  GtkTreeIter       iter;
+  EmpathyAccountSettings   *settings;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
 
-       is_selection = gtk_tree_selection_get_selected (selection, &model, &iter);
+  view = GTK_TREE_VIEW (priv->treeview);
+  selection = gtk_tree_view_get_selection (view);
 
-       account = accounts_dialog_model_get_selected (dialog);
-       accounts_dialog_update_account (dialog, account);
+  if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+    return NULL;
 
-       if (account) {
-               g_object_unref (account);
-       }
+  gtk_tree_model_get (model, &iter,
+      COL_ACCOUNT_SETTINGS_POINTER, &settings, -1);
+
+  return settings;
 }
 
 static void
-accounts_dialog_add_or_update_account (EmpathyAccountsDialog *dialog,
-                                      EmpathyAccount        *account)
+accounts_dialog_model_selection_changed (GtkTreeSelection *selection,
+    EmpathyAccountsDialog *dialog)
 {
-       GtkTreeModel       *model;
-       GtkTreeIter         iter;
-       TpConnectionStatus  status;
-       const gchar        *name;
-       gboolean            enabled;
-
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview));
-       g_object_get (account, "status", &status, NULL);
-       name = empathy_account_get_display_name (account);
-       enabled = empathy_account_is_enabled (account);
-
-       if (!accounts_dialog_get_account_iter (dialog, account, &iter)) {
-               DEBUG ("Adding new account");
-               gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-       }
-
-       gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-                           COL_ENABLED, enabled,
-                           COL_NAME, name,
-                           COL_STATUS, status,
-                           COL_ACCOUNT_POINTER, account,
-                           -1);
-
-       accounts_dialog_connection_changed_cb (dialog->account_manager,
-                                              account,
-                                              TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED,
-                                              status,
-                                              TP_CONNECTION_STATUS_DISCONNECTED,
-                                              dialog);
+  EmpathyAccountSettings *settings;
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+  gboolean      is_selection;
+
+  is_selection = gtk_tree_selection_get_selected (selection, &model, &iter);
+
+  settings = accounts_dialog_model_get_selected_settings (dialog);
+  accounts_dialog_update_settings (dialog, settings);
+
+  if (settings != NULL)
+    g_object_unref (settings);
 }
 
 static void
-accounts_dialog_account_added_cb (EmpathyAccountManager *manager,
-                                 EmpathyAccount *account,
-                                 EmpathyAccountsDialog *dialog)
+accounts_dialog_selection_change_response_cb (GtkDialog *message_dialog,
+  gint response_id,
+  gpointer *user_data)
 {
-       const gchar *current_name;
-       gchar       *account_param = NULL;
-
-       accounts_dialog_add_or_update_account (dialog, account);
-
-       /* Change the display name to "%s (%s)" % (protocol, account).
-        *  - The protocol is the display name of the profile.
-        *  - The account should be the normalized name of the EmpathyAccount but
-        *    it's not set until first connection, so we get the "account"
-        *    parameter for CM that have it. */
-       current_name = empathy_account_get_display_name (account);
-       account_param = empathy_account_get_param_string (account, "account");
-       if (!EMP_STR_EMPTY (account_param)) {
-               McProfile   *profile;
-               const gchar *profile_name;
-               gchar       *new_name;
-
-               profile = empathy_account_get_profile (account);
-               profile_name = mc_profile_get_display_name (profile);
-               new_name = g_strdup_printf ("%s (%s)", profile_name,
-                                           account_param);
-
-               DEBUG ("Setting new display name for account %s: '%s'",
-                      empathy_account_get_unique_name (account), new_name);
-
-               empathy_account_set_display_name (account, new_name);
-               g_free (new_name);
-               g_object_unref (profile);
-       } else {
-               /* FIXME: This CM has no account parameter, what can be done? */
-       }
-       g_free (account_param);
+  EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (user_data);
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  gtk_widget_destroy (GTK_WIDGET (message_dialog));
+
+    if (response_id == GTK_RESPONSE_YES && priv->destination_row != NULL)
+      {
+        /* The user wants to lose unsaved changes to the currently selected
+         * account and select another account. We discard the changes and
+         * select the other account. */
+        GtkTreePath *path;
+        GtkTreeSelection *selection;
+
+        priv->force_change_row = TRUE;
+        empathy_account_widget_discard_pending_changes (
+            priv->setting_widget_object);
+
+        path = gtk_tree_row_reference_get_path (priv->destination_row);
+        selection = gtk_tree_view_get_selection (
+            GTK_TREE_VIEW (priv->treeview));
+
+        if (path != NULL)
+          {
+            /* This will trigger a call to
+             * accounts_dialog_account_selection_change() */
+            gtk_tree_selection_select_path (selection, path);
+            gtk_tree_path_free (path);
+          }
+
+        gtk_tree_row_reference_free (priv->destination_row);
+      }
+    else
+      {
+        priv->force_change_row = FALSE;
+      }
+}
+
+static gboolean
+accounts_dialog_account_selection_change (GtkTreeSelection *selection,
+    GtkTreeModel *model,
+    GtkTreePath *path,
+    gboolean path_currently_selected,
+    gpointer data)
+{
+  EmpathyAccount *account = NULL;
+  EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (data);
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  if (priv->force_change_row)
+    {
+      /* We came back here because the user wants to discard changes to his
+       * modified account. The changes have already been discarded so we
+       * just change the selected row. */
+      priv->force_change_row = FALSE;
+      return TRUE;
+    }
+
+  if (accounts_dialog_has_pending_change (dialog, &account))
+    {
+      /* The currently selected account has some unsaved changes. We ask
+       * the user if he really wants to lose his changes and select another
+       * account */
+      gchar *question_dialog_primary_text;
+      priv->destination_row = gtk_tree_row_reference_new (model, path);
+
+      question_dialog_primary_text = g_strdup_printf (
+          PENDING_CHANGES_QUESTION_PRIMARY_TEXT,
+          empathy_account_get_display_name (account));
+
+      accounts_dialog_show_question_dialog (dialog,
+          question_dialog_primary_text,
+          _("You are about to select another account, which will discard\n"
+              "your changes. Are you sure you want to proceed?"),
+          G_CALLBACK (accounts_dialog_selection_change_response_cb),
+          dialog,
+          GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
+          GTK_STOCK_DISCARD, GTK_RESPONSE_YES, NULL);
+
+      g_free (question_dialog_primary_text);
+    }
+  else
+    {
+      return TRUE;
+    }
+
+  return FALSE;
 }
 
 static void
-accounts_dialog_account_removed_cb (EmpathyAccountManager *manager,
-                                   EmpathyAccount       *account,
-                                   EmpathyAccountsDialog *dialog)
+accounts_dialog_model_setup (EmpathyAccountsDialog *dialog)
 {
+  GtkListStore     *store;
+  GtkTreeSelection *selection;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  store = gtk_list_store_new (COL_COUNT,
+      G_TYPE_STRING,         /* name */
+      G_TYPE_UINT,           /* status */
+      EMPATHY_TYPE_ACCOUNT,   /* account */
+      EMPATHY_TYPE_ACCOUNT_SETTINGS); /* settings */
+
+  gtk_tree_view_set_model (GTK_TREE_VIEW (priv->treeview),
+      GTK_TREE_MODEL (store));
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
+  gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+  gtk_tree_selection_set_select_function (selection,
+      accounts_dialog_account_selection_change, dialog, NULL);
+
+  g_signal_connect (selection, "changed",
+      G_CALLBACK (accounts_dialog_model_selection_changed),
+      dialog);
+
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
+      COL_NAME, GTK_SORT_ASCENDING);
 
-       accounts_dialog_model_set_selected (dialog, account);
-       accounts_dialog_model_remove_selected (dialog);
+  accounts_dialog_model_add_columns (dialog);
+
+  g_object_unref (store);
 }
 
 static gboolean
-accounts_dialog_row_changed_foreach (GtkTreeModel *model,
-                                    GtkTreePath  *path,
-                                    GtkTreeIter  *iter,
-                                    gpointer      user_data)
+accounts_dialog_get_settings_iter (EmpathyAccountsDialog *dialog,
+    EmpathyAccountSettings *settings,
+    GtkTreeIter *iter)
 {
-       gtk_tree_model_row_changed (model, path, iter);
-
-       return FALSE;
+  GtkTreeView      *view;
+  GtkTreeSelection *selection;
+  GtkTreeModel     *model;
+  gboolean          ok;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  /* Update the status in the model */
+  view = GTK_TREE_VIEW (priv->treeview);
+  selection = gtk_tree_view_get_selection (view);
+  model = gtk_tree_view_get_model (view);
+
+  for (ok = gtk_tree_model_get_iter_first (model, iter);
+       ok;
+       ok = gtk_tree_model_iter_next (model, iter))
+    {
+      EmpathyAccountSettings *this_settings;
+      gboolean   equal;
+
+      gtk_tree_model_get (model, iter,
+          COL_ACCOUNT_SETTINGS_POINTER, &this_settings,
+          -1);
+
+      equal = (this_settings == settings);
+      g_object_unref (this_settings);
+
+      if (equal)
+        return TRUE;
+    }
+
+  return FALSE;
 }
 
 static gboolean
-accounts_dialog_flash_connecting_cb (EmpathyAccountsDialog *dialog)
+accounts_dialog_get_account_iter (EmpathyAccountsDialog *dialog,
+    EmpathyAccount *account,
+    GtkTreeIter *iter)
 {
-       GtkTreeView  *view;
-       GtkTreeModel *model;
+  GtkTreeView      *view;
+  GtkTreeSelection *selection;
+  GtkTreeModel     *model;
+  gboolean          ok;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  /* Update the status in the model */
+  view = GTK_TREE_VIEW (priv->treeview);
+  selection = gtk_tree_view_get_selection (view);
+  model = gtk_tree_view_get_model (view);
+
+  for (ok = gtk_tree_model_get_iter_first (model, iter);
+       ok;
+       ok = gtk_tree_model_iter_next (model, iter))
+    {
+      EmpathyAccountSettings *settings;
+      gboolean   equal;
+
+      gtk_tree_model_get (model, iter,
+          COL_ACCOUNT_SETTINGS_POINTER, &settings,
+          -1);
+
+      equal = empathy_account_settings_has_account (settings, account);
+      g_object_unref (settings);
+
+      if (equal)
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog,
+    EmpathyAccountSettings *settings)
+{
+  GtkTreeSelection *selection;
+  GtkTreeIter       iter;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
 
-       dialog->connecting_show = !dialog->connecting_show;
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
+  if (accounts_dialog_get_settings_iter (dialog, settings, &iter))
+    gtk_tree_selection_select_iter (selection, &iter);
+}
+static void
+accounts_dialog_add (EmpathyAccountsDialog *dialog,
+    EmpathyAccountSettings *settings)
+{
+  GtkTreeModel       *model;
+  GtkTreeIter         iter;
+  const gchar        *name;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
 
-       view = GTK_TREE_VIEW (dialog->treeview);
-       model = gtk_tree_view_get_model (view);
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+  name = empathy_account_settings_get_display_name (settings);
 
-       gtk_tree_model_foreach (model, accounts_dialog_row_changed_foreach, NULL);
+  gtk_list_store_append (GTK_LIST_STORE (model), &iter);
 
-       return TRUE;
+  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+      COL_NAME, name,
+      COL_STATUS, TP_CONNECTION_STATUS_DISCONNECTED,
+      COL_ACCOUNT_SETTINGS_POINTER, settings,
+      -1);
 }
 
 static void
-accounts_dialog_connection_changed_cb     (EmpathyAccountManager    *manager,
-                                          EmpathyAccount           *account,
-                                          TpConnectionStatusReason  reason,
-                                          TpConnectionStatus        current,
-                                          TpConnectionStatus        previous,
-                                          EmpathyAccountsDialog    *dialog)
+accounts_dialog_connection_changed_cb     (EmpathyAccountManager *manager,
+    EmpathyAccount *account,
+    TpConnectionStatusReason reason,
+    TpConnectionStatus current,
+    TpConnectionStatus previous,
+    EmpathyAccountsDialog *dialog)
 {
-       GtkTreeModel *model;
-       GtkTreeIter   iter;
-       gboolean      found;
-
-       /* Update the status in the model */
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview));
+  GtkTreeModel *model;
+  GtkTreeIter   iter;
+  gboolean      found;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  /* Update the status in the model */
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+
+  if (accounts_dialog_get_account_iter (dialog, account, &iter))
+    {
+      GtkTreePath *path;
+
+      gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+          COL_STATUS, current,
+          -1);
+
+      path = gtk_tree_model_get_path (model, &iter);
+      gtk_tree_model_row_changed (model, path, &iter);
+      gtk_tree_path_free (path);
+    }
+
+  found = (empathy_account_manager_get_connecting_accounts (manager) > 0);
+
+  if (!found && priv->connecting_id)
+    {
+      g_source_remove (priv->connecting_id);
+      priv->connecting_id = 0;
+    }
+
+  if (found && !priv->connecting_id)
+    priv->connecting_id = g_timeout_add (FLASH_TIMEOUT,
+        (GSourceFunc) accounts_dialog_flash_connecting_cb,
+        dialog);
+}
 
-       if (accounts_dialog_get_account_iter (dialog, account, &iter)) {
-               GtkTreePath *path;
+static void
+accounts_dialog_account_display_name_changed_cb (EmpathyAccount *account,
+  GParamSpec *pspec,
+  gpointer user_data)
+{
+  const gchar *display_name;
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+  EmpathyAccountSettings *settings;
+  EmpathyAccount *selected_account;
+  EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (user_data);
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  display_name = empathy_account_get_display_name (account);
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+  settings = accounts_dialog_model_get_selected_settings (dialog);
+  selected_account = empathy_account_settings_get_account (settings);
+
+  if (accounts_dialog_get_account_iter (dialog, account, &iter))
+    {
+      gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+          COL_NAME, display_name,
+          -1);
+    }
+
+  if (selected_account == account)
+    accounts_dialog_update_name_label (dialog, display_name);
+
+  g_object_unref (settings);
+}
 
-               gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-                                   COL_STATUS, current,
-                                   -1);
+static void
+accounts_dialog_add_account (EmpathyAccountsDialog *dialog,
+    EmpathyAccount *account)
+{
+  EmpathyAccountSettings *settings;
+  GtkTreeModel       *model;
+  GtkTreeIter         iter;
+  TpConnectionStatus  status;
+  const gchar        *name;
+  gboolean            enabled;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+  g_object_get (account, "connection-status", &status, NULL);
+  name = empathy_account_get_display_name (account);
+  enabled = empathy_account_is_enabled (account);
+
+  if (!accounts_dialog_get_account_iter (dialog, account, &iter))
+    gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+
+  settings = empathy_account_settings_new_for_account (account);
+
+  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+      COL_NAME, name,
+      COL_STATUS, status,
+      COL_ACCOUNT_POINTER, account,
+      COL_ACCOUNT_SETTINGS_POINTER, settings,
+      -1);
+
+  accounts_dialog_connection_changed_cb (priv->account_manager,
+      account,
+      TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED,
+      status,
+      TP_CONNECTION_STATUS_DISCONNECTED,
+      dialog);
+
+  g_signal_connect (account, "notify::display-name",
+      G_CALLBACK (accounts_dialog_account_display_name_changed_cb), dialog);
+
+  g_object_unref (settings);
+}
 
-               path = gtk_tree_model_get_path (model, &iter);
-               gtk_tree_model_row_changed (model, path, &iter);
-               gtk_tree_path_free (path);
-       }
+static void
+accounts_dialog_update (EmpathyAccountsDialog *dialog,
+    EmpathyAccountSettings *settings)
+{
+  GtkTreeModel       *model;
+  GtkTreeIter         iter;
+  TpConnectionStatus  status = TP_CONNECTION_STATUS_DISCONNECTED;
+  const gchar        *name;
+  gboolean            enabled = FALSE;
+  EmpathyAccount     *account;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+  name = empathy_account_settings_get_display_name (settings);
+
+  account = empathy_account_settings_get_account (settings);
+  if (account != NULL)
+    {
+      enabled = empathy_account_is_enabled (account);
+      g_object_get (account, "connection-status", &status, NULL);
+    }
+
+  accounts_dialog_get_settings_iter (dialog, settings, &iter);
+  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+      COL_NAME, name,
+      COL_STATUS, status,
+      COL_ACCOUNT_POINTER, account,
+      COL_ACCOUNT_SETTINGS_POINTER, settings,
+      -1);
+}
 
-       found = (empathy_account_manager_get_connecting_accounts (manager) > 0);
+static void
+accounts_dialog_account_added_cb (EmpathyAccountManager *manager,
+    EmpathyAccount *account,
+    EmpathyAccountsDialog *dialog)
+{
+  accounts_dialog_add_account (dialog, account);
+}
 
-       if (!found && dialog->connecting_id) {
-               g_source_remove (dialog->connecting_id);
-               dialog->connecting_id = 0;
-       }
 
-       if (found && !dialog->connecting_id) {
-               dialog->connecting_id = g_timeout_add (FLASH_TIMEOUT,
-                                                      (GSourceFunc) accounts_dialog_flash_connecting_cb,
-                                                      dialog);
-       }
+static void
+accounts_dialog_account_removed_cb (EmpathyAccountManager *manager,
+    EmpathyAccount *account,
+    EmpathyAccountsDialog *dialog)
+{
+  GtkTreeIter iter;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  if (accounts_dialog_get_account_iter (dialog, account, &iter))
+    {
+      g_signal_handlers_disconnect_by_func (account,
+          accounts_dialog_account_display_name_changed_cb, dialog);
+      gtk_list_store_remove (GTK_LIST_STORE (
+            gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview))), &iter);
+    }
 }
 
 static void
 enable_or_disable_account (EmpathyAccountsDialog *dialog,
-                          EmpathyAccount *account,
-                          gboolean enabled)
+    EmpathyAccount *account,
+    gboolean enabled)
 {
-       GtkTreeModel *model;
-       GtkTreeIter   iter;
+  GtkTreeModel *model;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
 
-       /* Update the status in the model */
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview));
+  /* Update the status in the model */
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
 
-       DEBUG ("Account %s is now %s",
-               empathy_account_get_display_name (account),
-               enabled ? "enabled" : "disabled");
-
-       if (accounts_dialog_get_account_iter (dialog, account, &iter)) {
-               gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-                                   COL_ENABLED, enabled,
-                                   -1);
-       }
+  DEBUG ("Account %s is now %s",
+      empathy_account_get_display_name (account),
+      enabled ? "enabled" : "disabled");
 }
 
 static void
 accounts_dialog_account_disabled_cb (EmpathyAccountManager *manager,
-                                    EmpathyAccount        *account,
-                                    EmpathyAccountsDialog *dialog)
+    EmpathyAccount *account,
+    EmpathyAccountsDialog *dialog)
 {
-       enable_or_disable_account (dialog, account, FALSE);
+  enable_or_disable_account (dialog, account, FALSE);
 }
 
 static void
 accounts_dialog_account_enabled_cb (EmpathyAccountManager *manager,
-                                   EmpathyAccount        *account,
-                                   EmpathyAccountsDialog *dialog)
+    EmpathyAccount *account,
+    EmpathyAccountsDialog *dialog)
 {
-       enable_or_disable_account (dialog, account, TRUE);
+  enable_or_disable_account (dialog, account, TRUE);
 }
 
 static void
 accounts_dialog_account_changed_cb (EmpathyAccountManager *manager,
-                                   EmpathyAccount        *account,
-                                   EmpathyAccountsDialog  *dialog)
+    EmpathyAccount *account,
+    EmpathyAccountsDialog  *dialog)
+{
+  EmpathyAccountSettings *settings, *selected_settings;
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
+
+  if (!accounts_dialog_get_account_iter (dialog, account, &iter))
+    return;
+
+  gtk_tree_model_get (model, &iter,
+      COL_ACCOUNT_SETTINGS_POINTER, &settings,
+      -1);
+
+  accounts_dialog_update (dialog, settings);
+  selected_settings = accounts_dialog_model_get_selected_settings (dialog);
+
+  if (settings == selected_settings)
+    accounts_dialog_update_name_label (dialog,
+        empathy_account_settings_get_display_name (settings));
+
+  if (settings)
+    g_object_unref (settings);
+
+  if (selected_settings)
+    g_object_unref (selected_settings);
+}
+
+static void
+accounts_dialog_button_create_clicked_cb (GtkWidget *button,
+    EmpathyAccountsDialog *dialog)
+{
+  EmpathyAccountSettings *settings;
+  gchar *str;
+  const gchar *display_name;
+  TpConnectionManager *cm;
+  TpConnectionManagerProtocol *proto;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  cm = empathy_protocol_chooser_dup_selected (
+      EMPATHY_PROTOCOL_CHOOSER (priv->combobox_protocol), &proto);
+  display_name = empathy_protocol_name_to_display_name (proto->name);
+
+  if (display_name == NULL)
+    display_name = proto->name;
+
+  /* Create account */
+  /* To translator: %s is the name of the protocol, such as "Google Talk" or
+   * "Yahoo!"
+   */
+  str = g_strdup_printf (_("New %s account"), display_name);
+  settings = empathy_account_settings_new (cm->name, proto->name, str);
+
+  g_free (str);
+
+  if (tp_connection_manager_protocol_can_register (proto))
+    {
+      gboolean active;
+
+      active = gtk_toggle_button_get_active
+          (GTK_TOGGLE_BUTTON (priv->radiobutton_register));
+      if (active)
+        empathy_account_settings_set_boolean (settings, "register", TRUE);
+    }
+
+  accounts_dialog_add (dialog, settings);
+  accounts_dialog_model_set_selected (dialog, settings);
+
+  g_object_unref (settings);
+  g_object_unref (cm);
+}
+
+static void
+accounts_dialog_button_back_clicked_cb (GtkWidget *button,
+    EmpathyAccountsDialog *dialog)
+{
+  EmpathyAccountSettings *settings;
+
+  settings = accounts_dialog_model_get_selected_settings (dialog);
+  accounts_dialog_update_settings (dialog, settings);
+
+  if (settings)
+    g_object_unref (settings);
+}
+
+static void
+accounts_dialog_button_help_clicked_cb (GtkWidget *button,
+    EmpathyAccountsDialog *dialog)
+{
+  empathy_url_show (button, "ghelp:empathy?accounts-window");
+}
+
+static void
+accounts_dialog_close_response_cb (GtkDialog *message_dialog,
+  gint response_id,
+  gpointer user_data)
 {
-       EmpathyAccount *selected_account;
+  GtkWidget *account_dialog = GTK_WIDGET (user_data);
 
-       accounts_dialog_add_or_update_account (dialog, account);
-       selected_account = accounts_dialog_model_get_selected (dialog);
-       if (empathy_account_equal (account, selected_account)) {
-               accounts_dialog_update_name_label (dialog, account);
-       }
+  gtk_widget_destroy (GTK_WIDGET (message_dialog));
+
+  if (response_id == GTK_RESPONSE_YES)
+    gtk_widget_destroy (account_dialog);
 }
 
 static void
-accounts_dialog_button_create_clicked_cb (GtkWidget             *button,
-                                         EmpathyAccountsDialog  *dialog)
+accounts_dialog_response_cb (GtkWidget *widget,
+    gint response,
+    EmpathyAccountsDialog *dialog)
 {
-       McProfile *profile;
-       EmpathyAccount *account;
-       gchar     *str;
-       McProfileCapabilityFlags cap;
-
-       profile = empathy_profile_chooser_dup_selected (
-           EMPATHY_PROFILE_CHOOSER (dialog->combobox_profile));
-
-       /* Create account */
-       account = empathy_account_manager_create (dialog->account_manager, profile);
-       if (account == NULL) {
-               /* We can't display an error to the user as MC doesn't give us
-                * any clue about the reason of the failure... */
-               g_object_unref (profile);
-               return;
-       }
-
-       /* To translator: %s is the protocol name */
-       str = g_strdup_printf (_("New %s account"),
-                              mc_profile_get_display_name (profile));
-       empathy_account_set_display_name (account, str);
-       g_free (str);
-
-       cap = mc_profile_get_capabilities (profile);
-       if (cap & MC_PROFILE_CAPABILITY_REGISTRATION_UI) {
-               gboolean active;
-
-               active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->radiobutton_register));
-               if (active) {
-                       empathy_account_set_param_boolean (account, "register", TRUE);
-               }
-       }
-
-       accounts_dialog_add_or_update_account (dialog, account);
-       accounts_dialog_model_set_selected (dialog, account);
-
-       g_object_unref (account);
-       g_object_unref (profile);
+  EmpathyAccount *account = NULL;
+
+  if (accounts_dialog_has_pending_change (dialog, &account))
+    {
+      gchar *question_dialog_primary_text;
+      question_dialog_primary_text = g_strdup_printf (
+          PENDING_CHANGES_QUESTION_PRIMARY_TEXT,
+          empathy_account_get_display_name (account));
+
+      accounts_dialog_show_question_dialog (dialog,
+          question_dialog_primary_text,
+          _("You are about to close the window, which will discard\n"
+              "your changes. Are you sure you want to proceed?"),
+          G_CALLBACK (accounts_dialog_close_response_cb),
+          widget,
+          GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
+          GTK_STOCK_DISCARD, GTK_RESPONSE_YES, NULL);
+
+      g_free (question_dialog_primary_text);
+    }
+  else if (response == GTK_RESPONSE_CLOSE)
+    gtk_widget_destroy (widget);
 }
 
 static void
-accounts_dialog_button_back_clicked_cb (GtkWidget             *button,
-                                       EmpathyAccountsDialog  *dialog)
+accounts_dialog_destroy_cb (GtkObject *obj,
+    EmpathyAccountsDialog *dialog)
 {
-       EmpathyAccount *account;
+  DEBUG ("%p", obj);
 
-       account = accounts_dialog_model_get_selected (dialog);
-       accounts_dialog_update_account (dialog, account);
+  g_object_unref (dialog);
 }
 
 static void
-accounts_dialog_profile_changed_cb (GtkWidget             *widget,
-                                   EmpathyAccountsDialog *dialog)
+accounts_dialog_set_selected_account (EmpathyAccountsDialog *dialog,
+    EmpathyAccount *account)
 {
-       McProfile *profile;
-       McProfileCapabilityFlags cap;
-
-       profile = empathy_profile_chooser_dup_selected (
-           EMPATHY_PROFILE_CHOOSER (dialog->combobox_profile));
-       cap = mc_profile_get_capabilities (profile);
-
-       if (cap & MC_PROFILE_CAPABILITY_REGISTRATION_UI) {
-               gtk_widget_show (dialog->radiobutton_register);
-               gtk_widget_show (dialog->radiobutton_reuse);
-       } else {
-               gtk_widget_hide (dialog->radiobutton_register);
-               gtk_widget_hide (dialog->radiobutton_reuse);
-       }
-       g_object_unref (profile);
+  GtkTreeSelection *selection;
+  GtkTreeIter       iter;
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
+  if (accounts_dialog_get_account_iter (dialog, account, &iter))
+    gtk_tree_selection_select_iter (selection, &iter);
 }
 
 static void
-accounts_dialog_button_add_clicked_cb (GtkWidget             *button,
-                                      EmpathyAccountsDialog *dialog)
+accounts_dialog_cms_ready_cb (EmpathyConnectionManagers *cms,
+    GParamSpec *pspec,
+    EmpathyAccountsDialog *dialog)
 {
-       GtkTreeView      *view;
-       GtkTreeSelection *selection;
-       GtkTreeModel     *model;
-
-       view = GTK_TREE_VIEW (dialog->treeview);
-       model = gtk_tree_view_get_model (view);
-       selection = gtk_tree_view_get_selection (view);
-       gtk_tree_selection_unselect_all (selection);
-
-       gtk_widget_set_sensitive (dialog->button_add, FALSE);
-       gtk_widget_set_sensitive (dialog->button_remove, FALSE);
-       gtk_widget_hide (dialog->vbox_details);
-       gtk_widget_hide (dialog->frame_no_profile);
-       gtk_widget_show (dialog->frame_new_account);
-
-       /* If we have no account, no need of a back button */
-       if (gtk_tree_model_iter_n_children (model, NULL) > 0) {
-               gtk_widget_show (dialog->button_back);
-       } else {
-               gtk_widget_hide (dialog->button_back);
-       }
-
-       accounts_dialog_profile_changed_cb (dialog->radiobutton_register, dialog);
-       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->radiobutton_reuse),
-                                     TRUE);
-       gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->combobox_profile), 0);
-       gtk_widget_grab_focus (dialog->combobox_profile);
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  if (empathy_connection_managers_is_ready (cms))
+    {
+      accounts_dialog_update_settings (dialog, NULL);
+
+      if (priv->initial_selection != NULL)
+        {
+          accounts_dialog_set_selected_account
+              (dialog, priv->initial_selection);
+          g_object_unref (priv->initial_selection);
+          priv->initial_selection = NULL;
+        }
+    }
 }
 
 static void
-accounts_dialog_button_help_clicked_cb (GtkWidget             *button,
-                                       EmpathyAccountsDialog *dialog)
+accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
 {
-       empathy_url_show (button, "ghelp:empathy?empathy-create-account");
+  GtkBuilder                   *gui;
+  gchar                        *filename;
+  EmpathyAccountsDialogPriv    *priv = GET_PRIV (dialog);
+
+  filename = empathy_file_lookup ("empathy-accounts-dialog.ui", "src");
+
+  gui = empathy_builder_get_file (filename,
+      "accounts_dialog", &priv->window,
+      "vbox_details", &priv->vbox_details,
+      "frame_no_protocol", &priv->frame_no_protocol,
+      "alignment_settings", &priv->alignment_settings,
+      "treeview", &priv->treeview,
+      "frame_new_account", &priv->frame_new_account,
+      "hbox_type", &priv->hbox_type,
+      "button_create", &priv->button_create,
+      "button_back", &priv->button_back,
+      "radiobutton_reuse", &priv->radiobutton_reuse,
+      "radiobutton_register", &priv->radiobutton_register,
+      "image_type", &priv->image_type,
+      "label_name", &priv->label_name,
+      "button_add", &priv->button_add,
+      NULL);
+  g_free (filename);
+
+  empathy_builder_connect (gui, dialog,
+      "accounts_dialog", "response", accounts_dialog_response_cb,
+      "accounts_dialog", "destroy", accounts_dialog_destroy_cb,
+      "button_create", "clicked", accounts_dialog_button_create_clicked_cb,
+      "button_back", "clicked", accounts_dialog_button_back_clicked_cb,
+      "button_add", "clicked", accounts_dialog_button_add_clicked_cb,
+      "button_help", "clicked", accounts_dialog_button_help_clicked_cb,
+      NULL);
+
+  g_object_unref (gui);
+
+  priv->combobox_protocol = empathy_protocol_chooser_new ();
+  gtk_box_pack_start (GTK_BOX (priv->hbox_type),
+      priv->combobox_protocol,
+      TRUE, TRUE, 0);
+  gtk_widget_show (priv->combobox_protocol);
+  g_signal_connect (priv->combobox_protocol, "changed",
+      G_CALLBACK (accounts_dialog_protocol_changed_cb),
+      dialog);
+
+  if (priv->parent_window)
+    gtk_window_set_transient_for (GTK_WINDOW (priv->window),
+        priv->parent_window);
 }
 
 static void
-accounts_dialog_button_remove_clicked_cb (GtkWidget            *button,
-                                         EmpathyAccountsDialog *dialog)
+do_dispose (GObject *obj)
+{
+  EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (obj);
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+
+  /* Disconnect signals */
+  g_signal_handlers_disconnect_by_func (priv->account_manager,
+      accounts_dialog_account_added_cb,
+      dialog);
+  g_signal_handlers_disconnect_by_func (priv->account_manager,
+      accounts_dialog_account_removed_cb,
+      dialog);
+  g_signal_handlers_disconnect_by_func (priv->account_manager,
+      accounts_dialog_account_enabled_cb,
+      dialog);
+  g_signal_handlers_disconnect_by_func (priv->account_manager,
+      accounts_dialog_account_disabled_cb,
+      dialog);
+  g_signal_handlers_disconnect_by_func (priv->account_manager,
+      accounts_dialog_account_changed_cb,
+      dialog);
+  g_signal_handlers_disconnect_by_func (priv->account_manager,
+      accounts_dialog_connection_changed_cb,
+      dialog);
+
+  if (priv->connecting_id)
+    g_source_remove (priv->connecting_id);
+
+  if (priv->account_manager != NULL)
+    {
+      g_object_unref (priv->account_manager);
+      priv->account_manager = NULL;
+    }
+
+  if (priv->cms != NULL)
+    {
+      g_object_unref (priv->cms);
+      priv->cms = NULL;
+    }
+
+  if (priv->initial_selection != NULL)
+    g_object_unref (priv->initial_selection);
+  priv->initial_selection = NULL;
+
+  G_OBJECT_CLASS (empathy_accounts_dialog_parent_class)->dispose (obj);
+}
+
+static GObject *
+do_constructor (GType type,
+    guint n_props,
+    GObjectConstructParam *props)
 {
-       EmpathyAccount *account;
-       GtkWidget *message_dialog;
-       gint       res;
-
-       account = accounts_dialog_model_get_selected (dialog);
-
-       if (!empathy_account_is_valid (account)) {
-               accounts_dialog_model_remove_selected (dialog);
-               accounts_dialog_model_select_first (dialog);
-               return;
-       }
-       message_dialog = gtk_message_dialog_new
-               (GTK_WINDOW (dialog->window),
-                GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                GTK_MESSAGE_QUESTION,
-                GTK_BUTTONS_NONE,
-                _("You are about to remove your %s account!\n"
-                  "Are you sure you want to proceed?"),
-                empathy_account_get_display_name (account));
-
-       gtk_message_dialog_format_secondary_text
-               (GTK_MESSAGE_DIALOG (message_dialog),
-                _("Any associated conversations and chat rooms will NOT be "
-                  "removed if you decide to proceed.\n"
-                  "\n"
-                  "Should you decide to add the account back at a later time, "
-                  "they will still be available."));
-
-       gtk_dialog_add_button (GTK_DIALOG (message_dialog),
-                              GTK_STOCK_CANCEL,
-                              GTK_RESPONSE_NO);
-       gtk_dialog_add_button (GTK_DIALOG (message_dialog),
-                              GTK_STOCK_REMOVE,
-                              GTK_RESPONSE_YES);
-
-       gtk_widget_show (message_dialog);
-       res = gtk_dialog_run (GTK_DIALOG (message_dialog));
-
-       if (res == GTK_RESPONSE_YES) {
-               empathy_account_manager_remove (dialog->account_manager, account);
-               accounts_dialog_model_select_first (dialog);
-       }
-       gtk_widget_destroy (message_dialog);
+  GObject *retval;
+
+  if (dialog_singleton)
+    {
+      retval = G_OBJECT (dialog_singleton);
+      g_object_ref (retval);
+    }
+  else
+    {
+      retval =
+        G_OBJECT_CLASS (empathy_accounts_dialog_parent_class)->constructor
+            (type, n_props, props);
+
+      dialog_singleton = EMPATHY_ACCOUNTS_DIALOG (retval);
+      g_object_add_weak_pointer (retval, (gpointer) &dialog_singleton);
+    }
+
+  return retval;
 }
 
 static void
-accounts_dialog_button_import_clicked_cb (GtkWidget             *button,
-                                         EmpathyAccountsDialog *dialog)
+do_get_property (GObject *object,
+    guint property_id,
+    GValue *value,
+    GParamSpec *pspec)
 {
-       empathy_import_dialog_show (GTK_WINDOW (dialog->window), TRUE);
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (object);
+
+  switch (property_id)
+    {
+    case PROP_PARENT:
+      g_value_set_object (value, priv->parent_window);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    }
 }
 
 static void
-accounts_dialog_response_cb (GtkWidget            *widget,
-                            gint                  response,
-                            EmpathyAccountsDialog *dialog)
+do_set_property (GObject *object,
+    guint property_id,
+    const GValue *value,
+    GParamSpec *pspec)
 {
-       if (response == GTK_RESPONSE_CLOSE) {
-               gtk_widget_destroy (widget);
-       }
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (object);
+
+  switch (property_id)
+    {
+    case PROP_PARENT:
+      priv->parent_window = g_value_get_object (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    }
 }
 
 static void
-accounts_dialog_destroy_cb (GtkWidget            *widget,
-                           EmpathyAccountsDialog *dialog)
+do_constructed (GObject *object)
 {
-       GList *accounts, *l;
-
-       /* Disconnect signals */
-       g_signal_handlers_disconnect_by_func (dialog->account_manager,
-                                             accounts_dialog_account_added_cb,
-                                             dialog);
-       g_signal_handlers_disconnect_by_func (dialog->account_manager,
-                                             accounts_dialog_account_removed_cb,
-                                             dialog);
-       g_signal_handlers_disconnect_by_func (dialog->account_manager,
-                                             accounts_dialog_account_enabled_cb,
-                                             dialog);
-       g_signal_handlers_disconnect_by_func (dialog->account_manager,
-                                             accounts_dialog_account_disabled_cb,
-                                             dialog);
-       g_signal_handlers_disconnect_by_func (dialog->account_manager,
-                                             accounts_dialog_account_changed_cb,
-                                             dialog);
-       g_signal_handlers_disconnect_by_func (dialog->account_manager,
-                                             accounts_dialog_connection_changed_cb,
-                                             dialog);
-
-       /* Delete incomplete accounts */
-       accounts = empathy_account_manager_dup_accounts (dialog->account_manager);
-       for (l = accounts; l; l = l->next) {
-               EmpathyAccount *account;
-
-               account = l->data;
-               if (!empathy_account_is_valid (account)) {
-                       /* FIXME: Warn the user the account is not complete
-                        *        and is going to be removed. */
-                       empathy_account_manager_remove (dialog->account_manager, account);
-               }
-
-               g_object_unref (account);
-       }
-       g_list_free (accounts);
-
-       if (dialog->connecting_id) {
-               g_source_remove (dialog->connecting_id);
-       }
-
-       g_object_unref (dialog->account_manager);
-       g_object_unref (dialog->mc);
-
-       g_free (dialog);
+  EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (object);
+  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+  GList *accounts, *l;
+  gboolean import_asked;
+
+  accounts_dialog_build_ui (dialog);
+
+  /* Set up signalling */
+  priv->account_manager = empathy_account_manager_dup_singleton ();
+
+  g_signal_connect (priv->account_manager, "account-created",
+      G_CALLBACK (accounts_dialog_account_added_cb),
+      dialog);
+  g_signal_connect (priv->account_manager, "account-deleted",
+      G_CALLBACK (accounts_dialog_account_removed_cb),
+      dialog);
+  g_signal_connect (priv->account_manager, "account-enabled",
+      G_CALLBACK (accounts_dialog_account_enabled_cb),
+      dialog);
+  g_signal_connect (priv->account_manager, "account-disabled",
+      G_CALLBACK (accounts_dialog_account_disabled_cb),
+      dialog);
+  g_signal_connect (priv->account_manager, "account-changed",
+      G_CALLBACK (accounts_dialog_account_changed_cb),
+      dialog);
+  g_signal_connect (priv->account_manager, "account-connection-changed",
+      G_CALLBACK (accounts_dialog_connection_changed_cb),
+      dialog);
+
+  accounts_dialog_model_setup (dialog);
+
+  /* Add existing accounts */
+  accounts = empathy_account_manager_dup_accounts (priv->account_manager);
+  for (l = accounts; l; l = l->next)
+    {
+      accounts_dialog_add_account (dialog, l->data);
+      g_object_unref (l->data);
+    }
+  g_list_free (accounts);
+
+  priv->cms = empathy_connection_managers_dup_singleton ();
+  if (!empathy_connection_managers_is_ready (priv->cms))
+    g_signal_connect (priv->cms, "notify::ready",
+        G_CALLBACK (accounts_dialog_cms_ready_cb), dialog);
+
+  accounts_dialog_model_select_first (dialog);
+
+  empathy_conf_get_bool (empathy_conf_get (),
+      EMPATHY_PREFS_IMPORT_ASKED, &import_asked);
+
+
+  if (empathy_import_accounts_to_import ())
+    {
+
+      if (!import_asked)
+        {
+          GtkWidget *import_dialog;
+
+          empathy_conf_set_bool (empathy_conf_get (),
+              EMPATHY_PREFS_IMPORT_ASKED, TRUE);
+          import_dialog = empathy_import_dialog_new (GTK_WINDOW (priv->window),
+              FALSE);
+          gtk_widget_show (import_dialog);
+        }
+    }
 }
 
+static void
+empathy_accounts_dialog_class_init (EmpathyAccountsDialogClass *klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+  GParamSpec *param_spec;
+
+  oclass->constructor = do_constructor;
+  oclass->dispose = do_dispose;
+  oclass->constructed = do_constructed;
+  oclass->set_property = do_set_property;
+  oclass->get_property = do_get_property;
+
+  param_spec = g_param_spec_object ("parent",
+      "parent", "The parent window",
+      GTK_TYPE_WINDOW,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property (oclass, PROP_PARENT, param_spec);
+
+  g_type_class_add_private (klass, sizeof (EmpathyAccountsDialogPriv));
+}
+
+static void
+empathy_accounts_dialog_init (EmpathyAccountsDialog *dialog)
+{
+  EmpathyAccountsDialogPriv *priv;
+
+  priv = G_TYPE_INSTANCE_GET_PRIVATE ((dialog),
+      EMPATHY_TYPE_ACCOUNTS_DIALOG,
+      EmpathyAccountsDialogPriv);
+  dialog->priv = priv;
+}
+
+/* public methods */
+
 GtkWidget *
 empathy_accounts_dialog_show (GtkWindow *parent,
-                             EmpathyAccount *selected_account)
+    EmpathyAccount *selected_account)
 {
-       static EmpathyAccountsDialog *dialog = NULL;
-       GtkBuilder                   *gui;
-       gchar                        *filename;
-       GList                        *accounts, *l;
-       gboolean                      import_asked;
-
-       if (dialog) {
-               gtk_window_present (GTK_WINDOW (dialog->window));
-               return dialog->window;
-       }
-
-       dialog = g_new0 (EmpathyAccountsDialog, 1);
-
-       filename = empathy_file_lookup ("empathy-accounts-dialog.ui",
-                                       "src");
-       gui = empathy_builder_get_file (filename,
-                                      "accounts_dialog", &dialog->window,
-                                      "vbox_details", &dialog->vbox_details,
-                                      "frame_no_profile", &dialog->frame_no_profile,
-                                      "alignment_settings", &dialog->alignment_settings,
-                                      "treeview", &dialog->treeview,
-                                      "frame_new_account", &dialog->frame_new_account,
-                                      "hbox_type", &dialog->hbox_type,
-                                      "button_create", &dialog->button_create,
-                                      "button_back", &dialog->button_back,
-                                      "radiobutton_reuse", &dialog->radiobutton_reuse,
-                                      "radiobutton_register", &dialog->radiobutton_register,
-                                      "image_type", &dialog->image_type,
-                                      "label_name", &dialog->label_name,
-                                      "button_add", &dialog->button_add,
-                                      "button_remove", &dialog->button_remove,
-                                      "button_import", &dialog->button_import,
-                                      NULL);
-       g_free (filename);
-
-       empathy_builder_connect (gui, dialog,
-                             "accounts_dialog", "destroy", accounts_dialog_destroy_cb,
-                             "accounts_dialog", "response", accounts_dialog_response_cb,
-                             "button_create", "clicked", accounts_dialog_button_create_clicked_cb,
-                             "button_back", "clicked", accounts_dialog_button_back_clicked_cb,
-                             "button_add", "clicked", accounts_dialog_button_add_clicked_cb,
-                             "button_remove", "clicked", accounts_dialog_button_remove_clicked_cb,
-                             "button_import", "clicked", accounts_dialog_button_import_clicked_cb,
-                             "button_help", "clicked", accounts_dialog_button_help_clicked_cb,
-                             NULL);
-
-       g_object_add_weak_pointer (G_OBJECT (dialog->window), (gpointer) &dialog);
-
-       g_object_unref (gui);
-
-       /* Create profile chooser */
-       dialog->combobox_profile = empathy_profile_chooser_new ();
-       gtk_box_pack_end (GTK_BOX (dialog->hbox_type),
-                         dialog->combobox_profile,
-                         TRUE, TRUE, 0);
-       gtk_widget_show (dialog->combobox_profile);
-       g_signal_connect (dialog->combobox_profile, "changed",
-                         G_CALLBACK (accounts_dialog_profile_changed_cb),
-                         dialog);
-
-       /* Set up signalling */
-       dialog->account_manager = empathy_account_manager_dup_singleton ();
-       dialog->mc = empathy_mission_control_dup_singleton ();
-
-       g_signal_connect (dialog->account_manager, "account-created",
-                         G_CALLBACK (accounts_dialog_account_added_cb),
-                         dialog);
-       g_signal_connect (dialog->account_manager, "account-deleted",
-                         G_CALLBACK (accounts_dialog_account_removed_cb),
-                         dialog);
-       g_signal_connect (dialog->account_manager, "account-enabled",
-                         G_CALLBACK (accounts_dialog_account_enabled_cb),
-                         dialog);
-       g_signal_connect (dialog->account_manager, "account-disabled",
-                         G_CALLBACK (accounts_dialog_account_disabled_cb),
-                         dialog);
-       g_signal_connect (dialog->account_manager, "account-changed",
-                         G_CALLBACK (accounts_dialog_account_changed_cb),
-                         dialog);
-       g_signal_connect (dialog->account_manager, "account-connection-changed",
-                         G_CALLBACK (accounts_dialog_connection_changed_cb),
-                         dialog);
-
-       accounts_dialog_model_setup (dialog);
-
-       /* Add existing accounts */
-       accounts = empathy_account_manager_dup_accounts (dialog->account_manager);
-       for (l = accounts; l; l = l->next) {
-               accounts_dialog_add_or_update_account (dialog, l->data);
-               g_object_unref (l->data);
-       }
-       g_list_free (accounts);
-
-       if (selected_account) {
-               accounts_dialog_model_set_selected (dialog, selected_account);
-       } else {
-               accounts_dialog_model_select_first (dialog);
-       }
-
-       if (parent) {
-               gtk_window_set_transient_for (GTK_WINDOW (dialog->window),
-                                             GTK_WINDOW (parent));
-       }
-
-       gtk_widget_show (dialog->window);
-
-       empathy_conf_get_bool (empathy_conf_get (),
-                              EMPATHY_PREFS_IMPORT_ASKED, &import_asked);
-
-
-       if (empathy_import_dialog_accounts_to_import ()) {
-
-               if (!import_asked) {
-                       empathy_conf_set_bool (empathy_conf_get (),
-                                              EMPATHY_PREFS_IMPORT_ASKED, TRUE);
-                       empathy_import_dialog_show (GTK_WINDOW (dialog->window),
-                                                   FALSE);
-               }
-       } else {
-               gtk_widget_set_sensitive (dialog->button_import, FALSE);
-       }
-
-       return dialog->window;
-}
+  EmpathyAccountsDialog *dialog;
+  EmpathyAccountsDialogPriv *priv;
 
+  dialog = g_object_new (EMPATHY_TYPE_ACCOUNTS_DIALOG,
+      "parent", parent, NULL);
+
+  priv = GET_PRIV (dialog);
+
+  if (selected_account)
+    {
+      if (empathy_connection_managers_is_ready (priv->cms))
+        accounts_dialog_set_selected_account (dialog, selected_account);
+      else
+        /* save the selection to set it later when the cms
+         * becomes ready.
+         */
+        priv->initial_selection = g_object_ref (selected_account);
+    }
+
+  gtk_window_present (GTK_WINDOW (priv->window));
+
+  return priv->window;
+}