]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-account-widget.c
Merge commit 'jtellier/confirm-lose-accounts-settings'
[empathy.git] / libempathy-gtk / empathy-account-widget.c
index 21e3d3ee31905023e3d95a4e11c3508074a7cffa..df0dc967ba5c6109b824b1b25f8cc63016356c9b 100644 (file)
@@ -1,7 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2006-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: Xavier Claessens <xclaesse@gmail.com>
  *          Martyn Russell <martyn@imendio.com>
+ *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
+ *          Jonathan Tellier <jonathan.tellier@gmail.com>
  */
 
 #include <config.h>
 #include <libempathy/empathy-account.h>
 
 #include <telepathy-glib/connection-manager.h>
+#include <telepathy-glib/util.h>
 #include <dbus/dbus-protocol.h>
 
 #include "empathy-account-widget.h"
+#include "empathy-account-widget-private.h"
+#include "empathy-account-widget-sip.h"
+#include "empathy-account-widget-irc.h"
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include <libempathy/empathy-debug.h>
 
-static gboolean
-account_widget_entry_focus_cb (GtkWidget     *widget,
-                              GdkEventFocus *event,
-                              EmpathyAccountSettings *settings)
-{
-       const gchar *str;
-       const gchar *param_name;
+G_DEFINE_TYPE (EmpathyAccountWidget, empathy_account_widget, G_TYPE_OBJECT)
+
+typedef struct {
+  EmpathyAccountSettings *settings;
+
+  GtkWidget *table_common_settings;
+  GtkWidget *apply_button;
+  GtkWidget *cancel_button;
+  GtkWidget *entry_password;
+  GtkWidget *button_forget;
+  GtkWidget *spinbutton_port;
+  GtkWidget *enabled_checkbox;
+
+  gboolean simple;
+
+  gboolean contains_pending_changes;
+  gboolean original_enabled_checkbox_value;
+
+  /* An EmpathyAccountWidget can be used to either create an account or
+   * modify it. When we are creating an account, this member is set to TRUE */
+  gboolean creating_account;
+
+  gboolean dispose_run;
+} EmpathyAccountWidgetPriv;
+
+enum {
+  PROP_PROTOCOL = 1,
+  PROP_SETTINGS,
+  PROP_SIMPLE,
+  PROP_CREATING_ACCOUNT
+};
 
-       str = gtk_entry_get_text (GTK_ENTRY (widget));
-       param_name = g_object_get_data (G_OBJECT (widget), "param_name");
+enum {
+  HANDLE_APPLY,
+  ACCOUNT_CREATED,
+  CANCELLED,
+  LAST_SIGNAL
+};
 
-       if (EMP_STR_EMPTY (str)) {
-               const gchar *value = NULL;
+static guint signals[LAST_SIGNAL] = { 0 };
 
-               empathy_account_settings_unset (settings, param_name);
-               value = empathy_account_settings_get_string (settings, param_name);
-               DEBUG ("Unset %s and restore to %s", param_name, value);
-               gtk_entry_set_text (GTK_ENTRY (widget), value ? value : "");
-       } else {
-               DEBUG ("Setting %s to %s", param_name,
-                       strstr (param_name, "password") ? "***" : str);
-               empathy_account_settings_set_string (settings, param_name, str);
-       }
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountWidget)
+#define CHANGED_TIMEOUT 300
 
-       return FALSE;
+static void
+account_widget_set_control_buttons_sensitivity (EmpathyAccountWidget *self,
+    gboolean sensitive)
+{
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+  if (!priv->simple)
+    {
+      gtk_widget_set_sensitive (priv->apply_button, sensitive);
+      gtk_widget_set_sensitive (priv->cancel_button, sensitive);
+      priv->contains_pending_changes = sensitive;
+    }
 }
 
 static void
-account_widget_int_changed_cb (GtkWidget *widget,
-                              EmpathyAccountSettings *settings)
-{
-       const gchar *param_name;
-       gint         value;
-       const gchar *signature;
-
-       value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
-       param_name = g_object_get_data (G_OBJECT (widget), "param_name");
-
-       signature = empathy_settings_get_dbus_signature (settings, param_name);
-       g_return_if_fail (signature != NULL);
-
-       DEBUG ("Setting %s to %d", param_name, value);
-
-       switch ((int)*signature)
-               {
-                       case DBUS_TYPE_INT16:
-                       case DBUS_TYPE_INT32:
-                               empathy_account_settings_set_int32 (settings, param_name, value);
-                               break;
-                       case DBUS_TYPE_INT64:
-                               empathy_account_settings_set_int64 (settings, param_name, value);
-                               break;
-                       case DBUS_TYPE_UINT16:
-                       case DBUS_TYPE_UINT32:
-                               empathy_account_settings_set_uint32 (settings, param_name, value);
-                               break;
-                       case DBUS_TYPE_UINT64:
-                               empathy_account_settings_set_uint64 (settings, param_name, value);
-                               break;
-                       default:
-                               g_return_if_reached ();
-               }
+account_widget_handle_control_buttons_sensitivity (EmpathyAccountWidget *self)
+{
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+  gboolean is_valid;
+
+  is_valid = empathy_account_settings_is_valid (priv->settings);
+
+  if (!priv->simple)
+      account_widget_set_control_buttons_sensitivity (self, is_valid);
+
+  g_signal_emit (self, signals[HANDLE_APPLY], 0, is_valid);
 }
 
 static void
-account_widget_checkbutton_toggled_cb (GtkWidget *widget,
-                                      EmpathyAccountSettings *settings)
+account_widget_entry_changed_common (EmpathyAccountWidget *self,
+    GtkEntry *entry, gboolean focus)
 {
-       gboolean     value;
-       gboolean     default_value;
-       const gchar *param_name;
+  const gchar *str;
+  const gchar *param_name;
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+  str = gtk_entry_get_text (entry);
+  param_name = g_object_get_data (G_OBJECT (entry), "param_name");
+
+  if (EMP_STR_EMPTY (str))
+    {
+      const gchar *value = NULL;
+
+      empathy_account_settings_unset (priv->settings, param_name);
+
+      if (focus)
+        {
+          value = empathy_account_settings_get_string (priv->settings,
+              param_name);
+          DEBUG ("Unset %s and restore to %s", param_name, value);
+          gtk_entry_set_text (entry, value ? value : "");
+        }
+    }
+  else
+    {
+      DEBUG ("Setting %s to %s", param_name,
+          tp_strdiff (param_name, "password") ? str : "***");
+      empathy_account_settings_set_string (priv->settings, param_name, str);
+    }
+}
 
-       value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-       param_name = g_object_get_data (G_OBJECT (widget), "param_name");
+static void
+account_widget_entry_changed_cb (GtkEditable *entry,
+    EmpathyAccountWidget *self)
+{
+  account_widget_entry_changed_common (self, GTK_ENTRY (entry), FALSE);
+  account_widget_handle_control_buttons_sensitivity (self);
+}
 
-       /* FIXME: This is ugly! checkbox don't have a "not-set" value so we
-        * always unset the param and set the value if different from the
-        * default value. */
-       empathy_account_settings_unset (settings, param_name);
-       default_value = empathy_account_settings_get_boolean (settings, param_name);
+static void
+account_widget_int_changed_cb (GtkWidget *widget,
+    EmpathyAccountWidget *self)
+{
+  const gchar *param_name;
+  gint value;
+  const gchar *signature;
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+  value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
+  param_name = g_object_get_data (G_OBJECT (widget), "param_name");
+
+  signature = empathy_account_settings_get_dbus_signature (priv->settings,
+    param_name);
+  g_return_if_fail (signature != NULL);
+
+  DEBUG ("Setting %s to %d", param_name, value);
+
+  switch ((int)*signature)
+    {
+    case DBUS_TYPE_INT16:
+    case DBUS_TYPE_INT32:
+      empathy_account_settings_set_int32 (priv->settings, param_name, value);
+      break;
+    case DBUS_TYPE_INT64:
+      empathy_account_settings_set_int64 (priv->settings, param_name, value);
+      break;
+    case DBUS_TYPE_UINT16:
+    case DBUS_TYPE_UINT32:
+      empathy_account_settings_set_uint32 (priv->settings, param_name, value);
+      break;
+    case DBUS_TYPE_UINT64:
+      empathy_account_settings_set_uint64 (priv->settings, param_name, value);
+      break;
+    default:
+      g_return_if_reached ();
+    }
+
+  account_widget_handle_control_buttons_sensitivity (self);
+}
 
-       if (default_value == value) {
-               DEBUG ("Unset %s and restore to %d", param_name, default_value);
-       } else {
-               DEBUG ("Setting %s to %d", param_name, value);
-               empathy_account_settings_set_boolean (settings, param_name, value);
-       }
+static void
+account_widget_checkbutton_toggled_cb (GtkWidget *widget,
+    EmpathyAccountWidget *self)
+{
+  gboolean     value;
+  gboolean     default_value;
+  const gchar *param_name;
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+  value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+  param_name = g_object_get_data (G_OBJECT (widget), "param_name");
+
+  /* FIXME: This is ugly! checkbox don't have a "not-set" value so we
+   * always unset the param and set the value if different from the
+   * default value. */
+  empathy_account_settings_unset (priv->settings, param_name);
+  default_value = empathy_account_settings_get_boolean (priv->settings,
+      param_name);
+
+  if (default_value == value)
+    {
+      DEBUG ("Unset %s and restore to %d", param_name, default_value);
+    }
+  else
+    {
+      DEBUG ("Setting %s to %d", param_name, value);
+      empathy_account_settings_set_boolean (priv->settings, param_name, value);
+    }
+
+  account_widget_handle_control_buttons_sensitivity (self);
 }
 
 static void
 account_widget_forget_clicked_cb (GtkWidget *button,
-                                 GtkWidget *entry)
+    EmpathyAccountWidget *self)
 {
-       EmpathyAccountSettings *settings;
-       const gchar *param_name;
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+  const gchar *param_name;
+
+  param_name = g_object_get_data (G_OBJECT (priv->entry_password),
+      "param_name");
 
-       param_name = g_object_get_data (G_OBJECT (entry), "param_name");
-       settings = g_object_get_data (G_OBJECT (entry), "settings");
+  DEBUG ("Unset %s", param_name);
+  empathy_account_settings_unset (priv->settings, param_name);
+  gtk_entry_set_text (GTK_ENTRY (priv->entry_password), "");
 
-       DEBUG ("Unset %s", param_name);
-       empathy_account_settings_unset (settings, param_name);
-       gtk_entry_set_text (GTK_ENTRY (entry), "");
+  account_widget_handle_control_buttons_sensitivity (self);
 }
 
 static void
 account_widget_password_changed_cb (GtkWidget *entry,
-                                   GtkWidget *button)
+    EmpathyAccountWidget *self)
 {
-       const gchar *str;
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+  const gchar *str;
 
-       str = gtk_entry_get_text (GTK_ENTRY (entry));
-       gtk_widget_set_sensitive (button, !EMP_STR_EMPTY (str));
+  str = gtk_entry_get_text (GTK_ENTRY (entry));
+  gtk_widget_set_sensitive (priv->button_forget, !EMP_STR_EMPTY (str));
 }
 
 static void
 account_widget_jabber_ssl_toggled_cb (GtkWidget *checkbutton_ssl,
-                                     GtkWidget *spinbutton_port)
-{
-       EmpathyAccountSettings *settings;
-       gboolean   value;
-       gint32       port = 0;
-
-       value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton_ssl));
-       settings = g_object_get_data (G_OBJECT (spinbutton_port), "settings");
-       port = empathy_account_settings_get_uint32 (settings, "port");
-
-       if (value) {
-               if (port == 5222 || port == 0) {
-                       port = 5223;
-               }
-       } else {
-               if (port == 5223 || port == 0) {
-                       port = 5222;
-               }
-       }
-
-       gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinbutton_port), port);
-}
-
-static void
-account_widget_setup_widget (GtkWidget   *widget,
-                            EmpathyAccountSettings *settings,
-                            const gchar *param_name)
-{
-       g_object_set_data_full (G_OBJECT (widget), "param_name",
-                               g_strdup (param_name), g_free);
-       g_object_set_data_full (G_OBJECT (widget), "settings",
-                               g_object_ref (settings), g_object_unref);
-
-       if (GTK_IS_SPIN_BUTTON (widget)) {
-               gint value = 0;
-               const gchar *signature;
-
-               signature = empathy_settings_get_dbus_signature (settings, param_name);
-               g_return_if_fail (signature != NULL);
-
-               switch ((int)*signature)
-                       {
-                               case DBUS_TYPE_INT16:
-                               case DBUS_TYPE_INT32:
-                                       value = empathy_account_settings_get_int32 (settings, param_name);
-                                       break;
-                               case DBUS_TYPE_INT64:
-                                       value = empathy_account_settings_get_int64 (settings, param_name);
-                                       break;
-                               case DBUS_TYPE_UINT16:
-                               case DBUS_TYPE_UINT32:
-                                       value = empathy_account_settings_get_uint32 (settings, param_name);
-                                       break;
-                               case DBUS_TYPE_UINT64:
-                                       value = empathy_account_settings_get_uint64 (settings, param_name);
-                                       break;
-                               default:
-                                       g_return_if_reached ();
-                       }
-
-               gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
-
-               g_signal_connect (widget, "value-changed",
-                                 G_CALLBACK (account_widget_int_changed_cb),
-                                 settings);
-       }
-       else if (GTK_IS_ENTRY (widget)) {
-               const gchar *str = NULL;
-
-               str = empathy_account_settings_get_string (settings, param_name);
-               gtk_entry_set_text (GTK_ENTRY (widget), str ? str : "");
-
-               if (strstr (param_name, "password")) {
-                       gtk_entry_set_visibility (GTK_ENTRY (widget), FALSE);
-               }
-
-               g_signal_connect (widget, "focus-out-event",
-                                 G_CALLBACK (account_widget_entry_focus_cb),
-                                 settings);
-       }
-       else if (GTK_IS_TOGGLE_BUTTON (widget)) {
-               gboolean value = FALSE;
-
-               value = empathy_account_settings_get_boolean (settings, param_name);
-               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);
-
-               g_signal_connect (widget, "toggled",
-                                 G_CALLBACK (account_widget_checkbutton_toggled_cb),
-                                 settings);
-       } else {
-               DEBUG ("Unknown type of widget for param %s", param_name);
-       }
+    EmpathyAccountWidget *self)
+{
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+  gboolean   value;
+  gint32       port = 0;
+
+  value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton_ssl));
+  port = empathy_account_settings_get_uint32 (priv->settings, "port");
+
+  if (value)
+    {
+      if (port == 5222 || port == 0)
+        port = 5223;
+    }
+  else
+    {
+      if (port == 5223 || port == 0)
+        port = 5222;
+    }
+
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->spinbutton_port), port);
 }
 
-static gchar *
-account_widget_generic_format_param_name (const gchar *param_name)
+static void
+account_widget_setup_widget (EmpathyAccountWidget *self,
+    GtkWidget *widget,
+    const gchar *param_name)
 {
-       gchar *str;
-       gchar *p;
-
-       str = g_strdup (param_name);
-
-       if (str && g_ascii_isalpha (str[0])) {
-               str[0] = g_ascii_toupper (str[0]);
-       }
-
-       while ((p = strchr (str, '-')) != NULL) {
-               if (p[1] != '\0' && g_ascii_isalpha (p[1])) {
-                       p[0] = ' ';
-                       p[1] = g_ascii_toupper (p[1]);
-               }
-
-               p++;
-       }
-
-       return str;
-}
-
-static void
-accounts_widget_generic_setup (EmpathyAccountSettings *settings,
-                              GtkWidget *table_common_settings,
-                              GtkWidget *table_advanced_settings)
-{
-       TpConnectionManagerParam *params, *param;
-
-       params = empathy_account_settings_get_tp_params (settings);
-
-       for (param = params; param != NULL && param->name != NULL; param++) {
-               GtkWidget       *table_settings;
-               guint            n_rows = 0;
-               GtkWidget       *widget = NULL;
-               gchar           *param_name_formatted;
-
-               if (param->flags & TP_CONN_MGR_PARAM_FLAG_REQUIRED) {
-                       table_settings = table_common_settings;
-               } else {
-                       table_settings = table_advanced_settings;
-               }
-               param_name_formatted = account_widget_generic_format_param_name (param->name);
-               g_object_get (table_settings, "n-rows", &n_rows, NULL);
-               gtk_table_resize (GTK_TABLE (table_settings), ++n_rows, 2);
-
-               if (param->dbus_signature[0] == 's') {
-                       gchar *str;
-
-                       str = g_strdup_printf (_("%s:"), param_name_formatted);
-                       widget = gtk_label_new (str);
-                       gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
-                       g_free (str);
-
-                       gtk_table_attach (GTK_TABLE (table_settings),
-                                         widget,
-                                         0, 1,
-                                         n_rows - 1, n_rows,
-                                         GTK_FILL, 0,
-                                         0, 0);
-                       gtk_widget_show (widget);
-
-                       widget = gtk_entry_new ();
-                       if (strcmp (param->name, "account") == 0) {
-                               g_signal_connect (widget, "realize",
-                                       G_CALLBACK (gtk_widget_grab_focus),
-                                       NULL);
-                       }
-                       gtk_table_attach (GTK_TABLE (table_settings),
-                                         widget,
-                                         1, 2,
-                                         n_rows - 1, n_rows,
-                                         GTK_FILL | GTK_EXPAND, 0,
-                                         0, 0);
-                       gtk_widget_show (widget);
-               }
-               /* int types: ynqiuxt. double type is 'd' */
-               else if (param->dbus_signature[0] == 'y' ||
-                        param->dbus_signature[0] == 'n' ||
-                        param->dbus_signature[0] == 'q' ||
-                        param->dbus_signature[0] == 'i' ||
-                        param->dbus_signature[0] == 'u' ||
-                        param->dbus_signature[0] == 'x' ||
-                        param->dbus_signature[0] == 't' ||
-                        param->dbus_signature[0] == 'd') {
-                       gchar   *str = NULL;
-                       gdouble  minint = 0;
-                       gdouble  maxint = 0;
-                       gdouble  step = 1;
-
-                       switch (param->dbus_signature[0]) {
-                       case 'y': minint = G_MININT8;  maxint = G_MAXINT8;   break;
-                       case 'n': minint = G_MININT16; maxint = G_MAXINT16;  break;
-                       case 'q': minint = 0;          maxint = G_MAXUINT16; break;
-                       case 'i': minint = G_MININT32; maxint = G_MAXINT32;  break;
-                       case 'u': minint = 0;          maxint = G_MAXUINT32; break;
-                       case 'x': minint = G_MININT64; maxint = G_MAXINT64;  break;
-                       case 't': minint = 0;          maxint = G_MAXUINT64; break;
-                       case 'd': minint = G_MININT32; maxint = G_MAXINT32; step = 0.1; break;
-                       }
-
-                       str = g_strdup_printf (_("%s:"), param_name_formatted);
-                       widget = gtk_label_new (str);
-                       gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
-                       g_free (str);
-
-                       gtk_table_attach (GTK_TABLE (table_settings),
-                                         widget,
-                                         0, 1,
-                                         n_rows - 1, n_rows,
-                                         GTK_FILL, 0,
-                                         0, 0);
-                       gtk_widget_show (widget);
-
-                       widget = gtk_spin_button_new_with_range (minint, maxint, step);
-                       gtk_table_attach (GTK_TABLE (table_settings),
-                                         widget,
-                                         1, 2,
-                                         n_rows - 1, n_rows,
-                                         GTK_FILL | GTK_EXPAND, 0,
-                                         0, 0);
-                       gtk_widget_show (widget);
-               }
-               else if (param->dbus_signature[0] == 'b') {
-                       widget = gtk_check_button_new_with_label (param_name_formatted);
-                       gtk_table_attach (GTK_TABLE (table_settings),
-                                         widget,
-                                         0, 2,
-                                         n_rows - 1, n_rows,
-                                         GTK_FILL | GTK_EXPAND, 0,
-                                         0, 0);
-                       gtk_widget_show (widget);
-               } else {
-                       DEBUG ("Unknown signature for param %s: %s",
-                               param_name_formatted, param->dbus_signature);
-               }
-
-               if (widget) {
-                       account_widget_setup_widget (widget, settings, param->name);
-               }
-
-               g_free (param_name_formatted);
-       }
-}
-
-static void
-account_widget_handle_params_valist (EmpathyAccountSettings   *settings,
-                                    GtkBuilder  *gui,
-                                    const gchar *first_widget,
-                                    va_list      args)
-{
-       GObject *object;
-       const gchar *name;
-
-       for (name = first_widget; name; name = va_arg (args, const gchar *)) {
-               const gchar *param_name;
-
-               param_name = va_arg (args, const gchar *);
-               object = gtk_builder_get_object (gui, name);
-
-               if (!object) {
-                       g_warning ("Builder is missing object '%s'.", name);
-                       continue;
-               }
-
-               account_widget_setup_widget (GTK_WIDGET (object), settings, param_name);
-       }
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+  g_object_set_data_full (G_OBJECT (widget), "param_name",
+      g_strdup (param_name), g_free);
+
+  if (GTK_IS_SPIN_BUTTON (widget))
+    {
+      gint value = 0;
+      const gchar *signature;
+
+      signature = empathy_account_settings_get_dbus_signature (priv->settings,
+          param_name);
+      g_return_if_fail (signature != NULL);
+
+      switch ((int)*signature)
+        {
+          case DBUS_TYPE_INT16:
+          case DBUS_TYPE_INT32:
+            value = empathy_account_settings_get_int32 (priv->settings,
+              param_name);
+            break;
+          case DBUS_TYPE_INT64:
+            value = empathy_account_settings_get_int64 (priv->settings,
+              param_name);
+            break;
+          case DBUS_TYPE_UINT16:
+          case DBUS_TYPE_UINT32:
+            value = empathy_account_settings_get_uint32 (priv->settings,
+              param_name);
+            break;
+          case DBUS_TYPE_UINT64:
+            value = empathy_account_settings_get_uint64 (priv->settings,
+                param_name);
+            break;
+          default:
+            g_return_if_reached ();
+        }
+
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
+
+      g_signal_connect (widget, "value-changed",
+          G_CALLBACK (account_widget_int_changed_cb),
+          self);
+    }
+  else if (GTK_IS_ENTRY (widget))
+    {
+      const gchar *str = NULL;
+
+      str = empathy_account_settings_get_string (priv->settings, param_name);
+      gtk_entry_set_text (GTK_ENTRY (widget), str ? str : "");
+
+      if (strstr (param_name, "password"))
+        {
+          gtk_entry_set_visibility (GTK_ENTRY (widget), FALSE);
+        }
+
+      g_signal_connect (widget, "changed",
+          G_CALLBACK (account_widget_entry_changed_cb), self);
+    }
+  else if (GTK_IS_TOGGLE_BUTTON (widget))
+    {
+      gboolean value = FALSE;
+
+      value = empathy_account_settings_get_boolean (priv->settings,
+          param_name);
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);
+
+      g_signal_connect (widget, "toggled",
+          G_CALLBACK (account_widget_checkbutton_toggled_cb),
+          self);
+    }
+  else
+    {
+      DEBUG ("Unknown type of widget for param %s", param_name);
+    }
 }
 
-void
-empathy_account_widget_handle_params (EmpathyAccountSettings   *settings,
-                                     GtkBuilder  *gui,
-                                     const gchar *first_widget,
-                                     ...)
+static gchar *
+account_widget_generic_format_param_name (const gchar *param_name)
 {
-       va_list args;
+  gchar *str;
+  gchar *p;
+
+  str = g_strdup (param_name);
 
-       g_return_if_fail (GTK_IS_BUILDER (gui));
+  if (str && g_ascii_isalpha (str[0]))
+    str[0] = g_ascii_toupper (str[0]);
 
-       va_start (args, first_widget);
-       account_widget_handle_params_valist (settings, gui, first_widget, args);
-       va_end (args);
+  while ((p = strchr (str, '-')) != NULL)
+    {
+      if (p[1] != '\0' && g_ascii_isalpha (p[1]))
+        {
+          p[0] = ' ';
+          p[1] = g_ascii_toupper (p[1]);
+        }
+
+      p++;
+    }
+
+  return str;
 }
 
 static void
-account_widget_apply_clicked_cb (GtkWidget *button,
-                                EmpathyAccountSettings *settings)
+accounts_widget_generic_setup (EmpathyAccountWidget *self,
+    GtkWidget *table_common_settings,
+    GtkWidget *table_advanced_settings)
 {
-  empathy_account_settings_apply_async (settings, NULL, NULL);
+  TpConnectionManagerParam *params, *param;
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+  params = empathy_account_settings_get_tp_params (priv->settings);
+
+  for (param = params; param != NULL && param->name != NULL; param++)
+    {
+      GtkWidget       *table_settings;
+      guint            n_rows = 0;
+      GtkWidget       *widget = NULL;
+      gchar           *param_name_formatted;
+
+      if (param->flags & TP_CONN_MGR_PARAM_FLAG_REQUIRED)
+        table_settings = table_common_settings;
+      else if (priv->simple)
+        return;
+      else
+        table_settings = table_advanced_settings;
+
+      param_name_formatted = account_widget_generic_format_param_name
+        (param->name);
+      g_object_get (table_settings, "n-rows", &n_rows, NULL);
+      gtk_table_resize (GTK_TABLE (table_settings), ++n_rows, 2);
+
+      if (param->dbus_signature[0] == 's')
+        {
+          gchar *str;
+
+          str = g_strdup_printf (_("%s:"), param_name_formatted);
+          widget = gtk_label_new (str);
+          gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
+          g_free (str);
+
+          gtk_table_attach (GTK_TABLE (table_settings),
+              widget,
+              0, 1,
+              n_rows - 1, n_rows,
+              GTK_FILL, 0,
+              0, 0);
+          gtk_widget_show (widget);
+
+          widget = gtk_entry_new ();
+          if (strcmp (param->name, "account") == 0)
+            {
+              g_signal_connect (widget, "realize",
+                  G_CALLBACK (gtk_widget_grab_focus),
+                  NULL);
+            }
+          gtk_table_attach (GTK_TABLE (table_settings),
+              widget,
+              1, 2,
+              n_rows - 1, n_rows,
+              GTK_FILL | GTK_EXPAND, 0,
+              0, 0);
+          gtk_widget_show (widget);
+        }
+      /* int types: ynqiuxt. double type is 'd' */
+      else if (param->dbus_signature[0] == 'y' ||
+          param->dbus_signature[0] == 'n' ||
+          param->dbus_signature[0] == 'q' ||
+          param->dbus_signature[0] == 'i' ||
+          param->dbus_signature[0] == 'u' ||
+          param->dbus_signature[0] == 'x' ||
+          param->dbus_signature[0] == 't' ||
+          param->dbus_signature[0] == 'd')
+        {
+          gchar   *str = NULL;
+          gdouble  minint = 0;
+          gdouble  maxint = 0;
+          gdouble  step = 1;
+
+          switch (param->dbus_signature[0])
+            {
+            case 'y': minint = G_MININT8;  maxint = G_MAXINT8;   break;
+            case 'n': minint = G_MININT16; maxint = G_MAXINT16;  break;
+            case 'q': minint = 0;          maxint = G_MAXUINT16; break;
+            case 'i': minint = G_MININT32; maxint = G_MAXINT32;  break;
+            case 'u': minint = 0;          maxint = G_MAXUINT32; break;
+            case 'x': minint = G_MININT64; maxint = G_MAXINT64;  break;
+            case 't': minint = 0;          maxint = G_MAXUINT64; break;
+            case 'd': minint = G_MININT32; maxint = G_MAXINT32;
+              step = 0.1; break;
+            }
+
+          str = g_strdup_printf (_("%s:"), param_name_formatted);
+          widget = gtk_label_new (str);
+          gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
+          g_free (str);
+
+          gtk_table_attach (GTK_TABLE (table_settings),
+              widget,
+              0, 1,
+              n_rows - 1, n_rows,
+              GTK_FILL, 0,
+              0, 0);
+          gtk_widget_show (widget);
+
+          widget = gtk_spin_button_new_with_range (minint, maxint, step);
+          gtk_table_attach (GTK_TABLE (table_settings),
+              widget,
+              1, 2,
+              n_rows - 1, n_rows,
+              GTK_FILL | GTK_EXPAND, 0,
+              0, 0);
+          gtk_widget_show (widget);
+        }
+      else if (param->dbus_signature[0] == 'b')
+        {
+          widget = gtk_check_button_new_with_label (param_name_formatted);
+          gtk_table_attach (GTK_TABLE (table_settings),
+              widget,
+              0, 2,
+              n_rows - 1, n_rows,
+              GTK_FILL | GTK_EXPAND, 0,
+              0, 0);
+          gtk_widget_show (widget);
+        }
+      else
+        {
+          DEBUG ("Unknown signature for param %s: %s",
+              param_name_formatted, param->dbus_signature);
+        }
+
+      if (widget)
+        account_widget_setup_widget (self, widget, param->name);
+
+      g_free (param_name_formatted);
+    }
 }
 
-void
-empathy_account_widget_add_apply_button (EmpathyAccountSettings *settings,
-                                        GtkWidget *vbox)
+static void
+account_widget_handle_params_valist (EmpathyAccountWidget *self,
+    const gchar *first_widget,
+    va_list args)
 {
-       GtkWidget *button;
+  GObject *object;
+  const gchar *name;
+
+  for (name = first_widget; name; name = va_arg (args, const gchar *))
+    {
+      const gchar *param_name;
 
-       button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
+      param_name = va_arg (args, const gchar *);
+      object = gtk_builder_get_object (self->ui_details->gui, name);
 
-       gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 3);
+      if (!object)
+        {
+          g_warning ("Builder is missing object '%s'.", name);
+          continue;
+        }
 
-       g_signal_connect (button, "clicked",
-                         G_CALLBACK (account_widget_apply_clicked_cb),
-                         settings);
-       gtk_widget_show (button);
+      account_widget_setup_widget (self, GTK_WIDGET (object), param_name);
+    }
 }
 
-void
-empathy_account_widget_add_forget_button (EmpathyAccountSettings   *settings,
-                                         GtkBuilder  *gui,
-                                         const gchar *button,
-                                         const gchar *entry)
+static void
+account_widget_cancel_clicked_cb (GtkWidget *button,
+    EmpathyAccountWidget *self)
 {
-       GtkWidget *button_forget;
-       GtkWidget *entry_password;
-       const gchar   *password = NULL;
-
-       button_forget = GTK_WIDGET (gtk_builder_get_object (gui, button));
-       entry_password = GTK_WIDGET (gtk_builder_get_object (gui, entry));
+  g_signal_emit (self, signals[CANCELLED], 0);
+}
 
-       password = empathy_account_settings_get_string (settings, "password");
-       gtk_widget_set_sensitive (button_forget, !EMP_STR_EMPTY (password));
+static void
+account_widget_account_enabled_cb (GObject *source_object,
+    GAsyncResult *res,
+    gpointer user_data)
+{
+  GError *error = NULL;
+  EmpathyAccount *account = EMPATHY_ACCOUNT (source_object);
+  EmpathyAccountWidget *widget = EMPATHY_ACCOUNT_WIDGET (user_data);
+
+  empathy_account_set_enabled_finish (account, res, &error);
+
+  if (error != NULL)
+    {
+      DEBUG ("Could not automatically enable new account: %s", error->message);
+      g_error_free (error);
+    }
+  else
+    {
+      g_signal_emit (widget, signals[ACCOUNT_CREATED], 0);
+    }
+}
 
-       g_signal_connect (button_forget, "clicked",
-                         G_CALLBACK (account_widget_forget_clicked_cb),
-                         entry_password);
-       g_signal_connect (entry_password, "changed",
-                         G_CALLBACK (account_widget_password_changed_cb),
-                         button_forget);
+static void
+account_widget_applied_cb (GObject *source_object,
+    GAsyncResult *res,
+    gpointer user_data)
+{
+  GError *error = NULL;
+  EmpathyAccount *account;
+  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source_object);
+  EmpathyAccountWidget *widget = EMPATHY_ACCOUNT_WIDGET (user_data);
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (widget);
+
+  empathy_account_settings_apply_finish (settings, res, &error);
+
+  if (error != NULL)
+    {
+      DEBUG ("Could not apply changes to account: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  account = empathy_account_settings_get_account (priv->settings);
+
+  if (account != NULL)
+    {
+      if (priv->creating_account)
+        {
+          /* By default, when an account is created, we enable it. */
+          empathy_account_set_enabled_async (account, TRUE,
+              account_widget_account_enabled_cb, widget);
+        }
+      else if (priv->enabled_checkbox != NULL)
+        {
+          gboolean enabled_checked;
+
+          enabled_checked = gtk_toggle_button_get_active (
+              GTK_TOGGLE_BUTTON (priv->enabled_checkbox));
+
+          if (empathy_account_is_enabled (account) && enabled_checked)
+            {
+              /* After having applied changes to a user account, we
+               * automatically reconnect it. This is done so the new
+               * information entered by the user is validated on the server. */
+              empathy_account_reconnect_async (account, NULL, NULL);
+            }
+          else
+            {
+              /* The account is disabled so we enable it according to the value
+               * of the "Enabled" checkbox */
+              empathy_account_set_enabled_async (account, enabled_checked,
+                  NULL, NULL);
+            }
+        }
+    }
+
+  account_widget_set_control_buttons_sensitivity (widget, FALSE);
 }
 
-void
-empathy_account_widget_set_default_focus (GtkBuilder  *gui,
-                                         const gchar *entry)
+static void
+account_widget_apply_clicked_cb (GtkWidget *button,
+    EmpathyAccountWidget *self)
 {
-       GObject *default_focus_entry;
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
 
-       default_focus_entry = gtk_builder_get_object (gui, entry);
-       g_signal_connect (default_focus_entry, "realize",
-                         G_CALLBACK (gtk_widget_grab_focus),
-                         NULL);
+  empathy_account_settings_apply_async (priv->settings,
+      account_widget_applied_cb, self);
 }
 
 static void
-account_widget_setup_generic (EmpathyAccountSettings *settings,
-  GtkBuilder *builder)
+account_widget_setup_generic (EmpathyAccountWidget *self)
 {
-       GtkWidget *table_common_settings;
-       GtkWidget *table_advanced_settings;
+  GtkWidget *table_common_settings;
+  GtkWidget *table_advanced_settings;
 
-       table_common_settings = GTK_WIDGET (gtk_builder_get_object (builder,
-               "table_common_settings"));
-       table_advanced_settings = GTK_WIDGET (gtk_builder_get_object (builder,
-               "table_advanced_settings"));
+  table_common_settings = GTK_WIDGET (gtk_builder_get_object
+      (self->ui_details->gui, "table_common_settings"));
+  table_advanced_settings = GTK_WIDGET (gtk_builder_get_object
+      (self->ui_details->gui, "table_advanced_settings"));
 
-       accounts_widget_generic_setup (settings, table_common_settings,
-               table_advanced_settings);
+  accounts_widget_generic_setup (self, table_common_settings,
+      table_advanced_settings);
+
+  g_object_unref (self->ui_details->gui);
 }
 
 static void
 account_widget_settings_ready_cb (EmpathyAccountSettings *settings,
-  GParamSpec *pspec, gpointer user_data)
+    GParamSpec *pspec,
+    gpointer user_data)
 {
-       GtkBuilder *builder = GTK_BUILDER (user_data);
+  EmpathyAccountWidget *self = user_data;
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
 
-       if (empathy_account_settings_is_ready (settings))
-               account_widget_setup_generic (settings, builder);
+  if (empathy_account_settings_is_ready (priv->settings))
+    account_widget_setup_generic (self);
 }
 
-GtkWidget *
-empathy_account_widget_generic_new (EmpathyAccountSettings *settings)
+static void
+account_widget_build_generic (EmpathyAccountWidget *self,
+    const char *filename)
 {
-       GtkBuilder *gui;
-       GtkWidget *widget;
-       gchar     *filename;
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+  GtkWidget *expander_advanced;
 
-       filename = empathy_file_lookup ("empathy-account-widget-generic.ui",
-                                       "libempathy-gtk");
-       gui = empathy_builder_get_file (filename,
-                                       "vbox_generic_settings", &widget,
-                                       NULL);
+  self->ui_details->gui = empathy_builder_get_file (filename,
+      "table_common_settings", &priv->table_common_settings,
+      "vbox_generic_settings", &self->ui_details->widget,
+      "expander_advanced_settings", &expander_advanced,
+      NULL);
 
-       if (empathy_account_settings_is_ready (settings))
-               account_widget_setup_generic (settings, gui);
-       else
-               g_signal_connect (settings, "notify::ready",
-                       G_CALLBACK (account_widget_settings_ready_cb), gui);
+  if (priv->simple)
+    gtk_widget_hide (expander_advanced);
 
-       empathy_account_widget_add_apply_button (settings, widget);
+  g_object_ref (self->ui_details->gui);
 
-       return g_object_ref (widget);
+  if (empathy_account_settings_is_ready (priv->settings))
+    account_widget_setup_generic (self);
+  else
+    g_signal_connect (priv->settings, "notify::ready",
+        G_CALLBACK (account_widget_settings_ready_cb), self);
 }
 
-GtkWidget *
-empathy_account_widget_salut_new (EmpathyAccountSettings *settings)
+static void
+account_widget_build_salut (EmpathyAccountWidget *self,
+    const char *filename)
+{
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+  self->ui_details->gui = empathy_builder_get_file (filename,
+      "table_common_settings", &priv->table_common_settings,
+      "vbox_salut_settings", &self->ui_details->widget,
+      NULL);
+
+  empathy_account_widget_handle_params (self,
+      "entry_published", "published-name",
+      "entry_nickname", "nickname",
+      "entry_first_name", "first-name",
+      "entry_last_name", "last-name",
+      "entry_email", "email",
+      "entry_jid", "jid",
+      NULL);
+
+  self->ui_details->default_focus = g_strdup ("entry_nickname");
+}
+
+static void
+account_widget_build_irc (EmpathyAccountWidget *self,
+  const char *filename)
+{
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+  empathy_account_widget_irc_build (self, filename,
+    &priv->table_common_settings);
+}
+
+static void
+account_widget_build_sip (EmpathyAccountWidget *self,
+  const char *filename)
 {
-       GtkBuilder *gui;
-       GtkWidget *widget;
-       gchar     *filename;
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+  empathy_account_widget_sip_build (self, filename,
+    &priv->table_common_settings);
+}
 
-       filename = empathy_file_lookup ("empathy-account-widget-salut.ui",
-                                       "libempathy-gtk");
-       gui = empathy_builder_get_file (filename,
-                                       "vbox_salut_settings", &widget,
-                                       NULL);
-       g_free (filename);
+static void
+account_widget_build_msn (EmpathyAccountWidget *self,
+    const char *filename)
+{
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+  if (priv->simple)
+    {
+      self->ui_details->gui = empathy_builder_get_file (filename,
+          "vbox_msn_simple", &self->ui_details->widget,
+          NULL);
+
+      empathy_account_widget_handle_params (self,
+          "entry_id_simple", "account",
+          "entry_password_simple", "password",
+          NULL);
+
+      self->ui_details->default_focus = g_strdup ("entry_id_simple");
+    }
+  else
+    {
+      self->ui_details->gui = empathy_builder_get_file (filename,
+          "table_common_msn_settings", &priv->table_common_settings,
+          "vbox_msn_settings", &self->ui_details->widget,
+          NULL);
+
+      empathy_account_widget_handle_params (self,
+          "entry_id", "account",
+          "entry_password", "password",
+          "entry_server", "server",
+          "spinbutton_port", "port",
+          NULL);
+
+      self->ui_details->default_focus = g_strdup ("entry_id");
+      self->ui_details->add_forget = TRUE;
+    }
+}
 
-       empathy_account_widget_handle_params (settings, gui,
-                       "entry_published", "published-name",
-                       "entry_nickname", "nickname",
-                       "entry_first_name", "first-name",
-                       "entry_last_name", "last-name",
-                       "entry_email", "email",
-                       "entry_jid", "jid",
-                       NULL);
+static void
+account_widget_build_jabber (EmpathyAccountWidget *self,
+    const char *filename)
+{
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+  GtkWidget *spinbutton_port;
+  GtkWidget *checkbutton_ssl;
+  GtkWidget *label_id, *label_password;
+  GtkWidget *label_id_create, *label_password_create;
+
+  if (priv->simple)
+    {
+      self->ui_details->gui = empathy_builder_get_file (filename,
+          "vbox_jabber_simple", &self->ui_details->widget,
+          "label_id_simple", &label_id,
+          "label_id_create", &label_id_create,
+          "label_password_simple", &label_password,
+          "label_password_create", &label_password_create,
+          NULL);
+
+      if (empathy_account_settings_get_boolean (priv->settings, "register"))
+        {
+          gtk_widget_hide (label_id);
+          gtk_widget_hide (label_password);
+          gtk_widget_show (label_id_create);
+          gtk_widget_show (label_password_create);
+        }
+
+      empathy_account_widget_handle_params (self,
+          "entry_id_simple", "account",
+          "entry_password_simple", "password",
+          NULL);
+
+      self->ui_details->default_focus = g_strdup ("entry_id_simple");
+    }
+  else
+    {
+      self->ui_details->gui = empathy_builder_get_file (filename,
+          "table_common_settings", &priv->table_common_settings,
+          "vbox_jabber_settings", &self->ui_details->widget,
+          "spinbutton_port", &spinbutton_port,
+          "checkbutton_ssl", &checkbutton_ssl,
+          NULL);
+
+      empathy_account_widget_handle_params (self,
+          "entry_id", "account",
+          "entry_password", "password",
+          "entry_resource", "resource",
+          "entry_server", "server",
+          "spinbutton_port", "port",
+          "spinbutton_priority", "priority",
+          "checkbutton_ssl", "old-ssl",
+          "checkbutton_ignore_ssl_errors", "ignore-ssl-errors",
+          "checkbutton_encryption", "require-encryption",
+          NULL);
+
+      self->ui_details->default_focus = g_strdup ("entry_id");
+      self->ui_details->add_forget = TRUE;
+      priv->spinbutton_port = spinbutton_port;
+
+      g_signal_connect (checkbutton_ssl, "toggled",
+          G_CALLBACK (account_widget_jabber_ssl_toggled_cb),
+          self);
+    }
+}
 
-       empathy_account_widget_set_default_focus (gui, "entry_nickname");
-       empathy_account_widget_add_apply_button (settings, widget);
+static void
+account_widget_build_icq (EmpathyAccountWidget *self,
+    const char *filename)
+{
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+  GtkWidget *spinbutton_port;
+
+  if (priv->simple)
+    {
+      self->ui_details->gui = empathy_builder_get_file (filename,
+          "vbox_icq_simple", &self->ui_details->widget,
+          NULL);
+
+      empathy_account_widget_handle_params (self,
+          "entry_uin_simple", "account",
+          "entry_password_simple", "password",
+          NULL);
+
+      self->ui_details->default_focus = g_strdup ("entry_uin_simple");
+    }
+  else
+    {
+      self->ui_details->gui = empathy_builder_get_file (filename,
+          "table_common_settings", &priv->table_common_settings,
+          "vbox_icq_settings", &self->ui_details->widget,
+          "spinbutton_port", &spinbutton_port,
+          NULL);
+
+      empathy_account_widget_handle_params (self,
+          "entry_uin", "account",
+          "entry_password", "password",
+          "entry_server", "server",
+          "spinbutton_port", "port",
+          "entry_charset", "charset",
+          NULL);
+
+      self->ui_details->default_focus = g_strdup ("entry_uin");
+      self->ui_details->add_forget = TRUE;
+    }
+}
 
-       return empathy_builder_unref_and_keep_widget (gui, widget);
+static void
+account_widget_build_aim (EmpathyAccountWidget *self,
+    const char *filename)
+{
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+  GtkWidget *spinbutton_port;
+
+  if (priv->simple)
+    {
+      self->ui_details->gui = empathy_builder_get_file (filename,
+          "vbox_aim_simple", &self->ui_details->widget,
+          NULL);
+
+      empathy_account_widget_handle_params (self,
+          "entry_screenname_simple", "account",
+          "entry_password_simple", "password",
+          NULL);
+
+      self->ui_details->default_focus = g_strdup ("entry_screenname_simple");
+    }
+  else
+    {
+      self->ui_details->gui = empathy_builder_get_file (filename,
+          "table_common_settings", &priv->table_common_settings,
+          "vbox_aim_settings", &self->ui_details->widget,
+          "spinbutton_port", &spinbutton_port,
+          NULL);
+
+      empathy_account_widget_handle_params (self,
+          "entry_screenname", "account",
+          "entry_password", "password",
+          "entry_server", "server",
+          "spinbutton_port", "port",
+          NULL);
+
+      self->ui_details->default_focus = g_strdup ("entry_screenname");
+      self->ui_details->add_forget = TRUE;
+    }
 }
 
-GtkWidget *
-empathy_account_widget_msn_new (EmpathyAccountSettings *settings)
+static void
+account_widget_build_yahoo (EmpathyAccountWidget *self,
+    const char *filename)
+{
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+  if (priv->simple)
+    {
+      self->ui_details->gui = empathy_builder_get_file (filename,
+          "vbox_yahoo_simple", &self->ui_details->widget,
+          NULL);
+
+      empathy_account_widget_handle_params (self,
+          "entry_id_simple", "account",
+          "entry_password_simple", "password",
+          NULL);
+
+      self->ui_details->default_focus = g_strdup ("entry_id_simple");
+    }
+  else
+    {
+      self->ui_details->gui = empathy_builder_get_file (filename,
+          "table_common_settings", &priv->table_common_settings,
+          "vbox_yahoo_settings", &self->ui_details->widget,
+          NULL);
+
+      empathy_account_widget_handle_params (self,
+          "entry_id", "account",
+          "entry_password", "password",
+          "entry_server", "server",
+          "entry_locale", "room-list-locale",
+          "entry_charset", "charset",
+          "spinbutton_port", "port",
+          "checkbutton_yahoojp", "yahoojp",
+          "checkbutton_ignore_invites", "ignore-invites",
+          NULL);
+
+      self->ui_details->default_focus = g_strdup ("entry_id");
+      self->ui_details->add_forget = TRUE;
+    }
+}
+
+static void
+account_widget_build_groupwise (EmpathyAccountWidget *self,
+    const char *filename)
 {
-       GtkBuilder *gui;
-       GtkWidget *widget;
-       gchar     *filename;
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+  if (priv->simple)
+    {
+      self->ui_details->gui = empathy_builder_get_file (filename,
+          "vbox_groupwise_simple", &self->ui_details->widget,
+          NULL);
+
+      empathy_account_widget_handle_params (self,
+          "entry_id_simple", "account",
+          "entry_password_simple", "password",
+          NULL);
+
+      self->ui_details->default_focus = g_strdup ("entry_id_simple");
+    }
+  else
+    {
+      self->ui_details->gui = empathy_builder_get_file (filename,
+          "table_common_groupwise_settings", &priv->table_common_settings,
+          "vbox_groupwise_settings", &self->ui_details->widget,
+          NULL);
+
+      empathy_account_widget_handle_params (self,
+          "entry_id", "account",
+          "entry_password", "password",
+          "entry_server", "server",
+          "spinbutton_port", "port",
+          NULL);
+
+      self->ui_details->default_focus = g_strdup ("entry_id");
+      self->ui_details->add_forget = TRUE;
+    }
+}
 
-       filename = empathy_file_lookup ("empathy-account-widget-msn.ui",
-                                       "libempathy-gtk");
-       gui = empathy_builder_get_file (filename,
-                                       "vbox_msn_settings", &widget,
-                                       NULL);
-       g_free (filename);
+static void
+account_widget_destroy_cb (GtkWidget *widget,
+    EmpathyAccountWidget *self)
+{
+  g_object_unref (self);
+}
 
-       empathy_account_widget_handle_params (settings, gui,
-                       "entry_id", "account",
-                       "entry_password", "password",
-                       "entry_server", "server",
-                       "spinbutton_port", "port",
-                       NULL);
+static void
+empathy_account_widget_enabled_cb (EmpathyAccount *account,
+      GParamSpec *spec,
+      gpointer user_data)
+{
+  EmpathyAccountWidget *widget = EMPATHY_ACCOUNT_WIDGET (user_data);
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (widget);
+  gboolean enabled = empathy_account_is_enabled (account);
+
+  if (priv->enabled_checkbox != NULL)
+    {
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->enabled_checkbox),
+          enabled);
+    }
+}
 
-       empathy_account_widget_add_forget_button (settings, gui,
-                                                 "button_forget",
-                                                 "entry_password");
+static void
+account_widget_enabled_released_cb (GtkToggleButton *toggle_button,
+    gpointer user_data)
+{
+  account_widget_handle_control_buttons_sensitivity (
+      EMPATHY_ACCOUNT_WIDGET (user_data));
+}
 
-       empathy_account_widget_set_default_focus (gui, "entry_id");
+static void
+do_set_property (GObject *object,
+    guint prop_id,
+    const GValue *value,
+    GParamSpec *pspec)
+{
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (object);
+
+  switch (prop_id)
+    {
+    case PROP_SETTINGS:
+      priv->settings = g_value_dup_object (value);
+      break;
+    case PROP_SIMPLE:
+      priv->simple = g_value_get_boolean (value);
+      break;
+    case PROP_CREATING_ACCOUNT:
+      priv->creating_account = g_value_get_boolean (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
 
-       return empathy_builder_unref_and_keep_widget (gui, widget);
+static void
+do_get_property (GObject *object,
+    guint prop_id,
+    GValue *value,
+    GParamSpec *pspec)
+{
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (object);
+
+  switch (prop_id)
+    {
+    case PROP_PROTOCOL:
+      g_value_set_string (value,
+        empathy_account_settings_get_protocol (priv->settings));
+      break;
+    case PROP_SETTINGS:
+      g_value_set_object (value, priv->settings);
+      break;
+    case PROP_SIMPLE:
+      g_value_set_boolean (value, priv->simple);
+      break;
+    case PROP_CREATING_ACCOUNT:
+      g_value_set_boolean (value, priv->creating_account);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
 }
 
-GtkWidget *
-empathy_account_widget_jabber_new (EmpathyAccountSettings *settings)
-{
-       GtkBuilder *gui;
-       GtkWidget *widget;
-       GtkWidget *spinbutton_port;
-       GtkWidget *checkbutton_ssl;
-       gchar     *filename;
-
-       filename = empathy_file_lookup ("empathy-account-widget-jabber.ui",
-                                       "libempathy-gtk");
-       gui = empathy_builder_get_file (filename,
-                                       "vbox_jabber_settings", &widget,
-                                       "spinbutton_port", &spinbutton_port,
-                                       "checkbutton_ssl", &checkbutton_ssl,
-                                       NULL);
-       g_free (filename);
-
-       empathy_account_widget_handle_params (settings, gui,
-                       "entry_id", "account",
-                       "entry_password", "password",
-                       "entry_resource", "resource",
-                       "entry_server", "server",
-                       "spinbutton_port", "port",
-                       "spinbutton_priority", "priority",
-                       "checkbutton_ssl", "old-ssl",
-                       "checkbutton_ignore_ssl_errors", "ignore-ssl-errors",
-                       "checkbutton_encryption", "require-encryption",
-                       NULL);
-
-       empathy_account_widget_add_forget_button (settings, gui,
-                                                 "button_forget",
-                                                 "entry_password");
-
-       empathy_account_widget_set_default_focus (gui, "entry_id");
-
-       g_signal_connect (checkbutton_ssl, "toggled",
-                         G_CALLBACK (account_widget_jabber_ssl_toggled_cb),
-                         spinbutton_port);
-
-       empathy_account_widget_add_apply_button (settings, widget);
-
-       return empathy_builder_unref_and_keep_widget (gui, widget);
+#define WIDGET(cm, proto) \
+  { #cm, #proto, "empathy-account-widget-"#proto".ui", \
+    account_widget_build_##proto }
+
+static void
+do_constructed (GObject *obj)
+{
+  EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (obj);
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+  EmpathyAccount *account;
+  const gchar *protocol, *cm_name;
+  int i = 0;
+  struct {
+    const gchar *cm_name;
+    const gchar *protocol;
+    const char *file;
+    void (*func)(EmpathyAccountWidget *self, const gchar *filename);
+  } widgets [] = {
+    { "salut", "local-xmpp", "empathy-account-widget-local-xmpp.ui",
+        account_widget_build_salut },
+    WIDGET (gabble, jabber),
+    WIDGET (butterfly, msn),
+    WIDGET (haze, icq),
+    WIDGET (haze, aim),
+    WIDGET (haze, yahoo),
+    WIDGET (haze, groupwise),
+    WIDGET (idle, irc),
+    WIDGET (sofiasip, sip),
+  };
+
+  cm_name = empathy_account_settings_get_cm (priv->settings);
+  protocol = empathy_account_settings_get_protocol (priv->settings);
+
+  for (i = 0 ; i < G_N_ELEMENTS (widgets); i++)
+    {
+      if (!tp_strdiff (widgets[i].cm_name, cm_name) &&
+          !tp_strdiff (widgets[i].protocol, protocol))
+        {
+          gchar *filename;
+
+          filename = empathy_file_lookup (widgets[i].file,
+              "libempathy-gtk");
+          widgets[i].func (self, filename);
+          g_free (filename);
+
+          break;
+        }
+    }
+
+  if (i == G_N_ELEMENTS (widgets))
+    {
+      gchar *filename = empathy_file_lookup (
+          "empathy-account-widget-generic.ui", "libempathy-gtk");
+      account_widget_build_generic (self, filename);
+      g_free (filename);
+    }
+
+  /* handle default focus */
+  if (self->ui_details->default_focus != NULL)
+    {
+      GObject *default_focus_entry;
+
+      default_focus_entry = gtk_builder_get_object
+        (self->ui_details->gui, self->ui_details->default_focus);
+      g_signal_connect (default_focus_entry, "realize",
+          G_CALLBACK (gtk_widget_grab_focus),
+          NULL);
+    }
+
+  /* handle forget button */
+  if (self->ui_details->add_forget)
+    {
+      const gchar *password = NULL;
+
+      priv->button_forget = GTK_WIDGET (gtk_builder_get_object
+          (self->ui_details->gui, "button_forget"));
+      priv->entry_password = GTK_WIDGET (gtk_builder_get_object
+          (self->ui_details->gui, "entry_password"));
+
+      password = empathy_account_settings_get_string (priv->settings,
+          "password");
+      gtk_widget_set_sensitive (priv->button_forget,
+          !EMP_STR_EMPTY (password));
+
+      g_signal_connect (priv->button_forget, "clicked",
+          G_CALLBACK (account_widget_forget_clicked_cb),
+          self);
+      g_signal_connect (priv->entry_password, "changed",
+          G_CALLBACK (account_widget_password_changed_cb),
+          self);
+    }
+
+  /* handle apply and cancel button */
+  if (!priv->simple)
+    {
+      GtkWidget *hbox = gtk_hbox_new (TRUE, 3);
+
+      priv->cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+      priv->apply_button = gtk_button_new_from_stock (
+        priv->creating_account ? GTK_STOCK_CONNECT : GTK_STOCK_APPLY);
+
+      gtk_box_pack_end (GTK_BOX (hbox), priv->apply_button, TRUE,
+          TRUE, 3);
+      gtk_box_pack_end (GTK_BOX (hbox), priv->cancel_button, TRUE,
+          TRUE, 3);
+
+      gtk_box_pack_end (GTK_BOX (self->ui_details->widget), hbox, FALSE,
+          FALSE, 3);
+
+      g_signal_connect (priv->cancel_button, "clicked",
+          G_CALLBACK (account_widget_cancel_clicked_cb),
+          self);
+      g_signal_connect (priv->apply_button, "clicked",
+          G_CALLBACK (account_widget_apply_clicked_cb),
+          self);
+      gtk_widget_show_all (hbox);
+      account_widget_set_control_buttons_sensitivity (self, FALSE);
+    }
+
+  account = empathy_account_settings_get_account (priv->settings);
+
+  if (account != NULL)
+    {
+      g_signal_connect (account, "notify::enabled",
+          G_CALLBACK (empathy_account_widget_enabled_cb), self);
+    }
+
+  /* handle the "Enabled" checkbox. We only add it when modifying an account */
+  if (!priv->creating_account && priv->table_common_settings != NULL)
+    {
+      guint nb_rows, nb_columns;
+
+      priv->enabled_checkbox =
+          gtk_check_button_new_with_label (_("Enabled"));
+      priv->original_enabled_checkbox_value =
+          empathy_account_is_enabled (account);
+      gtk_toggle_button_set_active (
+          GTK_TOGGLE_BUTTON (priv->enabled_checkbox),
+          priv->original_enabled_checkbox_value);
+
+      g_object_get (priv->table_common_settings, "n-rows", &nb_rows,
+          "n-columns", &nb_columns, NULL);
+
+      gtk_table_resize (GTK_TABLE (priv->table_common_settings), ++nb_rows,
+          nb_columns);
+
+      gtk_table_attach (GTK_TABLE (priv->table_common_settings),
+          priv->enabled_checkbox, 0, nb_columns, nb_rows - 1, nb_rows,
+          GTK_EXPAND | GTK_FILL, 0, 0, 0);
+
+      gtk_widget_show (priv->enabled_checkbox);
+
+      g_signal_connect (G_OBJECT (priv->enabled_checkbox), "released",
+          G_CALLBACK (account_widget_enabled_released_cb), self);
+    }
+
+  /* hook up to widget destruction to unref ourselves */
+  g_signal_connect (self->ui_details->widget, "destroy",
+      G_CALLBACK (account_widget_destroy_cb), self);
+
+  empathy_builder_unref_and_keep_widget (self->ui_details->gui,
+      self->ui_details->widget);
+  self->ui_details->gui = NULL;
 }
 
-GtkWidget *
-empathy_account_widget_icq_new (EmpathyAccountSettings *settings)
+static void
+do_dispose (GObject *obj)
 {
-       GtkBuilder *gui;
-       GtkWidget *widget;
-       GtkWidget *spinbutton_port;
-       gchar     *filename;
+  EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (obj);
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
 
-       filename = empathy_file_lookup ("empathy-account-widget-icq.ui",
-                                       "libempathy-gtk");
-       gui = empathy_builder_get_file (filename,
-                                       "vbox_icq_settings", &widget,
-                                       "spinbutton_port", &spinbutton_port,
-                                       NULL);
-       g_free (filename);
+  if (priv->dispose_run)
+    return;
 
-       empathy_account_widget_handle_params (settings, gui,
-                       "entry_uin", "account",
-                       "entry_password", "password",
-                       "entry_server", "server",
-                       "spinbutton_port", "port",
-                       "entry_charset", "charset",
-                       NULL);
+  priv->dispose_run = TRUE;
 
-       empathy_account_widget_add_forget_button (settings, gui,
-                                                 "button_forget",
-                                                 "entry_password");
+  empathy_account_settings_is_ready (priv->settings);
 
-       empathy_account_widget_set_default_focus (gui, "entry_uin");
+  if (priv->settings != NULL)
+    {
+      EmpathyAccount *account;
+      account = empathy_account_settings_get_account (priv->settings);
 
-       empathy_account_widget_add_apply_button (settings, widget);
+      if (account != NULL)
+        {
+          g_signal_handlers_disconnect_by_func (account,
+              empathy_account_widget_enabled_cb, self);
+        }
 
-       return empathy_builder_unref_and_keep_widget (gui, widget);
+      g_object_unref (priv->settings);
+      priv->settings = NULL;
+    }
+
+  if (G_OBJECT_CLASS (empathy_account_widget_parent_class)->dispose != NULL)
+    G_OBJECT_CLASS (empathy_account_widget_parent_class)->dispose (obj);
 }
 
-GtkWidget *
-empathy_account_widget_aim_new (EmpathyAccountSettings *settings)
+static void
+do_finalize (GObject *obj)
 {
-       GtkBuilder *gui;
-       GtkWidget *widget;
-       GtkWidget *spinbutton_port;
-       gchar     *filename;
+  EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (obj);
+
+  g_free (self->ui_details->default_focus);
+  g_slice_free (EmpathyAccountWidgetUIDetails, self->ui_details);
 
-       filename = empathy_file_lookup ("empathy-account-widget-aim.ui",
-                                       "libempathy-gtk");
-       gui = empathy_builder_get_file (filename,
-                                       "vbox_aim_settings", &widget,
-                                       "spinbutton_port", &spinbutton_port,
-                                       NULL);
-       g_free (filename);
+  if (G_OBJECT_CLASS (empathy_account_widget_parent_class)->finalize != NULL)
+    G_OBJECT_CLASS (empathy_account_widget_parent_class)->finalize (obj);
+}
 
-       empathy_account_widget_handle_params (settings, gui,
-                       "entry_screenname", "account",
-                       "entry_password", "password",
-                       "entry_server", "server",
-                       "spinbutton_port", "port",
-                       NULL);
+static void
+empathy_account_widget_class_init (EmpathyAccountWidgetClass *klass)
+{
+  GObjectClass *oclass = G_OBJECT_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;
+  oclass->finalize = do_finalize;
+
+  param_spec = g_param_spec_string ("protocol",
+      "protocol", "The protocol of the account",
+      NULL,
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (oclass, PROP_PROTOCOL, param_spec);
+
+  param_spec = g_param_spec_object ("settings",
+      "settings", "The settings of the account",
+      EMPATHY_TYPE_ACCOUNT_SETTINGS,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property (oclass, PROP_SETTINGS, param_spec);
+
+  param_spec = g_param_spec_boolean ("simple",
+      "simple", "Whether the account widget is a simple or an advanced one",
+      FALSE,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property (oclass, PROP_SIMPLE, param_spec);
+
+  param_spec = g_param_spec_boolean ("creating-account",
+      "creating-account",
+      "TRUE if we're creating an account, FALSE if we're modifying it",
+      FALSE,
+      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property (oclass, PROP_CREATING_ACCOUNT, param_spec);
+
+  signals[HANDLE_APPLY] =
+    g_signal_new ("handle-apply", G_TYPE_FROM_CLASS (klass),
+        G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+        g_cclosure_marshal_VOID__BOOLEAN,
+        G_TYPE_NONE,
+        1, G_TYPE_BOOLEAN);
+
+  /* This signal is emitted when an account has been created and enabled. */
+  signals[ACCOUNT_CREATED] =
+      g_signal_new ("account-created", G_TYPE_FROM_CLASS (klass),
+          G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+          g_cclosure_marshal_VOID__VOID,
+          G_TYPE_NONE,
+          0);
+
+  signals[CANCELLED] =
+      g_signal_new ("cancelled", G_TYPE_FROM_CLASS (klass),
+          G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+          g_cclosure_marshal_VOID__VOID,
+          G_TYPE_NONE,
+          0);
+
+  g_type_class_add_private (klass, sizeof (EmpathyAccountWidgetPriv));
+}
 
-       empathy_account_widget_add_forget_button (settings, gui,
-                                                 "button_forget",
-                                                 "entry_password");
+static void
+empathy_account_widget_init (EmpathyAccountWidget *self)
+{
+  EmpathyAccountWidgetPriv *priv =
+    G_TYPE_INSTANCE_GET_PRIVATE ((self), EMPATHY_TYPE_ACCOUNT_WIDGET,
+        EmpathyAccountWidgetPriv);
 
-       empathy_account_widget_set_default_focus (gui, "entry_screenname");
-       empathy_account_widget_add_apply_button (settings, widget);
+  self->priv = priv;
+  priv->dispose_run = FALSE;
 
-       return empathy_builder_unref_and_keep_widget (gui, widget);
+  self->ui_details = g_slice_new0 (EmpathyAccountWidgetUIDetails);
 }
 
-GtkWidget *
-empathy_account_widget_yahoo_new (EmpathyAccountSettings *settings)
+/* public methods */
+
+void
+empathy_account_widget_discard_pending_changes
+    (EmpathyAccountWidget *widget)
 {
-       GtkBuilder *gui;
-       GtkWidget *widget;
-       gchar     *filename;
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (widget);
 
-       filename = empathy_file_lookup ("empathy-account-widget-yahoo.ui",
-                                       "libempathy-gtk");
-       gui = empathy_builder_get_file (filename,
-                                       "vbox_yahoo_settings", &widget,
-                                       NULL);
-       g_free (filename);
+  empathy_account_settings_discard_changes (priv->settings);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->enabled_checkbox),
+      priv->original_enabled_checkbox_value);
+  priv->contains_pending_changes = FALSE;
+}
 
-       empathy_account_widget_handle_params (settings, gui,
-                       "entry_id", "account",
-                       "entry_password", "password",
-                       "entry_server", "server",
-                       "entry_locale", "room-list-locale",
-                       "entry_charset", "charset",
-                       "spinbutton_port", "port",
-                       "checkbutton_yahoojp", "yahoojp",
-                       "checkbutton_ignore_invites", "ignore-invites",
-                       NULL);
+gboolean
+empathy_account_widget_contains_pending_changes (EmpathyAccountWidget *widget)
+{
+  EmpathyAccountWidgetPriv *priv = GET_PRIV (widget);
 
-       empathy_account_widget_add_forget_button (settings, gui,
-                                                 "button_forget",
-                                                 "entry_password");
+  return priv->contains_pending_changes;
+}
 
-       empathy_account_widget_set_default_focus (gui, "entry_id");
-       empathy_account_widget_add_apply_button (settings, widget);
+void
+empathy_account_widget_handle_params (EmpathyAccountWidget *self,
+    const gchar *first_widget,
+    ...)
+{
+  va_list args;
 
-       return empathy_builder_unref_and_keep_widget (gui, widget);
+  va_start (args, first_widget);
+  account_widget_handle_params_valist (self, first_widget, args);
+  va_end (args);
 }
 
 GtkWidget *
-empathy_account_widget_groupwise_new (EmpathyAccountSettings *settings)
+empathy_account_widget_get_widget (EmpathyAccountWidget *widget)
 {
-       GtkBuilder *gui;
-       GtkWidget *widget;
-       gchar     *filename;
-
-       filename = empathy_file_lookup ("empathy-account-widget-groupwise.ui",
-                                       "libempathy-gtk");
-       gui = empathy_builder_get_file (filename,
-                                       "vbox_groupwise_settings", &widget,
-                                       NULL);
-       g_free (filename);
+  return widget->ui_details->widget;
+}
 
-       empathy_account_widget_handle_params (settings, gui,
-                       "entry_id", "account",
-                       "entry_password", "password",
-                       "entry_server", "server",
-                       "spinbutton_port", "port",
-                       NULL);
+EmpathyAccountWidget *
+empathy_account_widget_new_for_protocol (EmpathyAccountSettings *settings,
+    gboolean simple)
+{
+  EmpathyAccountWidget *self;
 
-       empathy_account_widget_add_forget_button (settings, gui,
-                                                 "button_forget",
-                                                 "entry_password");
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_SETTINGS (settings), NULL);
 
-       empathy_account_widget_set_default_focus (gui, "entry_id");
-       empathy_account_widget_add_apply_button (settings, widget);
+  self = g_object_new
+    (EMPATHY_TYPE_ACCOUNT_WIDGET,
+        "settings", settings, "simple", simple,
+        "creating-account",
+        empathy_account_settings_get_account (settings) == NULL,
+        NULL);
 
-       return empathy_builder_unref_and_keep_widget (gui, widget);
+  return self;
 }
-