]> git.0d.be Git - empathy.git/blobdiff - src/empathy-account-assistant.c
Update Simplified Chinese help translation.
[empathy.git] / src / empathy-account-assistant.c
index a80e47c922f124178d56621abf17c426bce6d4c5..1b39000cdb4ba3a58b846eff7dd4ea92fabf0719 100644 (file)
@@ -20,7 +20,8 @@
 
 /* empathy-account-assistant.c */
 
-#include <glib/gi18n.h>
+#include <config.h>
+#include <glib/gi18n-lib.h>
 #include <telepathy-glib/util.h>
 #include <gdk/gdkkeysyms.h>
 
@@ -36,6 +37,9 @@
 #include <libempathy-gtk/empathy-protocol-chooser.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
+#include <libempathy/empathy-debug.h>
+
 G_DEFINE_TYPE (EmpathyAccountAssistant, empathy_account_assistant,
     GTK_TYPE_ASSISTANT)
 
@@ -53,20 +57,25 @@ typedef enum {
   RESPONSE_CREATE_STOP = 2
 } CreateEnterPageResponse;
 
-enum {
+typedef enum {
   PAGE_INTRO = 0,
   PAGE_IMPORT = 1,
   PAGE_ENTER_CREATE = 2,
-};
+  PAGE_SALUT = 3,
+} PageID;
 
 enum {
-  PROP_PARENT = 1
+  PROP_PARENT = 1,
+  PROP_CONNECTION_MGRS,
 };
 
 typedef struct {
   FirstPageResponse first_resp;
   CreateEnterPageResponse create_enter_resp;
   gboolean enter_create_forward;
+  TpAccountManager *account_mgr;
+  EmpathyConnectionManagers *connection_mgrs;
+  PageID current_page_id;
 
   /* enter or create page */
   GtkWidget *enter_or_create_page;
@@ -81,6 +90,14 @@ typedef struct {
 
   /* import page */
   EmpathyImportWidget *iw;
+  GtkWidget *import_page;
+
+  /* salut page */
+  GtkWidget *salut_page;
+  EmpathyAccountSettings *salut_settings;
+  GtkWidget *salut_account_widget;
+  gboolean create_salut_account;
+  gboolean display_salut_page;
 
   GtkWindow *parent_window;
 
@@ -93,14 +110,14 @@ static void account_assistant_finish_enter_or_create_page (
     EmpathyAccountAssistant *self,
     gboolean is_enter);
 
+static void do_constructed (GObject *object);
+
 static GtkWidget *
-account_assistant_build_error_page (EmpathyAccountAssistant *self,
-    GError *error, gint page_num)
+build_error_vbox (const gchar *primary_message,
+    const gchar *secondary_message)
 {
   GtkWidget *main_vbox, *w, *hbox;
-  const 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);
@@ -115,18 +132,7 @@ account_assistant_build_error_page (EmpathyAccountAssistant *self,
   gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
 
-  if (page_num == PAGE_IMPORT)
-    message = _("There was an error while importing the accounts.");
-  else if (page_num >= PAGE_ENTER_CREATE &&
-      priv->first_resp == RESPONSE_ENTER_ACCOUNT)
-    message = _("There was an error while parsing the account details.");
-  else if (page_num >= PAGE_ENTER_CREATE &&
-      priv->first_resp == RESPONSE_CREATE_ACCOUNT)
-    message = _("There was an error while creating the account.");
-  else
-    message = _("There was an error.");
-
-  w = gtk_label_new (message);
+  w = gtk_label_new (primary_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));
@@ -138,15 +144,42 @@ account_assistant_build_error_page (EmpathyAccountAssistant *self,
 
   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);
+  w = gtk_label_new (secondary_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_label_set_line_wrap (GTK_LABEL (w), TRUE);
   gtk_widget_show (w);
 
+  return main_vbox;
+}
+
+static GtkWidget *
+account_assistant_build_error_page (EmpathyAccountAssistant *self,
+    GError *error, gint page_num)
+{
+  GtkWidget *main_vbox, *w;
+  const char *primary_message;
+  gchar *secondary_message, *markup;
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+
+  if (page_num == PAGE_IMPORT)
+    primary_message = _("There was an error while importing the accounts.");
+  else if (page_num >= PAGE_ENTER_CREATE &&
+      priv->first_resp == RESPONSE_ENTER_ACCOUNT)
+    primary_message = _("There was an error while parsing the account details.");
+  else if (page_num >= PAGE_ENTER_CREATE &&
+      priv->first_resp == RESPONSE_CREATE_ACCOUNT)
+    primary_message = _("There was an error while creating the account.");
+  else
+    primary_message = _("There was an error.");
+
+  markup = g_markup_printf_escaped ("<span style=\"italic\">%s</span>",
+      error->message);
+  secondary_message = g_strdup_printf (_("The error message was: %s"), markup);
+
+  main_vbox = build_error_vbox (primary_message, secondary_message);
+
   w = gtk_label_new (_("You can either go back and try to enter your "
           "accounts' details again or quit this assistant and add accounts "
           "later from the Edit menu."));
@@ -155,6 +188,8 @@ account_assistant_build_error_page (EmpathyAccountAssistant *self,
   gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
   gtk_widget_show (w);
 
+  g_free (markup);
+  g_free (secondary_message);
   return main_vbox;
 }
 
@@ -197,6 +232,22 @@ account_assistant_present_error_page (EmpathyAccountAssistant *self,
   gtk_assistant_set_current_page (GTK_ASSISTANT (self), num);
 }
 
+static void
+update_create_page_buttons (EmpathyAccountAssistant *self)
+{
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  GtkAssistantPageType type;
+
+  if (priv->display_salut_page ||
+      priv->create_enter_resp == RESPONSE_CREATE_AGAIN)
+    type = GTK_ASSISTANT_PAGE_CONTENT;
+  else
+    type = GTK_ASSISTANT_PAGE_CONFIRM;
+
+  gtk_assistant_set_page_type (GTK_ASSISTANT (self), priv->enter_or_create_page,
+      type);
+}
+
 static void
 account_assistant_reset_enter_create_page (EmpathyAccountAssistant *self)
 {
@@ -206,9 +257,8 @@ account_assistant_reset_enter_create_page (EmpathyAccountAssistant *self)
 
   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;
+  update_create_page_buttons (self);
 
   gtk_assistant_set_current_page (GTK_ASSISTANT (self), idx);
 
@@ -225,9 +275,12 @@ account_assistant_account_enabled_cb (GObject *source,
   GError *error = NULL;
   EmpathyAccountAssistant *self = user_data;
   EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  const gchar *protocol;
+  TpAccount *account = TP_ACCOUNT (source);
+  gint current_idx;
+  gboolean salut_created = FALSE;
 
-  tp_account_set_enabled_finish (TP_ACCOUNT (source),
-      result, &error);
+  tp_account_set_enabled_finish (account, result, &error);
 
   if (error)
     {
@@ -235,6 +288,20 @@ account_assistant_account_enabled_cb (GObject *source,
       g_error_free (error);
     }
 
+  protocol = tp_account_get_protocol (account);
+  if (!tp_strdiff (protocol, "local-xmpp"))
+    {
+      salut_created = TRUE;
+    }
+
+  empathy_connect_new_account (account, priv->account_mgr);
+
+  current_idx = gtk_assistant_get_current_page (GTK_ASSISTANT (self));
+  if (current_idx == PAGE_SALUT && !salut_created)
+    /* We are on the Salut page and aren't creating the salut account so don't
+     * terminate the assistant. */
+    return;
+
   if (priv->create_enter_resp == RESPONSE_CREATE_STOP)
     g_signal_emit_by_name (self, "close");
   else
@@ -251,18 +318,8 @@ account_assistant_apply_account_cb (GObject *source,
   EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
   EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source);
   TpAccount *account;
-  gchar *display_name;
-
-  empathy_account_settings_apply_finish (settings, result, &error);
-
-  /* set default display name */
-  display_name = empathy_account_widget_get_default_display_name (
-      priv->current_widget_object);
 
-  empathy_account_settings_set_display_name_async (settings,
-      display_name, NULL, NULL);
-
-  g_free (display_name);
+  empathy_account_settings_apply_finish (settings, result, NULL, &error);
 
   priv->is_creating = FALSE;
 
@@ -281,16 +338,31 @@ account_assistant_apply_account_cb (GObject *source,
 }
 
 static void
-account_assistant_apply_account_and_finish (EmpathyAccountAssistant *self)
+account_assistant_apply_account_and_finish (EmpathyAccountAssistant *self,
+    EmpathyAccountSettings *settings,
+    gboolean set_display_name)
 {
   EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
 
-  if (priv->settings == NULL)
+  if (settings == NULL)
     return;
 
   priv->is_creating = TRUE;
 
-  empathy_account_settings_apply_async (priv->settings,
+  if (set_display_name)
+    {
+      gchar *display_name;
+
+      display_name = empathy_account_widget_get_default_display_name (
+        priv->current_widget_object);
+
+      empathy_account_settings_set_display_name_async (settings,
+        display_name, NULL, NULL);
+
+      g_free (display_name);
+    }
+
+  empathy_account_settings_apply_async (settings,
       account_assistant_apply_account_cb, self);
 }
 
@@ -309,36 +381,19 @@ 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;
-  gboolean is_gtalk;
 
   priv = GET_PRIV (self);
 
-  cm = empathy_protocol_chooser_dup_selected (
-      EMPATHY_PROTOCOL_CHOOSER (chooser), &proto, &is_gtalk);
+  settings = empathy_protocol_chooser_create_account_settings (
+      EMPATHY_PROTOCOL_CHOOSER (chooser));
 
-  if (cm == NULL || proto == NULL)
-    /* we are not ready yet */
+  if (settings == NULL)
     return;
 
-  /* Create account */
-  /* To translator: %s is the protocol name */
-  str = g_strdup_printf (_("New %s account"),
-      empathy_protocol_name_to_display_name (
-          is_gtalk ? "gtalk" : proto->name));
-
-  settings = empathy_account_settings_new (cm->name, proto->name, str);
-
-  if (is_gtalk)
-    empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
-      NULL, NULL);
-
   if (priv->first_resp == RESPONSE_CREATE_ACCOUNT)
     empathy_account_settings_set_boolean (settings, "register", TRUE);
 
@@ -363,22 +418,25 @@ account_assistant_protocol_changed_cb (GtkComboBox *chooser,
   g_signal_connect (priv->current_widget_object, "handle-apply",
       G_CALLBACK (account_assistant_handle_apply_cb), self);
 
+  if (empathy_account_settings_is_valid (settings))
+    {
+      gtk_assistant_set_page_complete (GTK_ASSISTANT (self),
+          priv->enter_or_create_page, TRUE);
+    }
+
   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,
-    gboolean is_gtalk,
+    const gchar *service,
     gpointer user_data)
 {
-  if (!tp_strdiff (protocol->name, "local-xmpp") ||
-      !tp_strdiff (protocol->name, "irc"))
+  if (!tp_strdiff (protocol->name, "local-xmpp"))
     return FALSE;
 
   return TRUE;
@@ -388,10 +446,10 @@ static gboolean
 account_assistant_chooser_create_account_filter_func (
     TpConnectionManager *cm,
     TpConnectionManagerProtocol *protocol,
-    gboolean is_gtalk,
+    const gchar *service,
     gpointer user_data)
 {
-  if (is_gtalk)
+  if (service != NULL)
     return FALSE;
 
   return tp_connection_manager_protocol_can_register (protocol);
@@ -461,42 +519,56 @@ account_assistant_page_forward_func (gint current_page,
       if (priv->first_resp == RESPONSE_ENTER_ACCOUNT ||
           priv->first_resp == RESPONSE_CREATE_ACCOUNT)
         retval = PAGE_ENTER_CREATE;
-      if (priv->first_resp == RESPONSE_IMPORT)
+      else if (priv->first_resp == RESPONSE_IMPORT)
         retval = PAGE_IMPORT;
+      else if (priv->first_resp == RESPONSE_SALUT_ONLY)
+        retval = PAGE_SALUT;
     }
-
-  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)
+  else if (current_page == PAGE_IMPORT)
     {
-      priv->enter_create_forward = TRUE;
-      retval = current_page;
+      if (priv->display_salut_page)
+        retval = PAGE_SALUT;
+      else
+        /* Don't go forward */
+        retval = -1;
+    }
+  else if (current_page == PAGE_SALUT)
+    {
+      /* Don't go forward */
+      retval = -1;
+    }
+  else if (current_page >= PAGE_ENTER_CREATE)
+    {
+      if (priv->create_enter_resp == RESPONSE_CREATE_AGAIN)
+        {
+          priv->enter_create_forward = TRUE;
+          retval = current_page;
+        }
+      else if (priv->display_salut_page)
+        {
+          retval = PAGE_SALUT;
+        }
+      else
+        {
+          /* Don't go forward */
+          retval = -1;
+        }
     }
 
   return retval;
 }
 
 static void
-account_assistant_radio_choice_toggled_cb (GtkToggleButton *button,
-    EmpathyAccountAssistant *self)
+update_intro_page_buttons (EmpathyAccountAssistant *self)
 {
-  FirstPageResponse response;
   EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
   GtkWidget *intro_page;
 
-  response = GPOINTER_TO_INT (g_object_get_data
-      (G_OBJECT (button), "response"));
-
-  priv->first_resp = response;
-
   intro_page = gtk_assistant_get_nth_page (GTK_ASSISTANT (self),
       PAGE_INTRO);
 
-  if (response == RESPONSE_SALUT_ONLY)
+  if (priv->first_resp == RESPONSE_SALUT_ONLY &&
+      !priv->display_salut_page)
     gtk_assistant_set_page_type (GTK_ASSISTANT (self), intro_page,
         GTK_ASSISTANT_PAGE_SUMMARY);
   else
@@ -504,6 +576,21 @@ account_assistant_radio_choice_toggled_cb (GtkToggleButton *button,
         GTK_ASSISTANT_PAGE_INTRO);
 }
 
+static void
+account_assistant_radio_choice_toggled_cb (GtkToggleButton *button,
+    EmpathyAccountAssistant *self)
+{
+  FirstPageResponse response;
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+
+  response = GPOINTER_TO_INT (g_object_get_data
+      (G_OBJECT (button), "response"));
+
+  priv->first_resp = response;
+
+  update_intro_page_buttons (self);
+}
+
 static GtkWidget *
 account_assistant_build_introduction_page (EmpathyAccountAssistant *self)
 {
@@ -568,8 +655,8 @@ account_assistant_build_introduction_page (EmpathyAccountAssistant *self)
           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");
+      w = gtk_combo_box_text_new ();
+      gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (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);
@@ -641,9 +728,9 @@ account_assistant_build_import_page (EmpathyAccountAssistant *self)
   gtk_widget_show (w);
   gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 6);
 
-  w = gtk_alignment_new (0, 0, 0, 0);
+  w = gtk_alignment_new (0, 0, 1, 1);
   gtk_alignment_set_padding (GTK_ALIGNMENT (w), 0, 0, 12, 0);
-  gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (main_vbox), w, TRUE, TRUE, 0);
   gtk_widget_show (w);
 
   /* NOTE: this is hardcoded as we support pidgin only */
@@ -671,10 +758,7 @@ account_assistant_radio_create_again_clicked_cb (GtkButton *button,
 
   priv->create_enter_resp = response;
 
-  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);
+  update_create_page_buttons (self);
 }
 
 static GtkWidget *
@@ -687,9 +771,12 @@ account_assistant_build_enter_or_create_page (EmpathyAccountAssistant *self)
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_widget_show (main_vbox);
 
+  hbox = gtk_hbox_new (FALSE, 6);
+  gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
   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_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
   gtk_widget_show (w);
   priv->first_label = w;
 
@@ -699,7 +786,7 @@ account_assistant_build_enter_or_create_page (EmpathyAccountAssistant *self)
   gtk_widget_show (w);
 
   chooser = empathy_protocol_chooser_new ();
-  gtk_container_add (GTK_CONTAINER (w), chooser);
+  gtk_box_pack_start (GTK_BOX (hbox), chooser, FALSE, FALSE, 0);
   gtk_widget_show (chooser);
   priv->chooser = chooser;
 
@@ -756,8 +843,6 @@ account_assistant_close_cb (GtkAssistant *assistant,
   if (priv->is_creating)
     return;
 
-  create_salut_account_if_needed ();
-
   gtk_widget_destroy (GTK_WIDGET (assistant));
 }
 
@@ -770,11 +855,27 @@ impl_signal_apply (GtkAssistant *assistant)
 
   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);
+  if (current_page == PAGE_SALUT)
+    {
+      if (priv->create_salut_account)
+        /* create_salut_account_settings() already set the display name of the
+         * account so there is no need to set it again. */
+        account_assistant_apply_account_and_finish (self, priv->salut_settings,
+            FALSE);
+      return;
+    }
+  else if (current_page >= PAGE_ENTER_CREATE &&
+      priv->settings != NULL &&
+      empathy_account_settings_is_valid (priv->settings))
+    {
+      account_assistant_apply_account_and_finish (self, priv->settings, TRUE);
+      g_object_unref (priv->settings);
+      priv->settings = NULL;
+    }
+  else if (current_page == PAGE_IMPORT)
+    {
+      empathy_import_widget_add_selected_accounts (priv->iw);
+    }
 }
 
 static void
@@ -791,11 +892,16 @@ impl_signal_prepare (GtkAssistant *assistant,
   EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
   gint current_idx;
 
+  /* check from which page we are coming from */
+  if (priv->current_page_id == PAGE_IMPORT)
+    empathy_import_widget_add_selected_accounts (priv->iw);
+
   current_idx = gtk_assistant_get_current_page (assistant);
+  priv->current_page_id = current_idx;
 
   if (current_idx >= PAGE_ENTER_CREATE)
     {
-      if (!priv->enter_create_forward)
+      if (!priv->enter_create_forward && current_idx != PAGE_SALUT)
         {
           account_assistant_finish_enter_or_create_page (self,
               priv->first_resp == RESPONSE_ENTER_ACCOUNT ?
@@ -804,7 +910,15 @@ impl_signal_prepare (GtkAssistant *assistant,
       else
         {
           priv->enter_create_forward = FALSE;
-          account_assistant_apply_account_and_finish (self);
+        }
+
+      if (priv->settings != NULL &&
+          empathy_account_settings_is_valid (priv->settings))
+        {
+          account_assistant_apply_account_and_finish (self, priv->settings,
+              TRUE);
+          g_object_unref (priv->settings);
+          priv->settings = NULL;
         }
     }
 }
@@ -822,6 +936,9 @@ do_get_property (GObject *object,
     case PROP_PARENT:
       g_value_set_object (value, priv->parent_window);
       break;
+    case PROP_CONNECTION_MGRS:
+      g_value_set_object (value, priv->connection_mgrs);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -840,25 +957,14 @@ do_set_property (GObject *object,
     case PROP_PARENT:
       priv->parent_window = g_value_get_object (value);
       break;
+    case PROP_CONNECTION_MGRS:
+      priv->connection_mgrs = g_value_dup_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)
 {
@@ -875,6 +981,12 @@ do_dispose (GObject *obj)
       priv->settings = NULL;
     }
 
+  g_object_unref (priv->account_mgr);
+  priv->account_mgr = NULL;
+
+  g_object_unref (priv->connection_mgrs);
+  priv->connection_mgrs = NULL;
+
   if (G_OBJECT_CLASS (empathy_account_assistant_parent_class)->dispose != NULL)
     G_OBJECT_CLASS (empathy_account_assistant_parent_class)->dispose (obj);
 }
@@ -901,20 +1013,209 @@ empathy_account_assistant_class_init (EmpathyAccountAssistantClass *klass)
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
   g_object_class_install_property (oclass, PROP_PARENT, param_spec);
 
+  param_spec = g_param_spec_object ("connection-managers",
+      "connection-managers", "A EmpathyConnectionManagers",
+      EMPATHY_TYPE_CONNECTION_MANAGERS,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property (oclass, PROP_CONNECTION_MGRS, param_spec);
+
   g_type_class_add_private (klass, sizeof (EmpathyAccountAssistantPriv));
 }
 
+static void
+create_salut_check_box_toggled_cb (GtkWidget *widget,
+    EmpathyAccountAssistant *self)
+{
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  gboolean sensitive;
+  gboolean page_valid;
+
+  sensitive = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+
+  gtk_widget_set_sensitive (priv->salut_account_widget, sensitive);
+
+  if (!sensitive)
+    {
+      page_valid = TRUE;
+      priv->create_salut_account = FALSE;
+    }
+  else
+    {
+      /* page is complete if the account is valid */
+      page_valid = empathy_account_settings_is_valid (priv->salut_settings);
+      priv->create_salut_account = TRUE;
+    }
+
+  gtk_assistant_set_page_complete (GTK_ASSISTANT (self), priv->salut_page,
+      page_valid);
+}
+
+static void
+account_assistant_salut_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->salut_page, is_valid);
+}
+
+static GtkWidget *
+account_assistant_build_salut_page (EmpathyAccountAssistant *self)
+{
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  GtkWidget *main_vbox, *hbox_1, *w;
+  GdkPixbuf *pix;
+  EmpathyAccountSettings *settings;
+  GtkWidget *account_widget;
+  EmpathyAccountWidget *widget_object;
+  gchar *markup;
+
+  main_vbox = gtk_vbox_new (FALSE, 12);
+  gtk_widget_show (main_vbox);
+  gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
+
+  hbox_1 = gtk_hbox_new (FALSE, 12);
+  gtk_box_pack_start (GTK_BOX (main_vbox), hbox_1, TRUE, TRUE, 0);
+  gtk_widget_show (hbox_1);
+
+  w = gtk_label_new (NULL);
+  markup = g_strdup_printf ("%s (<span style=\"italic\">%s</span>).",
+      _("Empathy can automatically discover and chat with the people "
+        "connected on the same network as you. "
+        "If you want to use this feature, please check that the "
+        "details below are correct. "
+        "You can easily change these details later or disable this feature "
+        "by using the 'Accounts' dialog"),
+      _("Edit->Accounts"));
+  gtk_label_set_markup (GTK_LABEL (w), markup);
+  g_free (markup);
+  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
+  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 ("im-local-xmpp", 80);
+  w = gtk_image_new_from_pixbuf (pix);
+  gtk_box_pack_start (GTK_BOX (hbox_1), w, FALSE, FALSE, 6);
+  gtk_widget_show (w);
+
+  g_object_unref (pix);
+
+  w = gtk_check_button_new_with_mnemonic (
+      _("I do _not want to enable this feature for now"));
+  gtk_box_pack_start (GTK_BOX (main_vbox), w, FALSE, FALSE, 0);
+  g_signal_connect (w, "toggled",
+      G_CALLBACK (create_salut_check_box_toggled_cb), self);
+  gtk_widget_show (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 (main_vbox), w, TRUE, TRUE, 0);
+  gtk_widget_show (w);
+
+  settings = create_salut_account_settings ();
+
+  widget_object = empathy_account_widget_new_for_protocol (settings, TRUE);
+  account_widget = empathy_account_widget_get_widget (widget_object);
+
+  priv->salut_settings = settings;
+  priv->salut_account_widget = account_widget;
+
+  g_signal_connect (widget_object, "handle-apply",
+      G_CALLBACK (account_assistant_salut_handle_apply_cb), self);
+
+  gtk_box_pack_start (GTK_BOX (main_vbox), account_widget,
+      FALSE, FALSE, 0);
+  gtk_widget_show (account_widget);
+
+  return main_vbox;
+}
+
+static GtkWidget *
+account_assistant_build_salut_error_page (EmpathyAccountAssistant *self)
+{
+  GtkWidget *vbox;
+  gchar *markup;
+
+  markup = g_strdup_printf ("%s (<span style=\"italic\">%s</span>).",
+      _("You won't be able to chat with people connected to your local "
+        "network, as telepathy-salut is not installed. If you want to enable "
+        "this feature, please install the telepathy-salut package and create "
+        "a People Nearby account from the Accounts dialog"),
+        _("Edit->Accounts"));
+
+  vbox = build_error_vbox (_("telepathy-salut not installed"), markup);
+  g_free (markup);
+  return vbox;
+}
+
+static void
+account_mgr_prepare_cb (GObject *source_object,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  EmpathyAccountAssistant *self = user_data;
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
+  GError *error = NULL;
+
+  if (!tp_account_manager_prepare_finish (manager, result, &error))
+    {
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  if (!should_create_salut_account (manager))
+    {
+      DEBUG ("No need to create a Salut account");
+      priv->display_salut_page = FALSE;
+
+      update_intro_page_buttons (self);
+
+      gtk_assistant_set_page_type (GTK_ASSISTANT (self), priv->import_page,
+          GTK_ASSISTANT_PAGE_CONFIRM);
+
+      update_create_page_buttons (self);
+    }
+}
+
 static void
 empathy_account_assistant_init (EmpathyAccountAssistant *self)
 {
   EmpathyAccountAssistantPriv *priv;
-  GtkAssistant *assistant = GTK_ASSISTANT (self);
-  GtkWidget *page;
 
   priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EMPATHY_TYPE_ACCOUNT_ASSISTANT,
       EmpathyAccountAssistantPriv);
   self->priv = priv;
 
+  gtk_window_set_title (GTK_WINDOW (self),
+      _("Messaging and VoIP Accounts Assistant"));
+
+  priv->account_mgr = tp_account_manager_dup ();
+}
+
+static void
+do_constructed (GObject *object)
+{
+  GtkAssistant *assistant = GTK_ASSISTANT (object);
+  EmpathyAccountAssistant *self = EMPATHY_ACCOUNT_ASSISTANT (object);
+  EmpathyAccountAssistantPriv *priv = GET_PRIV (object);
+  GtkWidget *page;
+
+  /* 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);
+
+  g_assert (priv->connection_mgrs != NULL);
+  g_assert (empathy_connection_managers_is_ready (priv->connection_mgrs));
+
   g_signal_connect (self, "close",
       G_CALLBACK (account_assistant_close_cb), NULL);
 
@@ -936,26 +1237,64 @@ empathy_account_assistant_init (EmpathyAccountAssistant *self)
   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);
+  gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONTENT);
+  priv->import_page = page;
 
   /* third page (enter account details) */
   page = account_assistant_build_enter_or_create_page (self);
   gtk_assistant_append_page (assistant, page);
-  gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONFIRM);
+  gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONTENT);
   priv->enter_or_create_page = page;
 
+  /* fourth page (salut details) */
+  if (empathy_connection_managers_get_cm (priv->connection_mgrs, "salut")
+      != NULL)
+    {
+      page = account_assistant_build_salut_page (self);
+      gtk_assistant_append_page (assistant, page);
+      gtk_assistant_set_page_title (assistant, page,
+          _("Please enter personal details"));
+      gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONFIRM);
+
+      priv->create_salut_account = TRUE;
+
+      if (empathy_account_settings_is_valid (priv->salut_settings))
+        {
+          gtk_assistant_set_page_complete (GTK_ASSISTANT (self),
+              page, TRUE);
+        }
+    }
+  else
+    {
+      page = account_assistant_build_salut_error_page (self);
+      gtk_assistant_append_page (assistant, page);
+      gtk_assistant_set_page_title (assistant, page, _("An error occurred"));
+      gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_SUMMARY);
+
+      priv->create_salut_account = FALSE;
+    }
+
+  priv->salut_page = page;
+  priv->display_salut_page = TRUE;
+
+  tp_account_manager_prepare_async (priv->account_mgr, NULL,
+      account_mgr_prepare_cb, self);
+
   gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
 }
 
 GtkWidget *
-empathy_account_assistant_show (GtkWindow *window)
+empathy_account_assistant_show (GtkWindow *window,
+    EmpathyConnectionManagers *connection_mgrs)
 {
   static GtkWidget *dialog = NULL;
 
   if (dialog == NULL)
     {
-      dialog =  g_object_new (EMPATHY_TYPE_ACCOUNT_ASSISTANT, "parent-window",
-        window, NULL);
+      dialog = g_object_new (EMPATHY_TYPE_ACCOUNT_ASSISTANT,
+          "parent-window", window,
+          "connection-managers", connection_mgrs,
+          NULL);
       g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer *) &dialog);
     }