]> git.0d.be Git - empathy.git/blobdiff - src/empathy-account-assistant.c
Merge branch 'debug-window'
[empathy.git] / src / empathy-account-assistant.c
index b7c5b28ed2a6eb4ef7766377c384fa5c6e8a3c45..d8aa46f1db3480e0c9b8d15e1f737cf536664d85 100644 (file)
 
 #include <glib/gi18n.h>
 #include <telepathy-glib/util.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "empathy-account-assistant.h"
+#include "empathy-import-widget.h"
+#include "empathy-import-utils.h"
 
 #include <libempathy/empathy-account-settings.h>
 #include <libempathy/empathy-utils.h>
@@ -44,14 +47,393 @@ typedef enum {
   RESPONSE_SALUT_ONLY = 4
 } FirstPageResponse;
 
+typedef enum {
+  RESPONSE_CREATE_AGAIN = 1,
+  RESPONSE_CREATE_STOP = 2
+} CreateEnterPageResponse;
+
+enum {
+  PAGE_INTRO = 0,
+  PAGE_IMPORT = 1,
+  PAGE_ENTER_CREATE = 2,
+};
+
+enum {
+  PROP_PARENT = 1
+};
+
 typedef struct {
   FirstPageResponse first_resp;
+  CreateEnterPageResponse create_enter_resp;
+  gboolean enter_create_forward;
 
-  GtkWidget *add_existing_page;
+  /* enter or create page */
+  GtkWidget *enter_or_create_page;
   GtkWidget *current_account_widget;
   EmpathyAccountWidget *current_widget_object;
+  GtkWidget *first_label;
+  GtkWidget *second_label;
+  GtkWidget *chooser;
+  GtkWidget *create_again_radio;
+  EmpathyAccountSettings *settings;
+  gboolean is_creating;
+
+  /* import page */
+  EmpathyImportWidget *iw;
+
+  GtkWindow *parent_window;
+
+  gboolean dispose_run;
 } EmpathyAccountAssistantPriv;
 
+static GtkWidget * account_assistant_build_enter_or_create_page (
+    EmpathyAccountAssistant *self);
+static void account_assistant_finish_enter_or_create_page (
+    EmpathyAccountAssistant *self,
+    gboolean is_enter);
+
+static GtkWidget *
+account_assistant_build_error_page (EmpathyAccountAssistant *self,
+    GError *error, gint page_num)
+{
+  GtkWidget *main_vbox, *w, *hbox;
+  GString *str;
+  char *message;
+  PangoAttrList *list;
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+
+  main_vbox = gtk_vbox_new (FALSE, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
+  gtk_widget_show (main_vbox);
+
+  hbox = gtk_hbox_new (FALSE, 12);
+  gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  w = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR,
+      GTK_ICON_SIZE_DIALOG);
+  gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
+  gtk_widget_show (w);
+
+  /* translators: this is followed by the "while ..." strings some lines
+   * down this file.
+   */
+  str = g_string_new (_("There has been an error "));
+
+  if (page_num == PAGE_IMPORT)
+    /* translators: this follows the "There has been an error " string */
+    str = g_string_append (str, _("while importing the accounts."));
+  else if (page_num >= PAGE_ENTER_CREATE &&
+      priv->first_resp == RESPONSE_ENTER_ACCOUNT)
+    /* translators: this follows the "There has been an error " string */
+    str = g_string_append (str, _("while parsing the account details."));
+  else if (page_num >= PAGE_ENTER_CREATE &&
+      priv->first_resp == RESPONSE_CREATE_ACCOUNT)
+    /* translators: this follows the "There has been an error " string */
+    str = g_string_append (str, _("while creating the account."));
+
+  message = g_string_free (str, FALSE);
+
+  w = gtk_label_new (message);
+  gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
+  list = pango_attr_list_new ();
+  pango_attr_list_insert (list, pango_attr_scale_new (PANGO_SCALE_LARGE));
+  pango_attr_list_insert (list, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
+  gtk_label_set_attributes (GTK_LABEL (w), list);
+  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
+  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
+  gtk_widget_show (w);
+
+  g_free (message);
+  pango_attr_list_unref (list);
+
+  message = g_markup_printf_escaped
+    (_("The error message was: <span style=\"italic\">%s</span>"),
+        error->message);
+  w = gtk_label_new (message);
+  gtk_label_set_use_markup (GTK_LABEL (w), TRUE);
+  gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0);
+  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
+  gtk_widget_show (w);
+
+  w = gtk_label_new (_("You can either go back and try to enter your "
+          "accounts' details again or quit this wizard and add accounts "
+          "later from the Edit menu."));
+  gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 6);
+  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
+  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
+  gtk_widget_show (w);
+
+  return main_vbox;
+}
+
+static void
+account_assistant_back_button_clicked_cb (GtkButton *button,
+    EmpathyAccountAssistant *self)
+{
+  gint page_num;
+
+  page_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),
+          "page-num"));
+  gtk_assistant_remove_action_widget (GTK_ASSISTANT (self),
+      GTK_WIDGET (button));
+  gtk_assistant_set_current_page (GTK_ASSISTANT (self), page_num);
+}
+
+static void
+account_assistant_present_error_page (EmpathyAccountAssistant *self,
+    GError *error, gint page_num)
+{
+  GtkWidget *error_page, *back_button;
+  gint num;
+
+  error_page = account_assistant_build_error_page (self, error,
+      page_num);
+  num = gtk_assistant_append_page (GTK_ASSISTANT (self), error_page);
+  gtk_assistant_set_page_title (GTK_ASSISTANT (self), error_page,
+      _("An error occurred"));
+  gtk_assistant_set_page_type (GTK_ASSISTANT (self), error_page,
+      GTK_ASSISTANT_PAGE_SUMMARY);
+
+  back_button = gtk_button_new_from_stock (GTK_STOCK_GO_BACK);
+  gtk_assistant_add_action_widget (GTK_ASSISTANT (self), back_button);
+  g_object_set_data (G_OBJECT (back_button),
+      "page-num", GINT_TO_POINTER (page_num));
+  g_signal_connect (back_button, "clicked",
+      G_CALLBACK (account_assistant_back_button_clicked_cb), self);
+  gtk_widget_show (back_button);
+
+  gtk_assistant_set_current_page (GTK_ASSISTANT (self), num);
+}
+
+static void
+account_assistant_reset_enter_create_page (EmpathyAccountAssistant *self)
+{
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  GtkWidget *page;
+  gint idx;
+
+  page = account_assistant_build_enter_or_create_page (self);
+  idx = gtk_assistant_append_page (GTK_ASSISTANT (self), page);
+  gtk_assistant_set_page_type (GTK_ASSISTANT (self), page,
+      GTK_ASSISTANT_PAGE_CONFIRM);
+  priv->enter_or_create_page = page;
+
+  gtk_assistant_set_current_page (GTK_ASSISTANT (self), idx);
+
+  account_assistant_finish_enter_or_create_page (self,
+      priv->first_resp == RESPONSE_ENTER_ACCOUNT ?
+      TRUE : FALSE);
+}
+
+static void
+account_assistant_account_enabled_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GError *error = NULL;
+  EmpathyAccountAssistant *self = user_data;
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+
+  empathy_account_set_enabled_finish (EMPATHY_ACCOUNT (source),
+      result, &error);
+
+  if (error)
+    {
+      g_warning ("Error enabling an account: %s", error->message);
+      g_error_free (error);
+    }
+
+  if (priv->create_enter_resp == RESPONSE_CREATE_STOP)
+    g_signal_emit_by_name (self, "close");
+  else
+    account_assistant_reset_enter_create_page (self);
+}
+
+static void
+account_assistant_apply_account_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GError *error = NULL;
+  EmpathyAccountAssistant *self = user_data;
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source);
+  EmpathyAccount *account;
+
+  empathy_account_settings_apply_finish (settings, result, &error);
+
+  priv->is_creating = FALSE;
+
+  if (error != NULL)
+    {
+      account_assistant_present_error_page (self, error,
+          gtk_assistant_get_current_page (GTK_ASSISTANT (self)));
+      g_error_free (error);
+      return;
+    }
+
+  /* enable the newly created account */
+  account = empathy_account_settings_get_account (settings);
+  empathy_account_set_enabled_async (account, TRUE,
+      account_assistant_account_enabled_cb, self);
+}
+
+static void
+account_assistant_apply_account_and_finish (EmpathyAccountAssistant *self)
+{
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+
+  if (priv->settings == NULL)
+    return;
+
+  priv->is_creating = TRUE;
+
+  empathy_account_settings_apply_async (priv->settings,
+      account_assistant_apply_account_cb, self);
+}
+
+static void
+account_assistant_handle_apply_cb (EmpathyAccountWidget *widget_object,
+    gboolean is_valid,
+    EmpathyAccountAssistant *self)
+{
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+
+  gtk_assistant_set_page_complete (GTK_ASSISTANT (self),
+      priv->enter_or_create_page, is_valid);
+}
+
+static void
+account_assistant_protocol_changed_cb (GtkComboBox *chooser,
+    EmpathyAccountAssistant *self)
+{
+  TpConnectionManager *cm;
+  TpConnectionManagerProtocol *proto;
+  EmpathyAccountSettings *settings;
+  EmpathyAccountAssistantPriv *priv;
+  char *str;
+  GtkWidget *account_widget;
+  EmpathyAccountWidget *widget_object = NULL;
+
+  priv = GET_PRIV (self);
+
+  cm = empathy_protocol_chooser_dup_selected (
+      EMPATHY_PROTOCOL_CHOOSER (chooser), &proto);
+
+  if (cm == NULL || proto == NULL)
+    /* we are not ready yet */
+    return;
+
+  /* Create account */
+  /* To translator: %s is the protocol name */
+  str = g_strdup_printf (_("New %s account"), proto->name);
+
+  settings = empathy_account_settings_new (cm->name, proto->name, str);
+
+  if (priv->first_resp == RESPONSE_CREATE_ACCOUNT)
+    empathy_account_settings_set_boolean (settings, "register", TRUE);
+
+  widget_object = empathy_account_widget_new_for_protocol (proto->name,
+      settings, TRUE);
+  account_widget = empathy_account_widget_get_widget (widget_object);
+
+  if (priv->current_account_widget != NULL)
+    {
+      g_signal_handlers_disconnect_by_func (priv->current_widget_object,
+          account_assistant_handle_apply_cb, self);
+      gtk_widget_destroy (priv->current_account_widget);
+    }
+
+  priv->current_account_widget = account_widget;
+  priv->current_widget_object = widget_object;
+
+  if (priv->settings != NULL)
+    g_object_unref (priv->settings);
+
+  priv->settings = settings;
+
+  g_signal_connect (priv->current_widget_object, "handle-apply",
+      G_CALLBACK (account_assistant_handle_apply_cb), self);
+
+  gtk_box_pack_start (GTK_BOX (priv->enter_or_create_page), account_widget,
+      FALSE, FALSE, 0);
+  gtk_widget_show (account_widget);
+
+  g_free (str);
+}
+
+static gboolean
+account_assistant_chooser_enter_details_filter_func (
+    TpConnectionManager *cm,
+    TpConnectionManagerProtocol *protocol,
+    gpointer user_data)
+{
+  if (!tp_strdiff (protocol->name, "local-xmpp") ||
+      !tp_strdiff (protocol->name, "irc"))
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+account_assistant_chooser_create_account_filter_func (
+    TpConnectionManager *cm,
+    TpConnectionManagerProtocol *protocol,
+    gpointer user_data)
+{
+  return tp_connection_manager_protocol_can_register (protocol);
+}
+
+static void
+account_assistant_finish_enter_or_create_page (EmpathyAccountAssistant *self,
+    gboolean is_enter)
+{
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+
+  if (is_enter)
+    {
+      gtk_label_set_label (GTK_LABEL (priv->first_label),
+          _("What kind of chat account do you have?"));
+      /*      gtk_label_set_label (GTK_LABEL (priv->second_label),
+          _("If you have other accounts to set up, you can do "
+              "that at any time from the Edit menu."));
+      */
+      gtk_label_set_label (GTK_LABEL (priv->second_label),
+          _("Do you have any other chat accounts you want to set up?"));
+      empathy_protocol_chooser_set_visible (
+          EMPATHY_PROTOCOL_CHOOSER (priv->chooser),
+          account_assistant_chooser_enter_details_filter_func, self);
+
+      gtk_assistant_set_page_title (GTK_ASSISTANT (self),
+          priv->enter_or_create_page, _("Enter your account details"));
+    }
+  else
+    {
+      gtk_label_set_label (GTK_LABEL (priv->first_label),
+          _("What kind of chat account do you want to create?"));
+      /*      gtk_label_set_label (GTK_LABEL (priv->second_label),
+          _("You can register other accounts, or setup "
+              "an existing one at any time from the Edit menu."));
+      */
+      gtk_label_set_label (GTK_LABEL (priv->second_label),
+          _("Do you want to create other chat accounts?"));
+      empathy_protocol_chooser_set_visible (
+          EMPATHY_PROTOCOL_CHOOSER (priv->chooser),
+          account_assistant_chooser_create_account_filter_func, self);
+
+      gtk_assistant_set_page_title (GTK_ASSISTANT (self),
+          priv->enter_or_create_page,
+          _("Enter the details for the new account"));
+    }
+
+  g_signal_connect (priv->chooser, "changed",
+      G_CALLBACK (account_assistant_protocol_changed_cb), self);
+
+  /* trigger show the first account widget */
+  account_assistant_protocol_changed_cb (GTK_COMBO_BOX (priv->chooser), self);
+}
+
 static gint
 account_assistant_page_forward_func (gint current_page,
     gpointer user_data)
@@ -62,10 +444,27 @@ account_assistant_page_forward_func (gint current_page,
 
   retval = current_page;
 
-  if (current_page == 0)
-    retval = priv->first_resp;
+  if (current_page == PAGE_INTRO)
+    {
+      if (priv->first_resp == RESPONSE_ENTER_ACCOUNT ||
+          priv->first_resp == RESPONSE_CREATE_ACCOUNT)
+        retval = PAGE_ENTER_CREATE;
+      if (priv->first_resp == RESPONSE_IMPORT)
+        retval = PAGE_IMPORT;
+    }
+
+  if (current_page == PAGE_IMPORT ||
+      current_page >= PAGE_ENTER_CREATE)
+    /* don't forward anymore */
+    retval = -1;
+
+  if (current_page >= PAGE_ENTER_CREATE &&
+      priv->create_enter_resp == RESPONSE_CREATE_AGAIN)
+    {
+      priv->enter_create_forward = TRUE;
+      retval = current_page;
+    }
 
-  g_print ("retval = %d\n", retval);
   return retval;
 }
 
@@ -75,19 +474,32 @@ account_assistant_radio_choice_toggled_cb (GtkToggleButton *button,
 {
   FirstPageResponse response;
   EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  GtkWidget *intro_page;
 
   response = GPOINTER_TO_INT (g_object_get_data
       (G_OBJECT (button), "response"));
 
-  g_print ("choice %d toggled\n", response);
   priv->first_resp = response;
+
+  intro_page = gtk_assistant_get_nth_page (GTK_ASSISTANT (self),
+      PAGE_INTRO);
+
+  if (response == RESPONSE_SALUT_ONLY)
+    gtk_assistant_set_page_type (GTK_ASSISTANT (self), intro_page,
+        GTK_ASSISTANT_PAGE_SUMMARY);
+  else
+    gtk_assistant_set_page_type (GTK_ASSISTANT (self), intro_page,
+        GTK_ASSISTANT_PAGE_INTRO);
 }
 
 static GtkWidget *
 account_assistant_build_introduction_page (EmpathyAccountAssistant *self)
 {
-  GtkWidget *main_vbox, *hbox_1, *w, *radio, *vbox_1;
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  GtkWidget *main_vbox, *hbox_1, *w, *vbox_1;
+  GtkWidget *radio = NULL;
   GdkPixbuf *pix;
+  const gchar *str;
 
   main_vbox = gtk_vbox_new (FALSE, 12);
   gtk_widget_show (main_vbox);
@@ -98,25 +510,27 @@ account_assistant_build_introduction_page (EmpathyAccountAssistant *self)
   gtk_widget_show (hbox_1);
 
   w = gtk_label_new (
-      _("With Empathy you can chat with people\n"
-        "online nearby and with friends and colleagues\n"
-        "who use Google Talk, AIM, Windows Live\n"
-        "and many other chat programs. With a microphone\n"
+      _("With Empathy you can chat with people "
+        "online nearby and with friends and colleagues "
+        "who use Google Talk, AIM, Windows Live "
+        "and many other chat programs. With a microphone "
         "or a webcam you can also have audio or video calls."));
   gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
-  gtk_box_pack_start (GTK_BOX (hbox_1), w, TRUE, TRUE, 0);
+  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox_1), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
 
   pix = empathy_pixbuf_from_icon_name_sized ("empathy", 80);
   w = gtk_image_new_from_pixbuf (pix);
-  gtk_box_pack_start (GTK_BOX (hbox_1), w, TRUE, TRUE, 6);
+  gtk_box_pack_start (GTK_BOX (hbox_1), w, FALSE, FALSE, 6);
   gtk_widget_show (w);
 
   g_object_unref (pix);
 
   w = gtk_label_new (_("Do you have an account you've been using "
-          "with another\nchat program?"));
+          "with another chat program?"));
   gtk_misc_set_alignment (GTK_MISC (w), 0, 0);
+  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
   gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
 
@@ -125,23 +539,51 @@ account_assistant_build_introduction_page (EmpathyAccountAssistant *self)
   gtk_box_pack_start (GTK_BOX (main_vbox), w, TRUE, TRUE, 0);
   gtk_widget_show (w);
 
-  vbox_1 = gtk_vbox_new (FALSE, 6);
+  vbox_1 = gtk_vbox_new (TRUE, 0);
   gtk_container_add (GTK_CONTAINER (w), vbox_1);
   gtk_widget_show (vbox_1);
 
-  /* TODO: this will have to be updated when kutio's branch have landed */
-  radio = gtk_radio_button_new_with_label (NULL,
-      _("Yes, import my account details from "));
-  gtk_box_pack_start (GTK_BOX (vbox_1), radio, TRUE, TRUE, 0);
-  g_object_set_data (G_OBJECT (radio), "response",
-      GINT_TO_POINTER (RESPONSE_IMPORT));
-  gtk_widget_show (radio);
+  if (empathy_import_accounts_to_import ())
+    {
+      hbox_1 = gtk_hbox_new (FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (vbox_1), hbox_1, TRUE, TRUE, 0);
+      gtk_widget_show (hbox_1);
+
+      radio = gtk_radio_button_new_with_label (NULL,
+          _("Yes, import my account details from "));
+      gtk_box_pack_start (GTK_BOX (hbox_1), radio, TRUE, TRUE, 0);
+      g_object_set_data (G_OBJECT (radio), "response",
+          GINT_TO_POINTER (RESPONSE_IMPORT));
+      gtk_widget_show (radio);
+
+      w = gtk_combo_box_new_text ();
+      gtk_combo_box_append_text (GTK_COMBO_BOX (w), "Pidgin");
+      gtk_box_pack_start (GTK_BOX (hbox_1), w, TRUE, TRUE, 0);
+      gtk_combo_box_set_active (GTK_COMBO_BOX (w), 0);
+      gtk_widget_show (w);
+
+      g_signal_connect (radio, "clicked",
+          G_CALLBACK (account_assistant_radio_choice_toggled_cb), self);
+      priv->first_resp = RESPONSE_IMPORT;
+    }
+  else
+    {
+      priv->first_resp = RESPONSE_ENTER_ACCOUNT;
+    }
 
-  g_signal_connect (radio, "clicked",
-      G_CALLBACK (account_assistant_radio_choice_toggled_cb), self);
+  str = _("Yes, I'll enter my account details now");
+
+  if (radio == NULL)
+    {
+      radio = gtk_radio_button_new_with_label (NULL, str);
+      w = radio;
+    }
+  else
+    {
+      w = gtk_radio_button_new_with_label_from_widget (
+          GTK_RADIO_BUTTON (radio), str);
+    }
 
-  w = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio),
-      _("Yes, I'll enter my account details now"));
   gtk_box_pack_start (GTK_BOX (vbox_1), w, TRUE, TRUE, 0);
   g_object_set_data (G_OBJECT (w), "response",
       GINT_TO_POINTER (RESPONSE_ENTER_ACCOUNT));
@@ -176,105 +618,68 @@ account_assistant_build_introduction_page (EmpathyAccountAssistant *self)
 static GtkWidget *
 account_assistant_build_import_page (EmpathyAccountAssistant *self)
 {
-  /* TODO: import page */
-  GtkWidget *main_vbox, *w;
+  GtkWidget *main_vbox, *w, *import;
+  EmpathyImportWidget *iw;
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
 
   main_vbox = gtk_vbox_new (FALSE, 12);
-  w = gtk_label_new ("Import your accounts!");
+  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
+  w = gtk_label_new (_("Select the accounts you want to import:"));
+  gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
   gtk_widget_show (w);
   gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 6);
 
-  gtk_widget_show (main_vbox);
+  w = gtk_alignment_new (0, 0, 0, 0);
+  gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0);
+  gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0);
+  gtk_widget_show (w);
 
-  return main_vbox;
-}
+  /* NOTE: this is hardcoded as we support pidgin only */
+  iw = empathy_import_widget_new (EMPATHY_IMPORT_APPLICATION_PIDGIN);
+  import = empathy_import_widget_get_widget (iw);
+  gtk_container_add (GTK_CONTAINER (w), import);
+  gtk_widget_show (import);
 
-static gboolean
-account_assistant_chooser_enter_details_filter_func (
-    TpConnectionManager *cm,
-    TpConnectionManagerProtocol *protocol,
-    gpointer user_data)
-{
-  if (!tp_strdiff (protocol->name, "local-xmpp") ||
-      !tp_strdiff (protocol->name, "irc"))
-    return FALSE;
+  priv->iw = iw;
 
-  return TRUE;
-}
-
-static void
-account_assistant_handle_apply_cb (EmpathyAccountWidget *widget_object,
-    gboolean is_valid,
-    EmpathyAccountAssistant *self)
-{
-  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  gtk_widget_show (main_vbox);
 
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (self),
-      priv->add_existing_page, is_valid);
+  return main_vbox;
 }
 
 static void
-account_assistant_protocol_changed_cb (GtkComboBox *chooser,
+account_assistant_radio_create_again_clicked_cb (GtkButton *button,
     EmpathyAccountAssistant *self)
 {
-  TpConnectionManager *cm;
-  TpConnectionManagerProtocol *proto;
-  EmpathyAccountSettings *settings;
-  EmpathyAccountAssistantPriv *priv;
-  char *str;
-  GtkWidget *account_widget;
-  EmpathyAccountWidget *widget_object = NULL;
-
-  priv = GET_PRIV (self);
-
-  cm = empathy_protocol_chooser_dup_selected (
-      EMPATHY_PROTOCOL_CHOOSER (chooser), &proto);
-
-  if (cm == NULL || proto == NULL)
-    /* we are not ready yet */
-    return;
-
-  /* Create account */
-  /* To translator: %s is the protocol name */
-  str = g_strdup_printf (_("New %s account"), proto->name);
-
-  settings = empathy_account_settings_new (cm->name, proto->name, str);
-  account_widget = empathy_account_widget_simple_new_for_protocol
-    (proto->name, settings, &widget_object);
-
-  if (priv->current_account_widget != NULL)
-    {
-      g_signal_handlers_disconnect_by_func (priv->current_widget_object,
-          account_assistant_handle_apply_cb, self);
-      gtk_widget_destroy (priv->current_account_widget);
-    }
+  CreateEnterPageResponse response;
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
 
-  priv->current_account_widget = account_widget;
-  priv->current_widget_object = widget_object;
+  response = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),
+          "response"));
 
-  g_signal_connect (priv->current_widget_object, "handle-apply",
-      G_CALLBACK (account_assistant_handle_apply_cb), self);
-
-  gtk_box_pack_start (GTK_BOX (priv->add_existing_page), account_widget, FALSE,
-      FALSE, 0);
-  gtk_widget_show (account_widget);
+  priv->create_enter_resp = response;
 
-  g_free (str);
+  gtk_assistant_set_page_type (GTK_ASSISTANT (self),
+      priv->enter_or_create_page,
+      (response == RESPONSE_CREATE_AGAIN) ?
+      GTK_ASSISTANT_PAGE_CONTENT : GTK_ASSISTANT_PAGE_CONFIRM);
 }
 
 static GtkWidget *
-account_assistant_build_enter_details_page (EmpathyAccountAssistant *self)
+account_assistant_build_enter_or_create_page (EmpathyAccountAssistant *self)
 {
-  GtkWidget *main_vbox, *w, *chooser, *hbox;
-  PangoAttrList *list;
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  GtkWidget *main_vbox, *w, *chooser, *vbox, *hbox, *radio;
 
   main_vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_widget_show (main_vbox);
 
-  w = gtk_label_new (_("What kind of chat account do you have?"));
+  w = gtk_label_new (NULL);
   gtk_misc_set_alignment (GTK_MISC (w), 0, 0);
   gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0);
+  gtk_widget_show (w);
+  priv->first_label = w;
 
   w = gtk_alignment_new (0, 0, 0, 0);
   gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0);
@@ -282,57 +687,206 @@ account_assistant_build_enter_details_page (EmpathyAccountAssistant *self)
   gtk_widget_show (w);
 
   chooser = empathy_protocol_chooser_new ();
-  empathy_protocol_chooser_set_visible (EMPATHY_PROTOCOL_CHOOSER (chooser),
-      account_assistant_chooser_enter_details_filter_func, self);
   gtk_container_add (GTK_CONTAINER (w), chooser);
   gtk_widget_show (chooser);
+  priv->chooser = chooser;
 
-  g_signal_connect (chooser, "changed",
-      G_CALLBACK (account_assistant_protocol_changed_cb), self);
+  vbox = gtk_vbox_new (FALSE, 6);
+  gtk_box_pack_end (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
+  gtk_widget_show (vbox);
 
-  /* trigger show the first account widget */
-  account_assistant_protocol_changed_cb (GTK_COMBO_BOX (chooser), self);
+  w = gtk_label_new (NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
+  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
+  gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
+  gtk_widget_show (w);
+  priv->second_label = w;
+
+  w = gtk_alignment_new (0, 0, 0, 0);
+  gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
+  gtk_widget_show (w);
 
   hbox = gtk_hbox_new (FALSE, 6);
-  gtk_box_pack_end (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (w), hbox);
   gtk_widget_show (hbox);
 
-  w = gtk_image_new_from_icon_name ("gtk-dialog-info", GTK_ICON_SIZE_BUTTON);
-  gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-  gtk_widget_show (w);
+  radio = gtk_radio_button_new_with_label (NULL, _("Yes"));
+  gtk_box_pack_start (GTK_BOX (hbox), radio, FALSE, FALSE, 0);
+  g_object_set_data (G_OBJECT (radio), "response",
+      GINT_TO_POINTER (RESPONSE_CREATE_AGAIN));
+  gtk_widget_show (radio);
 
-  w = gtk_label_new (_("If you have other accounts to set up, you can do "
-          "that at any time\nfrom the Edit menu."));
+  w = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio),
+      _("No, that's all for now"));
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-  list = pango_attr_list_new ();
-  pango_attr_list_insert (list, pango_attr_scale_new (PANGO_SCALE_SMALL));
-  gtk_label_set_attributes (GTK_LABEL (w), list);
+  g_object_set_data (G_OBJECT (w), "response",
+      GINT_TO_POINTER (RESPONSE_CREATE_STOP));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), TRUE);
+  priv->create_enter_resp = RESPONSE_CREATE_STOP;
+  priv->create_again_radio = w;
   gtk_widget_show (w);
-  pango_attr_list_unref (list);
+
+  g_signal_connect (w, "clicked",
+      G_CALLBACK (account_assistant_radio_create_again_clicked_cb), self);
+  g_signal_connect (radio, "clicked",
+      G_CALLBACK (account_assistant_radio_create_again_clicked_cb), self);
 
   return main_vbox;
 }
 
-static GtkWidget *
-account_assistant_build_create_account_page (EmpathyAccountAssistant *self)
+static void
+account_assistant_close_cb (GtkAssistant *assistant,
+    gpointer user_data)
 {
-  GtkWidget *main_vbox, *w;
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (assistant);
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
-  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
-  gtk_widget_show (main_vbox);
+  if (priv->is_creating)
+    return;
 
-  w = gtk_label_new (_("What kind of chat account do you want to create?"));
-  gtk_misc_set_alignment (GTK_MISC (w), 0, 0);
-  gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0);
-  gtk_widget_show (w);
+  gtk_widget_destroy (GTK_WIDGET (assistant));
+}
 
-  return main_vbox;
+static void
+impl_signal_apply (GtkAssistant *assistant)
+{
+  EmpathyAccountAssistant *self = EMPATHY_ACCOUNT_ASSISTANT (assistant);
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  gint current_page;
+
+  current_page = gtk_assistant_get_current_page (assistant);
+
+  if (current_page >= PAGE_ENTER_CREATE)
+    account_assistant_apply_account_and_finish (self);
+
+  if (current_page == PAGE_IMPORT)
+    empathy_import_widget_add_selected_accounts (priv->iw);
+}
+
+static void
+impl_signal_cancel (GtkAssistant *assistant)
+{
+  gtk_widget_destroy (GTK_WIDGET (assistant));
+}
+
+static void
+impl_signal_prepare (GtkAssistant *assistant,
+    GtkWidget *current_page)
+{
+  EmpathyAccountAssistant *self = EMPATHY_ACCOUNT_ASSISTANT (assistant);
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  gint current_idx;
+
+  current_idx = gtk_assistant_get_current_page (assistant);
+
+  if (current_idx >= PAGE_ENTER_CREATE)
+    {
+      if (!priv->enter_create_forward)
+        {
+          account_assistant_finish_enter_or_create_page (self,
+              priv->first_resp == RESPONSE_ENTER_ACCOUNT ?
+              TRUE : FALSE);
+        }
+      else
+        {
+          priv->enter_create_forward = FALSE;
+          account_assistant_apply_account_and_finish (self);
+        }
+    }
+}
+
+static void
+do_get_property (GObject *object,
+    guint property_id,
+    GValue *value,
+    GParamSpec *pspec)
+{
+  EmpathyAccountAssistantPriv *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
+do_set_property (GObject *object,
+    guint property_id,
+    const GValue *value,
+    GParamSpec *pspec)
+{
+  EmpathyAccountAssistantPriv *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
+do_constructed (GObject *object)
+{
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (object);
+
+  /* set us as transient for the parent window if any */
+  if (priv->parent_window)
+    gtk_window_set_transient_for (GTK_WINDOW (object),
+        priv->parent_window);
+
+  /* set the dialog hint, so this will be centered over the parent window */
+  gtk_window_set_type_hint (GTK_WINDOW (object), GDK_WINDOW_TYPE_HINT_DIALOG);
+}
+
+static void
+do_dispose (GObject *obj)
+{
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (obj);
+
+  if (priv->dispose_run)
+    return;
+
+  priv->dispose_run = TRUE;
+
+  if (priv->settings != NULL)
+    {
+      g_object_unref (priv->settings);
+      priv->settings = NULL;
+    }
+
+  if (G_OBJECT_CLASS (empathy_account_assistant_parent_class)->dispose != NULL)
+    G_OBJECT_CLASS (empathy_account_assistant_parent_class)->dispose (obj);
 }
 
 static void
 empathy_account_assistant_class_init (EmpathyAccountAssistantClass *klass)
 {
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+  GtkAssistantClass *gtkclass = GTK_ASSISTANT_CLASS (klass);
+  GParamSpec *param_spec;
+
+  oclass->get_property = do_get_property;
+  oclass->set_property = do_set_property;
+  oclass->constructed = do_constructed;
+  oclass->dispose = do_dispose;
+
+  gtkclass->apply = impl_signal_apply;
+  gtkclass->prepare = impl_signal_prepare;
+  gtkclass->cancel = impl_signal_cancel;
+
+  param_spec = g_param_spec_object ("parent-window",
+      "parent-window", "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 (EmpathyAccountAssistantPriv));
 }
 
@@ -347,6 +901,9 @@ empathy_account_assistant_init (EmpathyAccountAssistant *self)
       EmpathyAccountAssistantPriv);
   self->priv = priv;
 
+  g_signal_connect (self, "close",
+      G_CALLBACK (account_assistant_close_cb), NULL);
+
   gtk_assistant_set_forward_page_func (assistant,
       account_assistant_page_forward_func, self, NULL);
 
@@ -359,33 +916,26 @@ empathy_account_assistant_init (EmpathyAccountAssistant *self)
       GTK_ASSISTANT_PAGE_INTRO);
   gtk_assistant_set_page_complete (assistant, page, TRUE);
 
-  /* set a default answer */
-  priv->first_resp = RESPONSE_IMPORT;
-
   /* second page (import accounts) */
   page = account_assistant_build_import_page (self);
   gtk_assistant_append_page (assistant, page);
   gtk_assistant_set_page_title (assistant, page,
       _("Import your existing accounts"));
   gtk_assistant_set_page_complete (assistant, page, TRUE);
+  gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONFIRM);
 
   /* third page (enter account details) */
-  page = account_assistant_build_enter_details_page (self);
+  page = account_assistant_build_enter_or_create_page (self);
   gtk_assistant_append_page (assistant, page);
-  gtk_assistant_set_page_title (assistant, page,
-      _("Enter your account details"));
   gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONFIRM);
-  priv->add_existing_page = page;
+  priv->enter_or_create_page = page;
 
-  /* fourth page (create a new account) */
-  page = account_assistant_build_create_account_page (self);
-  gtk_assistant_append_page (assistant, page);
-  gtk_assistant_set_page_title (assistant, page,
-      _("Enter the details of the new account"));  
+  gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
 }
 
 GtkWidget *
-empathy_account_assistant_new (void)
+empathy_account_assistant_new (GtkWindow *window)
 {
-  return g_object_new (EMPATHY_TYPE_ACCOUNT_ASSISTANT, NULL);
+  return g_object_new (EMPATHY_TYPE_ACCOUNT_ASSISTANT, "parent-window",
+      window, NULL);
 }