account-settings: move from Empathy to tp-account-widgets

https://bugzilla.gnome.org/show_bug.cgi?id=699492

11 files changed, 2043 insertions, 113 deletions

diff --git a/tp-account-widgets/Makefile.am b/tp-account-widgets/Makefile.am
index 0d2d5011d..554c1a639 100644
--- a/tp-account-widgets/Makefile.am
+++ b/tp-account-widgets/Makefile.am
@@ -16,6 +16,7 @@ BUILT_SOURCES = 					\
 	$(NULL)
 
 libtp_account_widgets_sources =            	\
+	tpaw-account-settings.c			\
 	tpaw-account-widget.c			\
 	tpaw-account-widget-irc.c		\
 	tpaw-account-widget-private.h		\
@@ -30,6 +31,7 @@ libtp_account_widgets_sources =            	\
 	$(NULL)
 
 libtp_account_widgets_headers =			\
+	tpaw-account-settings.h			\
 	tpaw-account-widget.h			\
 	tpaw-account-widget-irc.h		\
 	tpaw-account-widget-sip.h		\
diff --git a/tp-account-widgets/tpaw-account-settings.c b/tp-account-widgets/tpaw-account-settings.c
new file mode 100644
index 000000000..b97da2790
--- /dev/null
+++ b/tp-account-widgets/tpaw-account-settings.c
@@ -0,0 +1,1724 @@
+/*
+ * tpaw-account-settings.c - Source for TpawAccountSettings
+ * Copyright (C) 2009 Collabora Ltd.
+ * @author Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "config.h"
+#include "tpaw-account-settings.h"
+
+#include "empathy-connection-managers.h"
+#include "empathy-keyring.h"
+#include "empathy-presence-manager.h"
+#include "empathy-utils.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
+#include "empathy-debug.h"
+
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, TpawAccountSettings)
+
+G_DEFINE_TYPE(TpawAccountSettings, tpaw_account_settings, G_TYPE_OBJECT)
+
+enum {
+  PROP_ACCOUNT = 1,
+  PROP_CM_NAME,
+  PROP_PROTOCOL,
+  PROP_SERVICE,
+  PROP_DISPLAY_NAME,
+  PROP_DISPLAY_NAME_OVERRIDDEN,
+  PROP_READY
+};
+
+enum {
+  PASSWORD_RETRIEVED = 1,
+  LAST_SIGNAL
+};
+
+static gulong signals[LAST_SIGNAL] = { 0, };
+
+/* private structure */
+typedef struct _TpawAccountSettingsPriv TpawAccountSettingsPriv;
+
+struct _TpawAccountSettingsPriv
+{
+  gboolean dispose_has_run;
+  EmpathyConnectionManagers *managers;
+  TpAccountManager *account_manager;
+
+  TpConnectionManager *manager;
+  TpProtocol *protocol_obj;
+
+  TpAccount *account;
+  gchar *cm_name;
+  gchar *protocol;
+  gchar *service;
+  gchar *display_name;
+  gchar *icon_name;
+  gchar *storage_provider;
+  gboolean display_name_overridden;
+  gboolean ready;
+
+  gboolean supports_sasl;
+  gboolean remember_password;
+
+  gchar *password;
+  gchar *password_original;
+
+  gboolean password_retrieved;
+  gboolean password_requested;
+
+  /* Parameter name (gchar *) -> parameter value (GVariant) */
+  GHashTable *parameters;
+  /* Keys are parameter names from the hash above (gchar *).
+   * Values are regular expresions that should match corresponding parameter
+   * values (GRegex *). Possible regexp patterns are defined in
+   * empathy-account-widget.c */
+  GHashTable *param_regexps;
+  GArray *unset_parameters;
+  GList *required_params;
+
+  gulong managers_ready_id;
+  gboolean preparing_protocol;
+
+  /* If TRUE, the account should have 'tel' in its
+   * Account.Interface.Addressing.URISchemes property. */
+  gboolean uri_scheme_tel;
+  /* If TRUE, Service property needs to be updated when applying changes */
+  gboolean update_service;
+
+  GSimpleAsyncResult *apply_result;
+};
+
+static void
+tpaw_account_settings_init (TpawAccountSettings *obj)
+{
+  TpawAccountSettingsPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE ((obj),
+    TPAW_TYPE_ACCOUNT_SETTINGS, TpawAccountSettingsPriv);
+
+  obj->priv = priv;
+
+  /* allocate any data required by the object here */
+  priv->managers = empathy_connection_managers_dup_singleton ();
+  priv->account_manager = tp_account_manager_dup ();
+
+  priv->parameters = g_hash_table_new_full (g_str_hash, g_str_equal,
+    g_free, (GDestroyNotify) g_variant_unref);
+
+  priv->param_regexps = g_hash_table_new_full (g_str_hash, g_str_equal,
+    g_free, (GDestroyNotify) g_regex_unref);
+
+  priv->unset_parameters = g_array_new (TRUE, FALSE, sizeof (gchar *));
+
+  priv->required_params = NULL;
+}
+
+static void tpaw_account_settings_dispose (GObject *object);
+static void tpaw_account_settings_finalize (GObject *object);
+static void tpaw_account_settings_account_ready_cb (GObject *source_object,
+    GAsyncResult *result, gpointer user_data);
+static void tpaw_account_settings_managers_ready_cb (GObject *obj,
+    GParamSpec *pspec, gpointer user_data);
+static void tpaw_account_settings_check_readyness (
+    TpawAccountSettings *self);
+
+static void
+tpaw_account_settings_set_property (GObject *object,
+    guint prop_id,
+    const GValue *value,
+    GParamSpec *pspec)
+{
+  TpawAccountSettings *settings = TPAW_ACCOUNT_SETTINGS (object);
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  switch (prop_id)
+    {
+      case PROP_ACCOUNT:
+        priv->account = g_value_dup_object (value);
+        break;
+      case PROP_CM_NAME:
+        priv->cm_name = g_value_dup_string (value);
+        break;
+      case PROP_PROTOCOL:
+        priv->protocol = g_value_dup_string (value);
+        break;
+      case PROP_SERVICE:
+        priv->service = g_value_dup_string (value);
+        break;
+      case PROP_DISPLAY_NAME:
+        priv->display_name = g_value_dup_string (value);
+        break;
+      case PROP_DISPLAY_NAME_OVERRIDDEN:
+        priv->display_name_overridden = g_value_get_boolean (value);
+        break;
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
+}
+
+static void
+tpaw_account_settings_get_property (GObject *object,
+    guint prop_id,
+    GValue *value,
+    GParamSpec *pspec)
+{
+  TpawAccountSettings *settings = TPAW_ACCOUNT_SETTINGS (object);
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  switch (prop_id)
+    {
+      case PROP_ACCOUNT:
+        g_value_set_object (value, priv->account);
+        break;
+      case PROP_CM_NAME:
+        g_value_set_string (value, priv->cm_name);
+        break;
+      case PROP_PROTOCOL:
+        g_value_set_string (value, priv->protocol);
+        break;
+      case PROP_SERVICE:
+        g_value_set_string (value, priv->service);
+        break;
+      case PROP_DISPLAY_NAME:
+        g_value_set_string (value, priv->display_name);
+        break;
+      case PROP_DISPLAY_NAME_OVERRIDDEN:
+        g_value_set_boolean (value, priv->display_name_overridden);
+        break;
+      case PROP_READY:
+        g_value_set_boolean (value, priv->ready);
+        break;
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
+}
+
+static void
+tpaw_account_settings_constructed (GObject *object)
+{
+  TpawAccountSettings *self = TPAW_ACCOUNT_SETTINGS (object);
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+
+  if (priv->account != NULL)
+    {
+      g_free (priv->cm_name);
+      g_free (priv->protocol);
+      g_free (priv->service);
+
+      priv->cm_name =
+        g_strdup (tp_account_get_cm_name (priv->account));
+      priv->protocol =
+        g_strdup (tp_account_get_protocol_name (priv->account));
+      priv->service =
+        g_strdup (tp_account_get_service (priv->account));
+      priv->icon_name = g_strdup
+        (tp_account_get_icon_name (priv->account));
+    }
+  else
+    {
+      priv->icon_name = empathy_protocol_icon_name (priv->protocol);
+    }
+
+  g_assert (priv->cm_name != NULL && priv->protocol != NULL);
+
+  tpaw_account_settings_check_readyness (self);
+
+  if (!priv->ready)
+    {
+      GQuark features[] = {
+          TP_ACCOUNT_FEATURE_CORE,
+          TP_ACCOUNT_FEATURE_STORAGE,
+          TP_ACCOUNT_FEATURE_ADDRESSING,
+          0 };
+
+      if (priv->account != NULL)
+        {
+          tp_proxy_prepare_async (priv->account, features,
+              tpaw_account_settings_account_ready_cb, self);
+        }
+
+      tp_g_signal_connect_object (priv->managers, "notify::ready",
+        G_CALLBACK (tpaw_account_settings_managers_ready_cb), object, 0);
+    }
+
+  if (G_OBJECT_CLASS (
+        tpaw_account_settings_parent_class)->constructed != NULL)
+    G_OBJECT_CLASS (
+        tpaw_account_settings_parent_class)->constructed (object);
+}
+
+
+static void
+tpaw_account_settings_class_init (
+    TpawAccountSettingsClass *tpaw_account_settings_class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (tpaw_account_settings_class);
+
+  g_type_class_add_private (tpaw_account_settings_class, sizeof
+      (TpawAccountSettingsPriv));
+
+  object_class->dispose = tpaw_account_settings_dispose;
+  object_class->finalize = tpaw_account_settings_finalize;
+  object_class->set_property = tpaw_account_settings_set_property;
+  object_class->get_property = tpaw_account_settings_get_property;
+  object_class->constructed = tpaw_account_settings_constructed;
+
+  g_object_class_install_property (object_class, PROP_ACCOUNT,
+    g_param_spec_object ("account",
+      "Account",
+      "The TpAccount backing these settings",
+      TP_TYPE_ACCOUNT,
+      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_CM_NAME,
+    g_param_spec_string ("connection-manager",
+      "connection-manager",
+      "The name of the connection manager this account uses",
+      NULL,
+      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_PROTOCOL,
+    g_param_spec_string ("protocol",
+      "Protocol",
+      "The name of the protocol this account uses",
+      NULL,
+      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_SERVICE,
+    g_param_spec_string ("service",
+      "Service",
+      "The service of this account, or NULL",
+      NULL,
+      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_DISPLAY_NAME,
+    g_param_spec_string ("display-name",
+      "display-name",
+      "The display name account these settings belong to",
+      NULL,
+      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class, PROP_DISPLAY_NAME_OVERRIDDEN,
+      g_param_spec_boolean ("display-name-overridden",
+        "display-name-overridden",
+        "Whether the display name for this account has been manually "
+        "overridden",
+        FALSE,
+        G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class, PROP_READY,
+    g_param_spec_boolean ("ready",
+      "Ready",
+      "Whether this account is ready to be used",
+      FALSE,
+      G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
+
+  signals[PASSWORD_RETRIEVED] =
+      g_signal_new ("password-retrieved",
+          G_TYPE_FROM_CLASS (tpaw_account_settings_class),
+          G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+          g_cclosure_marshal_generic,
+          G_TYPE_NONE, 0);
+}
+
+static void
+tpaw_account_settings_dispose (GObject *object)
+{
+  TpawAccountSettings *self = TPAW_ACCOUNT_SETTINGS (object);
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+
+  if (priv->dispose_has_run)
+    return;
+
+  priv->dispose_has_run = TRUE;
+
+  if (priv->managers_ready_id != 0)
+    g_signal_handler_disconnect (priv->managers, priv->managers_ready_id);
+  priv->managers_ready_id = 0;
+
+  tp_clear_object (&priv->managers);
+  tp_clear_object (&priv->manager);
+  tp_clear_object (&priv->account_manager);
+  tp_clear_object (&priv->account);
+  tp_clear_object (&priv->protocol_obj);
+
+  /* release any references held by the object here */
+  if (G_OBJECT_CLASS (tpaw_account_settings_parent_class)->dispose)
+    G_OBJECT_CLASS (tpaw_account_settings_parent_class)->dispose (object);
+}
+
+static void
+tpaw_account_settings_free_unset_parameters (
+    TpawAccountSettings *settings)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+  guint i;
+
+  for (i = 0 ; i < priv->unset_parameters->len; i++)
+    g_free (g_array_index (priv->unset_parameters, gchar *, i));
+
+  g_array_set_size (priv->unset_parameters, 0);
+}
+
+static void
+tpaw_account_settings_finalize (GObject *object)
+{
+  TpawAccountSettings *self = TPAW_ACCOUNT_SETTINGS (object);
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+  GList *l;
+
+  /* free any data held directly by the object here */
+  g_free (priv->cm_name);
+  g_free (priv->protocol);
+  g_free (priv->service);
+  g_free (priv->display_name);
+  g_free (priv->icon_name);
+  g_free (priv->password);
+  g_free (priv->password_original);
+  g_free (priv->storage_provider);
+
+  if (priv->required_params != NULL)
+    {
+      for (l = priv->required_params; l; l = l->next)
+        g_free (l->data);
+      g_list_free (priv->required_params);
+    }
+
+  g_hash_table_unref (priv->parameters);
+  g_hash_table_unref (priv->param_regexps);
+
+  tpaw_account_settings_free_unset_parameters (self);
+  g_array_unref (priv->unset_parameters);
+
+  G_OBJECT_CLASS (tpaw_account_settings_parent_class)->finalize (object);
+}
+
+static void
+tpaw_account_settings_protocol_obj_prepared_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  TpawAccountSettings *self = user_data;
+  GError *error = NULL;
+
+  if (!tp_proxy_prepare_finish (source, result, &error))
+    {
+      DEBUG ("Failed to prepare protocol object: %s", error->message);
+      g_clear_error (&error);
+      return;
+    }
+
+  tpaw_account_settings_check_readyness (self);
+}
+
+static void
+tpaw_account_settings_get_password_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  TpawAccountSettings *self = user_data;
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+  const gchar *password;
+  GError *error = NULL;
+
+  password = empathy_keyring_get_account_password_finish (TP_ACCOUNT (source),
+      result, &error);
+
+  if (error != NULL)
+    {
+      DEBUG ("Failed to get password: %s", error->message);
+      g_clear_error (&error);
+    }
+
+  /* It doesn't really matter if getting the password failed; that
+   * just means that it's not there, or let's act like that at
+   * least. */
+
+  g_assert (priv->password == NULL);
+
+  priv->password = g_strdup (password);
+  priv->password_original = g_strdup (password);
+
+  g_signal_emit (self, signals[PASSWORD_RETRIEVED], 0);
+}
+
+static GVariant * tpaw_account_settings_dup (
+    TpawAccountSettings *settings,
+    const gchar *param);
+
+static void
+tpaw_account_settings_check_readyness (TpawAccountSettings *self)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+  GQuark features[] = { TP_PROTOCOL_FEATURE_CORE, 0 };
+
+  if (priv->ready)
+    return;
+
+  if (priv->account != NULL
+      && !tp_account_is_prepared (priv->account, TP_ACCOUNT_FEATURE_CORE))
+      return;
+
+  if (!empathy_connection_managers_is_ready (priv->managers))
+    return;
+
+  if (priv->manager == NULL)
+    {
+      priv->manager = empathy_connection_managers_get_cm (
+          priv->managers, priv->cm_name);
+    }
+
+  if (priv->manager == NULL)
+    return;
+
+  g_object_ref (priv->manager);
+
+  if (priv->account != NULL)
+    {
+      g_free (priv->display_name);
+      priv->display_name =
+        g_strdup (tp_account_get_display_name (priv->account));
+
+      g_free (priv->icon_name);
+      priv->icon_name =
+        g_strdup (tp_account_get_icon_name (priv->account));
+
+      priv->uri_scheme_tel = empathy_account_has_uri_scheme_tel (priv->account);
+    }
+
+  if (priv->protocol_obj == NULL)
+    {
+      priv->protocol_obj = g_object_ref (
+          tp_connection_manager_get_protocol_object (priv->manager,
+            priv->protocol));
+    }
+
+  if (!tp_proxy_is_prepared (priv->protocol_obj, TP_PROTOCOL_FEATURE_CORE)
+      && !priv->preparing_protocol)
+    {
+      priv->preparing_protocol = TRUE;
+      tp_proxy_prepare_async (priv->protocol_obj, features,
+          tpaw_account_settings_protocol_obj_prepared_cb, self);
+      return;
+    }
+  else
+    {
+      if (tp_strv_contains (tp_protocol_get_authentication_types (
+                  priv->protocol_obj),
+              TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION))
+        {
+          priv->supports_sasl = TRUE;
+        }
+    }
+
+  if (priv->required_params == NULL)
+    {
+      GList *params, *l;
+
+      params = tp_protocol_dup_params (priv->protocol_obj);
+      for (l = params; l != NULL; l = g_list_next (l))
+        {
+          TpConnectionManagerParam *cur = l->data;
+
+          if (tp_connection_manager_param_is_required (cur))
+            {
+              priv->required_params = g_list_append (priv->required_params,
+                  g_strdup (tp_connection_manager_param_get_name (cur)));
+            }
+        }
+
+       g_list_free_full (params,
+           (GDestroyNotify) tp_connection_manager_param_free);
+    }
+
+  /* priv->account won't be a proper account if it's the account
+   * assistant showing this widget. */
+  if (priv->supports_sasl && !priv->password_requested
+      && priv->account != NULL)
+    {
+      priv->password_requested = TRUE;
+
+      /* Make this call but don't block on its readiness. We'll signal
+       * if it's updated later with ::password-retrieved. */
+      empathy_keyring_get_account_password_async (priv->account,
+          tpaw_account_settings_get_password_cb, self);
+    }
+
+  priv->ready = TRUE;
+  g_object_notify (G_OBJECT (self), "ready");
+}
+
+static void
+tpaw_account_settings_account_ready_cb (GObject *source_object,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  TpawAccountSettings *settings = TPAW_ACCOUNT_SETTINGS (user_data);
+  TpAccount *account = TP_ACCOUNT (source_object);
+  GError *error = NULL;
+
+  if (!tp_proxy_prepare_finish (account, result, &error))
+    {
+      DEBUG ("Failed to prepare account: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  tpaw_account_settings_check_readyness (settings);
+}
+
+static void
+tpaw_account_settings_managers_ready_cb (GObject *object,
+    GParamSpec *pspec,
+    gpointer user_data)
+{
+  TpawAccountSettings *settings = TPAW_ACCOUNT_SETTINGS (user_data);
+
+  tpaw_account_settings_check_readyness (settings);
+}
+
+TpawAccountSettings *
+tpaw_account_settings_new (const gchar *connection_manager,
+    const gchar *protocol,
+    const gchar *service,
+    const char *display_name)
+{
+  return g_object_new (TPAW_TYPE_ACCOUNT_SETTINGS,
+      "connection-manager", connection_manager,
+      "protocol", protocol,
+      "service", service,
+      "display-name", display_name,
+      NULL);
+}
+
+TpawAccountSettings *
+tpaw_account_settings_new_for_account (TpAccount *account)
+{
+  return g_object_new (TPAW_TYPE_ACCOUNT_SETTINGS,
+      "account", account,
+      NULL);
+}
+
+GList *
+tpaw_account_settings_dup_tp_params (TpawAccountSettings *settings)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  g_return_val_if_fail (priv->protocol_obj != NULL, NULL);
+
+  return tp_protocol_dup_params (priv->protocol_obj);
+}
+
+gboolean
+tpaw_account_settings_is_ready (TpawAccountSettings *settings)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  return priv->ready;
+}
+
+const gchar *
+tpaw_account_settings_get_cm (TpawAccountSettings *settings)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  return priv->cm_name;
+}
+
+const gchar *
+tpaw_account_settings_get_protocol (TpawAccountSettings *settings)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  return priv->protocol;
+}
+
+const gchar *
+tpaw_account_settings_get_service (TpawAccountSettings *settings)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  return priv->service;
+}
+
+void
+tpaw_account_settings_set_service (TpawAccountSettings *settings,
+    const gchar *service)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  if (!tp_strdiff (priv->service, service))
+    return;
+
+  g_free (priv->service);
+  priv->service = g_strdup (service);
+  g_object_notify (G_OBJECT (settings), "service");
+  priv->update_service = TRUE;
+}
+
+gchar *
+tpaw_account_settings_get_icon_name (TpawAccountSettings *settings)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  return priv->icon_name;
+}
+
+const gchar *
+tpaw_account_settings_get_display_name (TpawAccountSettings *settings)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  return priv->display_name;
+}
+
+TpAccount *
+tpaw_account_settings_get_account (TpawAccountSettings *settings)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  return priv->account;
+}
+
+static gboolean
+tpaw_account_settings_is_unset (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+  GArray *a;
+  guint i;
+
+  a = priv->unset_parameters;
+
+  for (i = 0; i < a->len; i++)
+    {
+      if (!tp_strdiff (g_array_index (a, gchar *, i), param))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static const TpConnectionManagerParam *
+tpaw_account_settings_get_tp_param (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  return tp_protocol_get_param (priv->protocol_obj, param);
+}
+
+gboolean
+tpaw_account_settings_have_tp_param (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  return (tpaw_account_settings_get_tp_param (settings, param) != NULL);
+}
+
+static void
+account_settings_remove_from_unset (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+  guint idx;
+  gchar *val;
+
+  for (idx = 0; idx < priv->unset_parameters->len; idx++)
+    {
+      val = g_array_index (priv->unset_parameters, gchar *, idx);
+
+      if (!tp_strdiff (val, param))
+        {
+          priv->unset_parameters =
+            g_array_remove_index (priv->unset_parameters, idx);
+          g_free (val);
+
+          break;
+        }
+    }
+}
+
+GVariant *
+tpaw_account_settings_dup_default (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  const TpConnectionManagerParam *p;
+
+  p = tpaw_account_settings_get_tp_param (settings, param);
+  if (p == NULL)
+    return NULL;
+
+  return tp_connection_manager_param_dup_default_variant (p);
+}
+
+const gchar *
+tpaw_account_settings_get_dbus_signature (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  const TpConnectionManagerParam *p;
+
+  p = tpaw_account_settings_get_tp_param (settings, param);
+
+  if (p == NULL)
+    return NULL;
+
+  return tp_connection_manager_param_get_dbus_signature (p);
+}
+
+static GVariant *
+tpaw_account_settings_dup (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+  GVariant *result;
+
+  /* Lookup the update parameters we set */
+  result = g_hash_table_lookup (priv->parameters, param);
+  if (result != NULL)
+    return g_variant_ref (result);
+
+  /* If the parameters isn't unset use the accounts setting if any */
+  if (priv->account != NULL
+      && !tpaw_account_settings_is_unset (settings, param))
+    {
+      GVariant *parameters;
+
+      parameters = tp_account_dup_parameters_vardict (priv->account);
+      result = g_variant_lookup_value (parameters, param, NULL);
+      g_variant_unref (parameters);
+
+      if (result != NULL)
+        /* g_variant_lookup_value() is (transfer full) */
+        return result;
+    }
+
+  /* fallback to the default */
+  return tpaw_account_settings_dup_default (settings, param);
+}
+
+void
+tpaw_account_settings_unset (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+  gchar *v;
+  if (tpaw_account_settings_is_unset (settings, param))
+    return;
+
+  if (priv->supports_sasl && !tp_strdiff (param, "password"))
+    {
+      g_free (priv->password);
+      priv->password = NULL;
+      return;
+    }
+
+  v = g_strdup (param);
+
+  g_array_append_val (priv->unset_parameters, v);
+  g_hash_table_remove (priv->parameters, param);
+}
+
+void
+tpaw_account_settings_discard_changes (TpawAccountSettings *settings)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  g_hash_table_remove_all (priv->parameters);
+  tpaw_account_settings_free_unset_parameters (settings);
+
+  g_free (priv->password);
+  priv->password = g_strdup (priv->password_original);
+
+  if (priv->account != NULL)
+    priv->uri_scheme_tel = empathy_account_has_uri_scheme_tel (priv->account);
+  else
+    priv->uri_scheme_tel = FALSE;
+}
+
+gchar *
+tpaw_account_settings_dup_string (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+  GVariant *v;
+  gchar *result = NULL;
+
+  if (!tp_strdiff (param, "password") && priv->supports_sasl)
+    {
+      return g_strdup (priv->password);
+    }
+
+  v = tpaw_account_settings_dup (settings, param);
+  if (v == NULL)
+    return NULL;
+
+  if (g_variant_is_of_type (v, G_VARIANT_TYPE_STRING))
+    result = g_variant_dup_string (v, NULL);
+
+  g_variant_unref (v);
+  return result;
+}
+
+GStrv
+tpaw_account_settings_dup_strv (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  GVariant *v;
+  GStrv result = NULL;
+
+  v = tpaw_account_settings_dup (settings, param);
+  if (v == NULL)
+    return NULL;
+
+  if (g_variant_is_of_type (v, G_VARIANT_TYPE_STRING_ARRAY))
+    result = g_variant_dup_strv (v, NULL);
+
+  g_variant_unref (v);
+  return result;
+}
+
+gint32
+tpaw_account_settings_get_int32 (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  GVariant *v;
+  gint32 ret = 0;
+
+  v = tpaw_account_settings_dup (settings, param);
+  if (v == NULL)
+    return 0;
+
+  if (g_variant_is_of_type (v, G_VARIANT_TYPE_BYTE))
+    ret = g_variant_get_byte (v);
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT32))
+    ret = g_variant_get_int32 (v);
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT32))
+    ret = CLAMP (g_variant_get_uint32 (v), (guint) G_MININT32,
+        G_MAXINT32);
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT64))
+    ret = CLAMP (g_variant_get_int64 (v), G_MININT32, G_MAXINT32);
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT64))
+    ret = CLAMP (g_variant_get_uint64 (v), (guint64) G_MININT32, G_MAXINT32);
+  else
+    {
+      gchar *tmp;
+
+      tmp = g_variant_print (v, TRUE);
+      DEBUG ("Unsupported type for param '%s': %s'", param, tmp);
+      g_free (tmp);
+    }
+
+  g_variant_unref (v);
+  return ret;
+}
+
+gint64
+tpaw_account_settings_get_int64 (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  GVariant *v;
+  gint64 ret = 0;
+
+  v = tpaw_account_settings_dup (settings, param);
+  if (v == NULL)
+    return 0;
+
+  if (g_variant_is_of_type (v, G_VARIANT_TYPE_BYTE))
+    ret = g_variant_get_byte (v);
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT32))
+    ret = g_variant_get_int32 (v);
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT32))
+    ret = g_variant_get_uint32 (v);
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT64))
+    ret = g_variant_get_int64 (v);
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT64))
+    ret = CLAMP (g_variant_get_uint64 (v), (guint64) G_MININT64, G_MAXINT64);
+  else
+    {
+      gchar *tmp;
+
+      tmp = g_variant_print (v, TRUE);
+      DEBUG ("Unsupported type for param '%s': %s'", param, tmp);
+      g_free (tmp);
+    }
+
+  g_variant_unref (v);
+  return ret;
+}
+
+guint32
+tpaw_account_settings_get_uint32 (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  GVariant *v;
+  guint32 ret = 0;
+
+  v = tpaw_account_settings_dup (settings, param);
+  if (v == NULL)
+    return 0;
+
+  if (g_variant_is_of_type (v, G_VARIANT_TYPE_BYTE))
+    ret = g_variant_get_byte (v);
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT32))
+    ret = MAX (0, g_variant_get_int32 (v));
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT32))
+    ret = g_variant_get_uint32 (v);
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT64))
+    ret = CLAMP (g_variant_get_int64 (v), 0, G_MAXUINT32);
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT64))
+    ret = MIN (g_variant_get_uint64 (v), G_MAXUINT32);
+  else
+    {
+      gchar *tmp;
+
+      tmp = g_variant_print (v, TRUE);
+      DEBUG ("Unsupported type for param '%s': %s'", param, tmp);
+      g_free (tmp);
+    }
+
+  g_variant_unref (v);
+  return ret;
+}
+
+guint64
+tpaw_account_settings_get_uint64 (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  GVariant *v;
+  guint64 ret = 0;
+
+  v = tpaw_account_settings_dup (settings, param);
+  if (v == NULL)
+    return 0;
+
+  if (g_variant_is_of_type (v, G_VARIANT_TYPE_BYTE))
+    ret = g_variant_get_byte (v);
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT32))
+    ret = MAX (0, g_variant_get_int32 (v));
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT32))
+    ret = g_variant_get_uint32 (v);
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT64))
+    ret = MAX (0, g_variant_get_int64 (v));
+  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT64))
+    ret = g_variant_get_uint64 (v);
+  else
+    {
+      gchar *tmp;
+
+      tmp = g_variant_print (v, TRUE);
+      DEBUG ("Unsupported type for param '%s': %s'", param, tmp);
+      g_free (tmp);
+    }
+
+
+  g_variant_unref (v);
+  return ret;
+}
+
+gboolean
+tpaw_account_settings_get_boolean (TpawAccountSettings *settings,
+    const gchar *param)
+{
+  GVariant *v;
+  gboolean result = FALSE;
+
+  v = tpaw_account_settings_dup (settings, param);
+  if (v == NULL)
+    return result;
+
+  if (g_variant_is_of_type (v, G_VARIANT_TYPE_BOOLEAN))
+    result = g_variant_get_boolean (v);
+
+  return result;
+}
+
+void
+tpaw_account_settings_set (TpawAccountSettings *settings,
+    const gchar *param,
+    GVariant *v)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  g_return_if_fail (param != NULL);
+  g_return_if_fail (v != NULL);
+
+  if (!tp_strdiff (param, "password") && priv->supports_sasl &&
+      g_variant_is_of_type (v, G_VARIANT_TYPE_STRING))
+    {
+      g_free (priv->password);
+      priv->password = g_variant_dup_string (v, NULL);
+    }
+  else
+    {
+      g_hash_table_insert (priv->parameters, g_strdup (param),
+          g_variant_ref_sink (v));
+    }
+
+  account_settings_remove_from_unset (settings, param);
+}
+
+static void
+account_settings_display_name_set_cb (GObject *src,
+    GAsyncResult *res,
+    gpointer user_data)
+{
+  GError *error = NULL;
+  TpAccount *account = TP_ACCOUNT (src);
+  GSimpleAsyncResult *set_result = user_data;
+
+  tp_account_set_display_name_finish (account, res, &error);
+
+  if (error != NULL)
+    {
+      g_simple_async_result_set_from_error (set_result, error);
+      g_error_free (error);
+    }
+
+  g_simple_async_result_complete (set_result);
+  g_object_unref (set_result);
+}
+
+void
+tpaw_account_settings_set_display_name_async (
+  TpawAccountSettings *settings,
+  const gchar *name,
+  GAsyncReadyCallback callback,
+  gpointer user_data)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+  GSimpleAsyncResult *result;
+
+  g_return_if_fail (name != NULL);
+
+  result = g_simple_async_result_new (G_OBJECT (settings),
+      callback, user_data, tpaw_account_settings_set_display_name_finish);
+
+  if (!tp_strdiff (name, priv->display_name))
+    {
+      /* Nothing to do */
+      g_simple_async_result_complete_in_idle (result);
+      return;
+    }
+
+  g_free (priv->display_name);
+  priv->display_name = g_strdup (name);
+
+  if (priv->account == NULL)
+    {
+      g_simple_async_result_complete_in_idle (result);
+      return;
+    }
+
+  tp_account_set_display_name_async (priv->account, name,
+      account_settings_display_name_set_cb, result);
+}
+
+gboolean
+tpaw_account_settings_set_display_name_finish (
+  TpawAccountSettings *settings,
+  GAsyncResult *result,
+  GError **error)
+{
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result),
+      error))
+    return FALSE;
+
+  g_return_val_if_fail (g_simple_async_result_is_valid (result,
+    G_OBJECT (settings), tpaw_account_settings_set_display_name_finish),
+      FALSE);
+
+  return TRUE;
+}
+
+static void
+account_settings_icon_name_set_cb (GObject *src,
+    GAsyncResult *res,
+    gpointer user_data)
+{
+  GError *error = NULL;
+  TpAccount *account = TP_ACCOUNT (src);
+  GSimpleAsyncResult *set_result = user_data;
+
+  tp_account_set_icon_name_finish (account, res, &error);
+
+  if (error != NULL)
+    {
+      g_simple_async_result_set_from_error (set_result, error);
+      g_error_free (error);
+    }
+
+  g_simple_async_result_complete (set_result);
+  g_object_unref (set_result);
+}
+
+void
+tpaw_account_settings_set_icon_name_async (
+  TpawAccountSettings *settings,
+  const gchar *name,
+  GAsyncReadyCallback callback,
+  gpointer user_data)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+  GSimpleAsyncResult *result;
+
+  g_return_if_fail (name != NULL);
+
+  result = g_simple_async_result_new (G_OBJECT (settings),
+      callback, user_data, tpaw_account_settings_set_icon_name_finish);
+
+  if (priv->account == NULL)
+    {
+      if (priv->icon_name != NULL)
+        g_free (priv->icon_name);
+
+      priv->icon_name = g_strdup (name);
+
+      g_simple_async_result_complete_in_idle (result);
+
+      return;
+    }
+
+  tp_account_set_icon_name_async (priv->account, name,
+      account_settings_icon_name_set_cb, result);
+}
+
+gboolean
+tpaw_account_settings_set_icon_name_finish (
+  TpawAccountSettings *settings,
+  GAsyncResult *result,
+  GError **error)
+{
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result),
+      error))
+    return FALSE;
+
+  g_return_val_if_fail (g_simple_async_result_is_valid (result,
+    G_OBJECT (settings), tpaw_account_settings_set_icon_name_finish),
+      FALSE);
+
+  return TRUE;
+}
+
+static void
+tpaw_account_settings_processed_password (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data,
+    gpointer finish_func)
+{
+  TpawAccountSettings *settings = TPAW_ACCOUNT_SETTINGS (user_data);
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+  GSimpleAsyncResult *r;
+  GError *error = NULL;
+  gboolean (*func) (TpAccount *source, GAsyncResult *result, GError **error) =
+    finish_func;
+
+  g_free (priv->password_original);
+  priv->password_original = g_strdup (priv->password);
+
+  if (!func (TP_ACCOUNT (source), result, &error))
+    {
+      g_simple_async_result_set_from_error (priv->apply_result, error);
+      g_error_free (error);
+    }
+
+  tpaw_account_settings_discard_changes (settings);
+
+  r = priv->apply_result;
+  priv->apply_result = NULL;
+
+  g_simple_async_result_complete (r);
+  g_object_unref (r);
+}
+
+static void
+tpaw_account_settings_set_password_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  tpaw_account_settings_processed_password (source, result, user_data,
+      empathy_keyring_set_account_password_finish);
+}
+
+static void
+tpaw_account_settings_delete_password_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  tpaw_account_settings_processed_password (source, result, user_data,
+      empathy_keyring_delete_account_password_finish);
+}
+
+static void
+update_account_uri_schemes (TpawAccountSettings *self)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+
+  if (priv->uri_scheme_tel == empathy_account_has_uri_scheme_tel (
+        priv->account))
+    return;
+
+  tp_account_set_uri_scheme_association_async (priv->account, "tel",
+      priv->uri_scheme_tel, NULL, NULL);
+}
+
+static void
+set_service_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GError *error = NULL;
+
+  if (!tp_account_set_service_finish (TP_ACCOUNT (source), result, &error))
+    {
+      DEBUG ("Failed to set Account.Service: %s", error->message);
+      g_error_free (error);
+    }
+}
+
+static void
+update_account_service (TpawAccountSettings *self)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+
+  if (!priv->update_service)
+    return;
+
+  tp_account_set_service_async (priv->account,
+      priv->service != NULL ? priv->service : "", set_service_cb, self);
+}
+
+static void
+tpaw_account_settings_account_updated (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  TpawAccountSettings *settings = TPAW_ACCOUNT_SETTINGS (user_data);
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+  GSimpleAsyncResult *r;
+  GError *error = NULL;
+  GStrv reconnect_required = NULL;
+
+  if (!tp_account_update_parameters_vardict_finish (TP_ACCOUNT (source),
+          result, &reconnect_required, &error))
+    {
+      g_simple_async_result_set_from_error (priv->apply_result, error);
+      g_error_free (error);
+      goto out;
+    }
+
+  update_account_uri_schemes (settings);
+  update_account_service (settings);
+
+  g_simple_async_result_set_op_res_gboolean (priv->apply_result,
+      g_strv_length (reconnect_required) > 0);
+
+  /* Only set the password in the keyring if the CM supports SASL. */
+  if (priv->supports_sasl)
+    {
+      if (priv->password != NULL)
+        {
+          /* FIXME: we shouldn't save the password if we
+           * can't (MaySaveResponse=False) but we don't have API to check that
+           * at this point (fdo #35382). */
+          empathy_keyring_set_account_password_async (priv->account,
+              priv->password, priv->remember_password,
+              tpaw_account_settings_set_password_cb, settings);
+        }
+      else
+        {
+          empathy_keyring_delete_account_password_async (priv->account,
+              tpaw_account_settings_delete_password_cb, settings);
+        }
+
+      return;
+    }
+
+out:
+  tpaw_account_settings_discard_changes (settings);
+
+  r = priv->apply_result;
+  priv->apply_result = NULL;
+
+  g_simple_async_result_complete (r);
+  g_object_unref (r);
+  g_strfreev (reconnect_required);
+}
+
+static void
+tpaw_account_settings_created_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  TpawAccountSettings *settings = TPAW_ACCOUNT_SETTINGS (user_data);
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+  GError *error = NULL;
+  GSimpleAsyncResult *r;
+
+  priv->account = tp_account_request_create_account_finish (
+      TP_ACCOUNT_REQUEST (source), result, &error);
+
+  if (priv->account == NULL)
+    {
+      g_simple_async_result_set_from_error (priv->apply_result, error);
+    }
+  else
+    {
+      if (priv->supports_sasl && priv->password != NULL)
+        {
+          /* Save the password before connecting */
+          /* FIXME: we shouldn't save the password if we
+           * can't (MaySaveResponse=False) but we don't have API to check that
+           * at this point (fdo #35382). */
+          empathy_keyring_set_account_password_async (priv->account,
+              priv->password, priv->remember_password,
+              tpaw_account_settings_set_password_cb,
+              settings);
+          return;
+        }
+
+      update_account_uri_schemes (settings);
+
+      tpaw_account_settings_discard_changes (settings);
+    }
+
+  r = priv->apply_result;
+  priv->apply_result = NULL;
+
+  g_simple_async_result_complete (r);
+  g_object_unref (r);
+}
+
+static void
+tpaw_account_settings_do_create_account (TpawAccountSettings *self)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+  TpAccountRequest *account_req;
+  TpConnectionPresenceType type;
+  gchar *status;
+  gchar *message;
+  EmpathyPresenceManager *presence_mgr;
+  GHashTableIter iter;
+  gpointer k, v;
+
+  account_req = tp_account_request_new (priv->account_manager, priv->cm_name,
+      priv->protocol, "New Account");
+
+  presence_mgr = empathy_presence_manager_dup_singleton ();
+  type = empathy_presence_manager_get_requested_presence (presence_mgr, &status,
+      &message);
+  g_object_unref (presence_mgr);
+
+  if (type != TP_CONNECTION_PRESENCE_TYPE_UNSET)
+    {
+      tp_account_request_set_requested_presence (account_req, type,
+          status, message);
+    }
+
+  tp_account_request_set_icon_name (account_req, priv->icon_name);
+
+  tp_account_request_set_display_name (account_req, priv->display_name);
+
+  if (priv->service != NULL)
+    tp_account_request_set_service (account_req, priv->service);
+
+  g_hash_table_iter_init (&iter, priv->parameters);
+  while (g_hash_table_iter_next (&iter, &k, &v))
+    {
+      const gchar *key = k;
+      GVariant *value = v;
+
+      tp_account_request_set_parameter (account_req, key, value);
+    }
+
+  if (priv->storage_provider != NULL)
+    {
+      tp_account_request_set_storage_provider (account_req,
+          priv->storage_provider);
+    }
+
+  tp_account_request_create_account_async (account_req,
+      tpaw_account_settings_created_cb, self);
+}
+
+static GVariant *
+build_parameters_variant (TpawAccountSettings *self)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+  GVariantBuilder *builder;
+  GHashTableIter iter;
+  gpointer k, v;
+
+  builder = g_variant_builder_new (G_VARIANT_TYPE_VARDICT);
+
+  g_hash_table_iter_init (&iter, priv->parameters);
+  while (g_hash_table_iter_next (&iter, &k, &v))
+    {
+      const gchar *key = k;
+      GVariant *value = v;
+      GVariant *entry;
+
+      entry = g_variant_new_dict_entry (g_variant_new_string (key),
+          g_variant_new_variant (value));
+
+      g_variant_builder_add_value (builder, entry);
+    }
+
+  return g_variant_builder_end (builder);
+}
+
+void
+tpaw_account_settings_apply_async (TpawAccountSettings *settings,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+
+  if (priv->apply_result != NULL)
+    {
+      g_simple_async_report_error_in_idle (G_OBJECT (settings),
+          callback, user_data,
+          G_IO_ERROR, G_IO_ERROR_PENDING, "Applying already in progress");
+      return;
+    }
+
+  priv->apply_result = g_simple_async_result_new (G_OBJECT (settings),
+      callback, user_data, tpaw_account_settings_apply_finish);
+
+  /* We'll have to reconnect only if we change none DBus_Property on an
+   * existing account. */
+  g_simple_async_result_set_op_res_gboolean (priv->apply_result, FALSE);
+
+  if (priv->account == NULL)
+    {
+      g_assert (priv->apply_result != NULL && priv->account == NULL);
+
+      tpaw_account_settings_do_create_account (settings);
+    }
+  else
+    {
+      tp_account_update_parameters_vardict_async (priv->account,
+          build_parameters_variant (settings),
+          (const gchar **) priv->unset_parameters->data,
+          tpaw_account_settings_account_updated, settings);
+    }
+}
+
+gboolean
+tpaw_account_settings_apply_finish (TpawAccountSettings *settings,
+    GAsyncResult *result,
+    gboolean *reconnect_required,
+    GError **error)
+{
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result),
+      error))
+    return FALSE;
+
+  g_return_val_if_fail (g_simple_async_result_is_valid (result,
+    G_OBJECT (settings), tpaw_account_settings_apply_finish), FALSE);
+
+  if (reconnect_required != NULL)
+    *reconnect_required = g_simple_async_result_get_op_res_gboolean (
+        G_SIMPLE_ASYNC_RESULT (result));
+
+  return TRUE;
+}
+
+gboolean
+tpaw_account_settings_has_account (TpawAccountSettings *settings,
+    TpAccount *account)
+{
+  TpawAccountSettingsPriv *priv;
+  const gchar *account_path;
+  const gchar *priv_account_path;
+
+  g_return_val_if_fail (TPAW_IS_ACCOUNT_SETTINGS (settings), FALSE);
+  g_return_val_if_fail (TP_IS_ACCOUNT (account), FALSE);
+
+  priv = GET_PRIV (settings);
+
+  if (priv->account == NULL)
+    return FALSE;
+
+  account_path = tp_proxy_get_object_path (TP_PROXY (account));
+  priv_account_path = tp_proxy_get_object_path (TP_PROXY (priv->account));
+
+  return (!tp_strdiff (account_path, priv_account_path));
+}
+
+void
+tpaw_account_settings_set_regex (TpawAccountSettings *settings,
+    const gchar *param,
+    const gchar *pattern)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (settings);
+  GRegex *regex;
+  GError *error = NULL;
+
+  regex = g_regex_new (pattern, 0, 0, &error);
+  if (regex == NULL)
+    {
+      g_warning ("Failed to create reg exp: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  g_hash_table_insert (priv->param_regexps, g_strdup (param), regex);
+}
+
+gboolean
+tpaw_account_settings_parameter_is_valid (
+    TpawAccountSettings *settings,
+    const gchar *param)
+{
+  TpawAccountSettingsPriv *priv;
+  const GRegex *regex;
+
+  g_return_val_if_fail (TPAW_IS_ACCOUNT_SETTINGS (settings), FALSE);
+
+  priv = GET_PRIV (settings);
+
+  if (g_list_find_custom (priv->required_params, param, (GCompareFunc) strcmp))
+    {
+      /* first, look if it's set in our own parameters */
+      if (g_hash_table_lookup (priv->parameters, param) != NULL)
+        goto test_regex;
+
+      /* if we did not unset the parameter, look if it's in the account */
+      if (priv->account != NULL &&
+          !tpaw_account_settings_is_unset (settings, param))
+        {
+          const GHashTable *account_params;
+
+          account_params = tp_account_get_parameters (priv->account);
+          if (tp_asv_lookup (account_params, param))
+            goto test_regex;
+        }
+
+      return FALSE;
+    }
+
+test_regex:
+  /* test whether parameter value matches its regex */
+  regex = g_hash_table_lookup (priv->param_regexps, param);
+  if (regex)
+    {
+      gchar *value;
+      gboolean match;
+
+      value = tpaw_account_settings_dup_string (settings, param);
+      if (value == NULL)
+        return FALSE;
+
+      match = g_regex_match (regex, value, 0, NULL);
+
+      g_free (value);
+      return match;
+    }
+
+  return TRUE;
+}
+
+gboolean
+tpaw_account_settings_is_valid (TpawAccountSettings *settings)
+{
+  TpawAccountSettingsPriv *priv;
+  const gchar *param;
+  GHashTableIter iter;
+  GList *l;
+
+  g_return_val_if_fail (TPAW_IS_ACCOUNT_SETTINGS (settings), FALSE);
+
+  priv = GET_PRIV (settings);
+
+  for (l = priv->required_params; l; l = l->next)
+    {
+      if (!tpaw_account_settings_parameter_is_valid (settings, l->data))
+        return FALSE;
+    }
+
+  g_hash_table_iter_init (&iter, priv->param_regexps);
+  while (g_hash_table_iter_next (&iter, (gpointer *) &param, NULL))
+    {
+      if (!tpaw_account_settings_parameter_is_valid (settings, param))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+TpProtocol *
+tpaw_account_settings_get_tp_protocol (TpawAccountSettings *self)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+
+  return priv->protocol_obj;
+}
+
+gboolean
+tpaw_account_settings_supports_sasl (TpawAccountSettings *self)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+
+  return priv->supports_sasl;
+}
+
+gboolean
+tpaw_account_settings_param_is_supported (TpawAccountSettings *self,
+    const gchar *param)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+
+  return tp_protocol_has_param (priv->protocol_obj, param);
+}
+
+void
+tpaw_account_settings_set_uri_scheme_tel (TpawAccountSettings *self,
+    gboolean associate)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+
+  priv->uri_scheme_tel = associate;
+}
+
+gboolean
+tpaw_account_settings_has_uri_scheme_tel (
+    TpawAccountSettings *self)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+
+  return priv->uri_scheme_tel;
+}
+
+void
+tpaw_account_settings_set_storage_provider (TpawAccountSettings *self,
+    const gchar *storage)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+
+  g_free (priv->storage_provider);
+  priv->storage_provider = g_strdup (storage);
+}
+
+void
+tpaw_account_settings_set_remember_password (TpawAccountSettings *self,
+    gboolean remember)
+{
+  TpawAccountSettingsPriv *priv = GET_PRIV (self);
+
+  priv->remember_password = remember;
+}
diff --git a/tp-account-widgets/tpaw-account-settings.h b/tp-account-widgets/tpaw-account-settings.h
new file mode 100644
index 000000000..ad0c70aa5
--- /dev/null
+++ b/tp-account-widgets/tpaw-account-settings.h
@@ -0,0 +1,204 @@
+/*
+ * tpaw-account-settings.h - Header for TpawAccountSettings
+ * Copyright (C) 2009 Collabora Ltd.
+ * @author Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef __TPAW_ACCOUNT_SETTINGS_H__
+#define __TPAW_ACCOUNT_SETTINGS_H__
+
+#include <glib-object.h>
+#include <gio/gio.h>
+#include <telepathy-glib/telepathy-glib.h>
+
+G_BEGIN_DECLS
+
+typedef struct _TpawAccountSettings TpawAccountSettings;
+typedef struct _TpawAccountSettingsClass TpawAccountSettingsClass;
+
+struct _TpawAccountSettingsClass {
+    GObjectClass parent_class;
+};
+
+struct _TpawAccountSettings {
+    GObject parent;
+    gpointer priv;
+};
+
+GType tpaw_account_settings_get_type (void);
+
+/* TYPE MACROS */
+#define TPAW_TYPE_ACCOUNT_SETTINGS \
+  (tpaw_account_settings_get_type ())
+#define TPAW_ACCOUNT_SETTINGS(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
+    TPAW_TYPE_ACCOUNT_SETTINGS, TpawAccountSettings))
+#define TPAW_ACCOUNT_SETTINGS_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), TPAW_TYPE_ACCOUNT_SETTINGS, \
+    TpawAccountSettingsClass))
+#define TPAW_IS_ACCOUNT_SETTINGS(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), TPAW_TYPE_ACCOUNT_SETTINGS))
+#define TPAW_IS_ACCOUNT_SETTINGS_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), TPAW_TYPE_ACCOUNT_SETTINGS))
+#define TPAW_ACCOUNT_SETTINGS_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPAW_TYPE_ACCOUNT_SETTINGS, \
+    TpawAccountSettingsClass))
+
+TpawAccountSettings * tpaw_account_settings_new (
+    const gchar *connection_manager,
+    const gchar *protocol,
+    const gchar *service,
+    const char *display_name);
+
+TpawAccountSettings * tpaw_account_settings_new_for_account (
+    TpAccount *account);
+
+gboolean tpaw_account_settings_is_ready (TpawAccountSettings *settings);
+
+const gchar *tpaw_account_settings_get_cm (TpawAccountSettings *settings);
+const gchar *tpaw_account_settings_get_protocol (
+    TpawAccountSettings *settings);
+
+const gchar *tpaw_account_settings_get_service (
+    TpawAccountSettings *settings);
+
+void tpaw_account_settings_set_service (TpawAccountSettings *settings,
+    const gchar *service);
+
+TpAccount *tpaw_account_settings_get_account (
+    TpawAccountSettings *settings);
+
+gboolean tpaw_account_settings_has_account (
+    TpawAccountSettings *settings, TpAccount *account);
+
+GList * tpaw_account_settings_dup_tp_params (
+    TpawAccountSettings *settings);
+
+gboolean tpaw_account_settings_have_tp_param (
+    TpawAccountSettings *settings,
+    const gchar *param);
+
+void tpaw_account_settings_unset (TpawAccountSettings *settings,
+    const gchar *param);
+
+void tpaw_account_settings_discard_changes (
+    TpawAccountSettings *settings);
+
+const gchar *
+tpaw_account_settings_get_dbus_signature (TpawAccountSettings *setting,
+  const gchar *param);
+
+GVariant *
+tpaw_account_settings_dup_default (TpawAccountSettings *settings,
+  const gchar *param);
+
+gchar * tpaw_account_settings_dup_string (
+    TpawAccountSettings *settings,
+    const gchar *param);
+GStrv tpaw_account_settings_dup_strv (
+    TpawAccountSettings *settings,
+    const gchar *param);
+
+gint32 tpaw_account_settings_get_int32 (TpawAccountSettings *settings,
+    const gchar *param);
+gint64 tpaw_account_settings_get_int64 (TpawAccountSettings *settings,
+    const gchar *param);
+guint32 tpaw_account_settings_get_uint32 (TpawAccountSettings *settings,
+    const gchar *param);
+guint64 tpaw_account_settings_get_uint64 (TpawAccountSettings *settings,
+    const gchar *param);
+gboolean tpaw_account_settings_get_boolean (TpawAccountSettings *settings,
+    const gchar *param);
+
+void tpaw_account_settings_set (TpawAccountSettings *settings,
+    const gchar *param,
+    GVariant *v);
+
+gchar *tpaw_account_settings_get_icon_name (
+  TpawAccountSettings *settings);
+
+void tpaw_account_settings_set_icon_name_async (
+  TpawAccountSettings *settings,
+  const gchar *name,
+  GAsyncReadyCallback callback,
+  gpointer user_data);
+
+gboolean tpaw_account_settings_set_icon_name_finish (
+  TpawAccountSettings *settings,
+  GAsyncResult *result,
+  GError **error);
+
+const gchar *tpaw_account_settings_get_display_name (
+  TpawAccountSettings *settings);
+
+void tpaw_account_settings_set_display_name_async (
+  TpawAccountSettings *settings,
+  const gchar *name,
+  GAsyncReadyCallback callback,
+  gpointer user_data);
+
+gboolean tpaw_account_settings_set_display_name_finish (
+  TpawAccountSettings *settings,
+  GAsyncResult *result,
+  GError **error);
+
+void tpaw_account_settings_apply_async (TpawAccountSettings *settings,
+  GAsyncReadyCallback callback,
+  gpointer user_data);
+
+gboolean tpaw_account_settings_apply_finish (
+  TpawAccountSettings *settings,
+  GAsyncResult *result,
+  gboolean *reconnect_required,
+  GError **error);
+
+void tpaw_account_settings_set_regex (TpawAccountSettings *settings,
+  const gchar *param,
+  const gchar *regex);
+
+gboolean tpaw_account_settings_parameter_is_valid (
+    TpawAccountSettings *settings,
+    const gchar *param);
+
+gboolean tpaw_account_settings_is_valid (TpawAccountSettings *settings);
+
+TpProtocol * tpaw_account_settings_get_tp_protocol (
+    TpawAccountSettings *settings);
+
+gboolean tpaw_account_settings_supports_sasl (TpawAccountSettings *self);
+
+gboolean tpaw_account_settings_param_is_supported (
+    TpawAccountSettings *self,
+    const gchar *param);
+
+void tpaw_account_settings_set_uri_scheme_tel (TpawAccountSettings *self,
+    gboolean associate);
+
+gboolean tpaw_account_settings_has_uri_scheme_tel (
+    TpawAccountSettings *self);
+
+void tpaw_account_settings_set_storage_provider (
+    TpawAccountSettings *self,
+    const gchar *storage);
+
+void tpaw_account_settings_set_remember_password (
+    TpawAccountSettings *self,
+    gboolean remember);
+
+G_END_DECLS
+
+#endif /* #ifndef __TPAW_ACCOUNT_SETTINGS_H__*/
diff --git a/tp-account-widgets/tpaw-account-widget-irc.c b/tp-account-widgets/tpaw-account-widget-irc.c
index f98394bf9..a547a2309 100644
--- a/tp-account-widgets/tpaw-account-widget-irc.c
+++ b/tp-account-widgets/tpaw-account-widget-irc.c
@@ -47,19 +47,19 @@ account_widget_irc_setup (TpawAccountWidgetIrc *settings)
 {
   gchar *nick = NULL;
   gchar *fullname = NULL;
-  EmpathyAccountSettings *ac_settings;
+  TpawAccountSettings *ac_settings;
 
   g_object_get (settings->self, "settings", &ac_settings, NULL);
 
-  nick = empathy_account_settings_dup_string (ac_settings, "account");
-  fullname = empathy_account_settings_dup_string (ac_settings,
+  nick = tpaw_account_settings_dup_string (ac_settings, "account");
+  fullname = tpaw_account_settings_dup_string (ac_settings,
       "fullname");
 
   if (nick == NULL)
     {
       nick = g_strdup (g_get_user_name ());
 
-      empathy_account_settings_set (ac_settings,
+      tpaw_account_settings_set (ac_settings,
         "account", g_variant_new_string (nick));
     }
 
@@ -70,7 +70,7 @@ account_widget_irc_setup (TpawAccountWidgetIrc *settings)
       if (fullname == NULL)
           fullname = g_strdup (nick);
 
-      empathy_account_settings_set (ac_settings,
+      tpaw_account_settings_set (ac_settings,
           "fullname", g_variant_new_string (fullname));
     }
 
@@ -95,18 +95,18 @@ network_changed_cb (TpawIrcNetworkChooser *chooser,
  * Return: %TRUE if the password-prompt param has been changed
  */
 static gboolean
-set_password_prompt_if_needed (EmpathyAccountSettings *ac_settings,
+set_password_prompt_if_needed (TpawAccountSettings *ac_settings,
     const gchar *password)
 {
   gboolean prompt;
 
   prompt = !tp_str_empty (password);
 
-  if (prompt == empathy_account_settings_get_boolean (ac_settings,
+  if (prompt == tpaw_account_settings_get_boolean (ac_settings,
         "password-prompt"))
     return FALSE;
 
-  empathy_account_settings_set (ac_settings, "password-prompt",
+  tpaw_account_settings_set (ac_settings, "password-prompt",
       g_variant_new_boolean (prompt));
 
   return TRUE;
@@ -117,7 +117,7 @@ entry_password_changed_cb (GtkEntry *entry,
     TpawAccountWidgetIrc *settings)
 {
   const gchar *password;
-  EmpathyAccountSettings *ac_settings;
+  TpawAccountSettings *ac_settings;
 
   g_object_get (settings->self, "settings", &ac_settings, NULL);
 
@@ -135,7 +135,7 @@ tpaw_account_widget_irc_build (TpawAccountWidget *self,
     GtkWidget **box)
 {
   TpawAccountWidgetIrc *settings;
-  EmpathyAccountSettings *ac_settings;
+  TpawAccountSettings *ac_settings;
   GtkWidget *entry_password;
   gchar *password;
 
@@ -181,12 +181,12 @@ tpaw_account_widget_irc_build (TpawAccountWidget *self,
   g_object_unref (ac_settings);
 
   /* Automatically set password-prompt when needed */
-  password = empathy_account_settings_dup_string (ac_settings, "password");
+  password = tpaw_account_settings_dup_string (ac_settings, "password");
 
   if (set_password_prompt_if_needed (ac_settings, password))
     {
       /* Apply right now to save password-prompt */
-      empathy_account_settings_apply_async (ac_settings, NULL, NULL);
+      tpaw_account_settings_apply_async (ac_settings, NULL, NULL);
     }
 
   g_free (password);
@@ -203,7 +203,7 @@ tpaw_account_widget_irc_build_simple (TpawAccountWidget *self,
     GtkWidget **box)
 {
   TpawAccountWidgetIrc *settings;
-  EmpathyAccountSettings *ac_settings;
+  TpawAccountSettings *ac_settings;
   GtkAlignment *alignment;
 
   settings = g_slice_new0 (TpawAccountWidgetIrc);
diff --git a/tp-account-widgets/tpaw-account-widget-sip.c b/tp-account-widgets/tpaw-account-widget-sip.c
index b28b0897d..44d5aecf3 100644
--- a/tp-account-widgets/tpaw-account-widget-sip.c
+++ b/tp-account-widgets/tpaw-account-widget-sip.c
@@ -89,11 +89,11 @@ checkbutton_tel_toggled (
     GtkWidget *checkbox,
     TpawAccountWidgetSip *sip_settings)
 {
-  EmpathyAccountSettings *settings;
+  TpawAccountSettings *settings;
 
   settings = tpaw_account_widget_get_settings (sip_settings->self);
 
-  empathy_account_settings_set_uri_scheme_tel (settings,
+  tpaw_account_settings_set_uri_scheme_tel (settings,
       gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)));
 
   tpaw_account_widget_changed (sip_settings->self);
@@ -149,7 +149,7 @@ tpaw_account_widget_sip_build (TpawAccountWidget *self,
       settings->vbox_settings = vbox_settings;
 
       gtk_toggle_button_set_active (checkbutton_tel,
-          empathy_account_settings_has_uri_scheme_tel (
+          tpaw_account_settings_has_uri_scheme_tel (
             tpaw_account_widget_get_settings (self)));
 
       tpaw_account_widget_handle_params (self,
diff --git a/tp-account-widgets/tpaw-account-widget.c b/tp-account-widgets/tpaw-account-widget.c
index 8bc3a91d7..fcde66f36 100644
--- a/tp-account-widgets/tpaw-account-widget.c
+++ b/tp-account-widgets/tpaw-account-widget.c
@@ -62,7 +62,7 @@ static ServiceInfo services_infos[N_SERVICES] = {
 };
 
 struct _TpawAccountWidgetPriv {
-  EmpathyAccountSettings *settings;
+  TpawAccountSettings *settings;
 
   GtkWidget *grid_common_settings;
   GtkWidget *apply_button;
@@ -243,7 +243,7 @@ account_widget_handle_control_buttons_sensitivity (TpawAccountWidget *self)
 {
   gboolean is_valid;
 
-  is_valid = empathy_account_settings_is_valid (self->priv->settings);
+  is_valid = tpaw_account_settings_is_valid (self->priv->settings);
 
   account_widget_set_control_buttons_sensitivity (self, is_valid);
 
@@ -261,18 +261,18 @@ account_widget_entry_changed_common (TpawAccountWidget *self,
 
   str = gtk_entry_get_text (entry);
   param_name = g_object_get_data (G_OBJECT (entry), "param_name");
-  prev_status = empathy_account_settings_parameter_is_valid (
+  prev_status = tpaw_account_settings_parameter_is_valid (
       self->priv->settings, param_name);
 
   if (EMP_STR_EMPTY (str))
     {
-      empathy_account_settings_unset (self->priv->settings, param_name);
+      tpaw_account_settings_unset (self->priv->settings, param_name);
 
       if (focus)
         {
           gchar *value;
 
-          value = empathy_account_settings_dup_string (self->priv->settings,
+          value = tpaw_account_settings_dup_string (self->priv->settings,
               param_name);
 
           DEBUG ("Unset %s and restore to %s", param_name, value);
@@ -284,11 +284,11 @@ account_widget_entry_changed_common (TpawAccountWidget *self,
     {
       DEBUG ("Setting %s to %s", param_name,
           tp_strdiff (param_name, "password") ? str : "***");
-      empathy_account_settings_set (self->priv->settings, param_name,
+      tpaw_account_settings_set (self->priv->settings, param_name,
           g_variant_new_string (str));
     }
 
-  curr_status = empathy_account_settings_parameter_is_valid (
+  curr_status = tpaw_account_settings_parameter_is_valid (
       self->priv->settings, param_name);
 
   if (curr_status != prev_status)
@@ -315,7 +315,7 @@ account_widget_entry_map_cb (GtkEntry *entry,
 
   /* need to initialize input highlighting */
   param_name = g_object_get_data (G_OBJECT (entry), "param_name");
-  is_valid = empathy_account_settings_parameter_is_valid (self->priv->settings,
+  is_valid = tpaw_account_settings_parameter_is_valid (self->priv->settings,
       param_name);
   account_widget_set_entry_highlighting (entry, !is_valid);
 }
@@ -331,7 +331,7 @@ account_widget_int_changed_cb (GtkWidget *widget,
   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 (self->priv->settings,
+  signature = tpaw_account_settings_get_dbus_signature (self->priv->settings,
     param_name);
   g_return_if_fail (signature != NULL);
 
@@ -341,20 +341,20 @@ account_widget_int_changed_cb (GtkWidget *widget,
     {
     case DBUS_TYPE_INT16:
     case DBUS_TYPE_INT32:
-      empathy_account_settings_set (self->priv->settings, param_name,
+      tpaw_account_settings_set (self->priv->settings, param_name,
           g_variant_new_int32 (value));
       break;
     case DBUS_TYPE_INT64:
-      empathy_account_settings_set (self->priv->settings, param_name,
+      tpaw_account_settings_set (self->priv->settings, param_name,
           g_variant_new_int64 (value));
       break;
     case DBUS_TYPE_UINT16:
     case DBUS_TYPE_UINT32:
-      empathy_account_settings_set (self->priv->settings, param_name,
+      tpaw_account_settings_set (self->priv->settings, param_name,
           g_variant_new_uint32 (value));
       break;
     case DBUS_TYPE_UINT64:
-      empathy_account_settings_set (self->priv->settings, param_name,
+      tpaw_account_settings_set (self->priv->settings, param_name,
           g_variant_new_uint64 (value));
       break;
     default:
@@ -378,8 +378,8 @@ account_widget_checkbutton_toggled_cb (GtkWidget *widget,
   /* 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 (self->priv->settings, param_name);
-  default_value = empathy_account_settings_get_boolean (self->priv->settings,
+  tpaw_account_settings_unset (self->priv->settings, param_name);
+  default_value = tpaw_account_settings_get_boolean (self->priv->settings,
       param_name);
 
   if (default_value == value)
@@ -389,7 +389,7 @@ account_widget_checkbutton_toggled_cb (GtkWidget *widget,
   else
     {
       DEBUG ("Setting %s to %d", param_name, value);
-      empathy_account_settings_set (self->priv->settings, param_name,
+      tpaw_account_settings_set (self->priv->settings, param_name,
           g_variant_new_boolean (value));
     }
 
@@ -404,7 +404,7 @@ account_widget_jabber_ssl_toggled_cb (GtkWidget *checkbutton_ssl,
   gint32       port = 0;
 
   value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton_ssl));
-  port = empathy_account_settings_get_uint32 (self->priv->settings, "port");
+  port = tpaw_account_settings_get_uint32 (self->priv->settings, "port");
 
   if (value)
     {
@@ -443,19 +443,19 @@ account_widget_combobox_changed_cb (GtkWidget *widget,
 
   param_name = g_object_get_data (G_OBJECT (widget), "param_name");
 
-  v = empathy_account_settings_dup_default (self->priv->settings, param_name);
+  v = tpaw_account_settings_dup_default (self->priv->settings, param_name);
   if (v != NULL && g_variant_is_of_type (v, G_VARIANT_TYPE_STRING))
     default_value = g_variant_get_string (v, NULL);
 
   if (!tp_strdiff (value, default_value))
     {
       DEBUG ("Unset %s and restore to %s", param_name, default_value);
-      empathy_account_settings_unset (self->priv->settings, param_name);
+      tpaw_account_settings_unset (self->priv->settings, param_name);
     }
   else
     {
       DEBUG ("Setting %s to %s", param_name, value);
-      empathy_account_settings_set (self->priv->settings, param_name,
+      tpaw_account_settings_set (self->priv->settings, param_name,
           g_variant_new_string (value));
     }
 
@@ -475,7 +475,7 @@ clear_icon_released_cb (GtkEntry *entry,
   param_name = g_object_get_data (G_OBJECT (entry), "param_name");
 
   DEBUG ("Unset %s", param_name);
-  empathy_account_settings_unset (self->priv->settings, param_name);
+  tpaw_account_settings_unset (self->priv->settings, param_name);
   gtk_entry_set_text (entry, "");
 
   tpaw_account_widget_changed (self);
@@ -522,7 +522,7 @@ tpaw_account_widget_setup_widget (TpawAccountWidget *self,
       gint value = 0;
       const gchar *signature;
 
-      signature = empathy_account_settings_get_dbus_signature (
+      signature = tpaw_account_settings_get_dbus_signature (
           self->priv->settings, param_name);
       g_return_if_fail (signature != NULL);
 
@@ -530,20 +530,20 @@ tpaw_account_widget_setup_widget (TpawAccountWidget *self,
         {
           case DBUS_TYPE_INT16:
           case DBUS_TYPE_INT32:
-            value = empathy_account_settings_get_int32 (self->priv->settings,
+            value = tpaw_account_settings_get_int32 (self->priv->settings,
               param_name);
             break;
           case DBUS_TYPE_INT64:
-            value = empathy_account_settings_get_int64 (self->priv->settings,
+            value = tpaw_account_settings_get_int64 (self->priv->settings,
               param_name);
             break;
           case DBUS_TYPE_UINT16:
           case DBUS_TYPE_UINT32:
-            value = empathy_account_settings_get_uint32 (self->priv->settings,
+            value = tpaw_account_settings_get_uint32 (self->priv->settings,
               param_name);
             break;
           case DBUS_TYPE_UINT64:
-            value = empathy_account_settings_get_uint64 (self->priv->settings,
+            value = tpaw_account_settings_get_uint64 (self->priv->settings,
                 param_name);
             break;
           default:
@@ -560,7 +560,7 @@ tpaw_account_widget_setup_widget (TpawAccountWidget *self,
     {
       gchar *str;
 
-      str = empathy_account_settings_dup_string (self->priv->settings,
+      str = tpaw_account_settings_dup_string (self->priv->settings,
           param_name);
       gtk_entry_set_text (GTK_ENTRY (widget), str ? str : "");
 
@@ -602,7 +602,7 @@ tpaw_account_widget_setup_widget (TpawAccountWidget *self,
     {
       gboolean value = FALSE;
 
-      value = empathy_account_settings_get_boolean (self->priv->settings,
+      value = tpaw_account_settings_get_boolean (self->priv->settings,
           param_name);
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);
 
@@ -619,7 +619,7 @@ tpaw_account_widget_setup_widget (TpawAccountWidget *self,
       GtkTreeIter iter;
       gboolean valid;
 
-      str = empathy_account_settings_dup_string (self->priv->settings,
+      str = tpaw_account_settings_dup_string (self->priv->settings,
           param_name);
       model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
 
@@ -654,7 +654,7 @@ tpaw_account_widget_setup_widget (TpawAccountWidget *self,
     }
 
   gtk_widget_set_sensitive (widget,
-      empathy_account_settings_param_is_supported (self->priv->settings,
+      tpaw_account_settings_param_is_supported (self->priv->settings,
         param_name));
 }
 
@@ -716,7 +716,7 @@ accounts_widget_generic_setup (TpawAccountWidget *self,
   GList *params, *l;
   guint row_common = 0, row_advanced = 0;
 
-  params = empathy_account_settings_dup_tp_params (self->priv->settings);
+  params = tpaw_account_settings_dup_tp_params (self->priv->settings);
 
   for (l = params; l != NULL; l = g_list_next (l))
     {
@@ -911,12 +911,12 @@ account_widget_applied_cb (GObject *source_object,
 {
   GError *error = NULL;
   TpAccount *account;
-  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source_object);
+  TpawAccountSettings *settings = TPAW_ACCOUNT_SETTINGS (source_object);
   TpawAccountWidget *self = TPAW_ACCOUNT_WIDGET (user_data);
   gboolean reconnect_required;
   gboolean fire_close = TRUE;
 
-  empathy_account_settings_apply_finish (settings, res, &reconnect_required,
+  tpaw_account_settings_apply_finish (settings, res, &reconnect_required,
       &error);
 
   if (error != NULL)
@@ -926,7 +926,7 @@ account_widget_applied_cb (GObject *source_object,
       return;
     }
 
-  account = empathy_account_settings_get_account (self->priv->settings);
+  account = tpaw_account_settings_get_account (self->priv->settings);
 
   if (account != NULL)
     {
@@ -991,7 +991,7 @@ tpaw_account_widget_apply_and_log_in (TpawAccountWidget *self)
             self->priv->radiobutton_reuse));
 
       DEBUG ("Set register param: %d", !reuse);
-      empathy_account_settings_set (self->priv->settings, "register",
+      tpaw_account_settings_set (self->priv->settings, "register",
           g_variant_new_boolean (!reuse));
     }
 
@@ -1006,7 +1006,7 @@ tpaw_account_widget_apply_and_log_in (TpawAccountWidget *self)
        * manually override it. */
       display_name = tpaw_account_widget_get_default_display_name (self);
 
-      empathy_account_settings_set_display_name_async (self->priv->settings,
+      tpaw_account_settings_set_display_name_async (self->priv->settings,
           display_name, NULL, NULL);
 
       g_free (display_name);
@@ -1014,7 +1014,7 @@ tpaw_account_widget_apply_and_log_in (TpawAccountWidget *self)
 
   /* workaround to keep widget alive during async call */
   g_object_ref (self);
-  empathy_account_settings_apply_async (self->priv->settings,
+  tpaw_account_settings_apply_async (self->priv->settings,
       account_widget_applied_cb, self);
 }
 
@@ -1043,13 +1043,13 @@ account_widget_setup_generic (TpawAccountWidget *self)
 }
 
 static void
-account_widget_settings_ready_cb (EmpathyAccountSettings *settings,
+account_widget_settings_ready_cb (TpawAccountSettings *settings,
     GParamSpec *pspec,
     gpointer user_data)
 {
   TpawAccountWidget *self = user_data;
 
-  if (empathy_account_settings_is_ready (self->priv->settings))
+  if (tpaw_account_settings_is_ready (self->priv->settings))
     account_widget_setup_generic (self);
 }
 
@@ -1070,7 +1070,7 @@ account_widget_build_generic (TpawAccountWidget *self,
 
   g_object_ref (self->ui_details->gui);
 
-  if (empathy_account_settings_is_ready (self->priv->settings))
+  if (tpaw_account_settings_is_ready (self->priv->settings))
     account_widget_setup_generic (self);
   else
     g_signal_connect (self->priv->settings, "notify::ready",
@@ -1114,7 +1114,7 @@ account_widget_build_irc (TpawAccountWidget *self,
 {
   GtkWidget *box;
 
-  empathy_account_settings_set_regex (self->priv->settings, "account",
+  tpaw_account_settings_set_regex (self->priv->settings, "account",
       ACCOUNT_REGEX_IRC);
 
   if (self->priv->simple)
@@ -1161,7 +1161,7 @@ account_widget_build_msn (TpawAccountWidget *self,
 {
   GtkWidget *box;
 
-  empathy_account_settings_set_regex (self->priv->settings, "account",
+  tpaw_account_settings_set_regex (self->priv->settings, "account",
       ACCOUNT_REGEX_MSN);
 
   if (self->priv->simple)
@@ -1214,7 +1214,7 @@ suffix_id_widget_changed_cb (GtkWidget *entry,
 
   account_widget_entry_changed_common (self, GTK_ENTRY (entry), FALSE);
 
-  account = empathy_account_settings_dup_string (self->priv->settings,
+  account = tpaw_account_settings_dup_string (self->priv->settings,
       "account");
 
   if (!EMP_STR_EMPTY (account) &&
@@ -1226,7 +1226,7 @@ suffix_id_widget_changed_cb (GtkWidget *entry,
 
       DEBUG ("Change account from '%s' to '%s'", account, tmp);
 
-      empathy_account_settings_set (self->priv->settings, "account",
+      tpaw_account_settings_set (self->priv->settings, "account",
           g_variant_new_string (tmp));
       g_free (tmp);
     }
@@ -1261,7 +1261,7 @@ setup_id_widget_with_suffix (TpawAccountWidget *self,
   g_assert (self->priv->jid_suffix == NULL);
   self->priv->jid_suffix = g_strdup (suffix);
 
-  str = empathy_account_settings_dup_string (self->priv->settings, "account");
+  str = tpaw_account_settings_dup_string (self->priv->settings, "account");
   if (str != NULL)
     {
       gchar *tmp;
@@ -1283,8 +1283,8 @@ account_widget_get_service (TpawAccountWidget *self)
 {
   const gchar *icon_name, *service;
 
-  icon_name = empathy_account_settings_get_icon_name (self->priv->settings);
-  service = empathy_account_settings_get_service (self->priv->settings);
+  icon_name = tpaw_account_settings_get_icon_name (self->priv->settings);
+  service = tpaw_account_settings_get_service (self->priv->settings);
 
   /* Previous versions of Tpaw didn't set the Service property on Facebook
    * and gtalk accounts, so we check using the icon name as well. */
@@ -1316,7 +1316,7 @@ account_widget_build_jabber (TpawAccountWidget *self,
 
   service = account_widget_get_service (self);
 
-  empathy_account_settings_set_regex (self->priv->settings, "account",
+  tpaw_account_settings_set_regex (self->priv->settings, "account",
       ACCOUNT_REGEX_JABBER);
 
   if (self->priv->simple && service == NO_SERVICE)
@@ -1330,7 +1330,7 @@ account_widget_build_jabber (TpawAccountWidget *self,
           "label_password_create", &label_password_create,
           NULL);
 
-      if (empathy_account_settings_get_boolean (self->priv->settings,
+      if (tpaw_account_settings_get_boolean (self->priv->settings,
             "register"))
         {
           gtk_widget_hide (label_id);
@@ -1468,7 +1468,7 @@ account_widget_build_icq (TpawAccountWidget *self,
   GtkWidget *spinbutton_port;
   GtkWidget *box;
 
-  empathy_account_settings_set_regex (self->priv->settings, "account",
+  tpaw_account_settings_set_regex (self->priv->settings, "account",
       ACCOUNT_REGEX_ICQ);
 
   if (self->priv->simple)
@@ -1566,7 +1566,7 @@ account_widget_build_yahoo (TpawAccountWidget *self,
 {
   GtkWidget *box;
 
-  empathy_account_settings_set_regex (self->priv->settings, "account",
+  tpaw_account_settings_set_regex (self->priv->settings, "account",
       ACCOUNT_REGEX_YAHOO);
 
   if (self->priv->simple)
@@ -1707,7 +1707,7 @@ do_get_property (GObject *object,
     {
     case PROP_PROTOCOL:
       g_value_set_string (value,
-        empathy_account_settings_get_protocol (self->priv->settings));
+        tpaw_account_settings_get_protocol (self->priv->settings));
       break;
     case PROP_SETTINGS:
       g_value_set_object (value, self->priv->settings);
@@ -1820,7 +1820,7 @@ add_register_buttons (TpawAccountWidget *self,
   if (!self->priv->creating_account)
     return;
 
-  protocol = empathy_account_settings_get_tp_protocol (self->priv->settings);
+  protocol = tpaw_account_settings_get_tp_protocol (self->priv->settings);
   if (protocol == NULL)
     return;
 
@@ -1853,7 +1853,7 @@ static void
 remember_password_toggled_cb (GtkToggleButton *button,
     TpawAccountWidget *self)
 {
-  empathy_account_settings_set_remember_password (self->priv->settings,
+  tpaw_account_settings_set_remember_password (self->priv->settings,
       gtk_toggle_button_get_active (button));
 
   if (!self->priv->automatic_change)
@@ -1867,7 +1867,7 @@ account_settings_password_retrieved_cb (GObject *object,
   TpawAccountWidget *self = user_data;
   gchar *password;
 
-  password = empathy_account_settings_dup_string (
+  password = tpaw_account_settings_dup_string (
       self->priv->settings, "password");
 
   /* We have to do this so that when we call gtk_entry_set_text,
@@ -1917,10 +1917,10 @@ do_constructed (GObject *obj)
   const gchar *protocol, *cm_name;
   GtkWidget *box;
 
-  account = empathy_account_settings_get_account (self->priv->settings);
+  account = tpaw_account_settings_get_account (self->priv->settings);
 
-  cm_name = empathy_account_settings_get_cm (self->priv->settings);
-  protocol = empathy_account_settings_get_protocol (self->priv->settings);
+  cm_name = tpaw_account_settings_get_cm (self->priv->settings);
+  protocol = tpaw_account_settings_get_protocol (self->priv->settings);
 
   for (i = 0 ; i < G_N_ELEMENTS (widgets); i++)
     {
@@ -1955,7 +1955,7 @@ do_constructed (GObject *obj)
   /* remember password */
   if (self->priv->param_password_widget != NULL
       && self->priv->remember_password_widget != NULL
-      && empathy_account_settings_supports_sasl (self->priv->settings))
+      && tpaw_account_settings_supports_sasl (self->priv->settings))
     {
       if (self->priv->simple)
         {
@@ -1966,7 +1966,7 @@ do_constructed (GObject *obj)
         {
           gchar *password;
 
-          password = empathy_account_settings_dup_string (self->priv->settings,
+          password = tpaw_account_settings_dup_string (self->priv->settings,
               "password");
 
           /* FIXME: we should enable this checkbox only if the password is
@@ -1995,10 +1995,10 @@ do_constructed (GObject *obj)
       self->priv->automatic_change = FALSE;
     }
   else if (self->priv->remember_password_widget != NULL
-      && !empathy_account_settings_supports_sasl (self->priv->settings))
+      && !tpaw_account_settings_supports_sasl (self->priv->settings))
     {
       gtk_widget_set_visible (self->priv->remember_password_widget, FALSE);
-      empathy_account_settings_set_remember_password (self->priv->settings,
+      tpaw_account_settings_set_remember_password (self->priv->settings,
           TRUE);
     }
 
@@ -2054,7 +2054,7 @@ do_constructed (GObject *obj)
 
   g_clear_object (&self->ui_details->gui);
 
-  display_name = empathy_account_settings_get_display_name (
+  display_name = tpaw_account_settings_get_display_name (
       self->priv->settings);
   default_display_name = tpaw_account_widget_get_default_display_name (self);
 
@@ -2114,7 +2114,7 @@ tpaw_account_widget_class_init (TpawAccountWidgetClass *klass)
 
   param_spec = g_param_spec_object ("settings",
       "settings", "The settings of the account",
-      EMPATHY_TYPE_ACCOUNT_SETTINGS,
+      TPAW_TYPE_ACCOUNT_SETTINGS,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
   g_object_class_install_property (oclass, PROP_SETTINGS, param_spec);
 
@@ -2185,7 +2185,7 @@ tpaw_account_widget_init (TpawAccountWidget *self)
 void
 tpaw_account_widget_discard_pending_changes (TpawAccountWidget *self)
 {
-  empathy_account_settings_discard_changes (self->priv->settings);
+  tpaw_account_settings_discard_changes (self->priv->settings);
   self->priv->contains_pending_changes = FALSE;
 }
 
@@ -2208,17 +2208,17 @@ tpaw_account_widget_handle_params (TpawAccountWidget *self,
 }
 
 TpawAccountWidget *
-tpaw_account_widget_new_for_protocol (EmpathyAccountSettings *settings,
+tpaw_account_widget_new_for_protocol (TpawAccountSettings *settings,
     gboolean simple)
 {
-  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_SETTINGS (settings), NULL);
+  g_return_val_if_fail (TPAW_IS_ACCOUNT_SETTINGS (settings), NULL);
 
   return g_object_new (TPAW_TYPE_ACCOUNT_WIDGET,
         "orientation", GTK_ORIENTATION_VERTICAL,
         "settings", settings,
         "simple", simple,
         "creating-account",
-          empathy_account_settings_get_account (settings) == NULL,
+          tpaw_account_settings_get_account (settings) == NULL,
         NULL);
 }
 
@@ -2230,9 +2230,9 @@ tpaw_account_widget_get_default_display_name (TpawAccountWidget *self)
   gchar *default_display_name;
   Service service;
 
-  login_id = empathy_account_settings_dup_string (self->priv->settings,
+  login_id = tpaw_account_settings_dup_string (self->priv->settings,
       "account");
-  protocol = empathy_account_settings_get_protocol (self->priv->settings);
+  protocol = tpaw_account_settings_get_protocol (self->priv->settings);
   service = account_widget_get_service (self);
 
   if (login_id != NULL)
@@ -2317,7 +2317,7 @@ tpaw_account_widget_set_password_param (TpawAccountWidget *self,
   gtk_entry_set_text (GTK_ENTRY (self->priv->param_password_widget), account);
 }
 
-EmpathyAccountSettings *
+TpawAccountSettings *
 tpaw_account_widget_get_settings (TpawAccountWidget *self)
 {
   return self->priv->settings;
diff --git a/tp-account-widgets/tpaw-account-widget.h b/tp-account-widgets/tpaw-account-widget.h
index 8ca1000ca..7e2c627ed 100644
--- a/tp-account-widgets/tpaw-account-widget.h
+++ b/tp-account-widgets/tpaw-account-widget.h
@@ -25,7 +25,7 @@
 
 #include <gtk/gtk.h>
 
-#include "empathy-account-settings.h"
+#include "tpaw-account-settings.h"
 
 G_BEGIN_DECLS
 
@@ -59,7 +59,7 @@ typedef struct {
 GType tpaw_account_widget_get_type (void);
 
 TpawAccountWidget * tpaw_account_widget_new_for_protocol (
-    EmpathyAccountSettings *settings,
+    TpawAccountSettings *settings,
     gboolean simple);
 
 gboolean tpaw_account_widget_contains_pending_changes
@@ -86,7 +86,7 @@ void tpaw_account_widget_apply_and_log_in (TpawAccountWidget *self);
 /* protected methods */
 void tpaw_account_widget_changed (TpawAccountWidget *widget);
 
-EmpathyAccountSettings * tpaw_account_widget_get_settings (
+TpawAccountSettings * tpaw_account_widget_get_settings (
     TpawAccountWidget *self);
 
 G_END_DECLS
diff --git a/tp-account-widgets/tpaw-irc-network-chooser-dialog.c b/tp-account-widgets/tpaw-irc-network-chooser-dialog.c
index 2d50b8a00..c7995a56f 100644
--- a/tp-account-widgets/tpaw-irc-network-chooser-dialog.c
+++ b/tp-account-widgets/tpaw-irc-network-chooser-dialog.c
@@ -46,7 +46,7 @@ enum {
 };
 
 typedef struct {
-    EmpathyAccountSettings *settings;
+    TpawAccountSettings *settings;
     TpawIrcNetwork *network;
 
     TpawIrcNetworkManager *network_manager;
@@ -682,8 +682,8 @@ tpaw_irc_network_chooser_dialog_class_init (TpawIrcNetworkChooserDialogClass *kl
   g_object_class_install_property (object_class, PROP_SETTINGS,
     g_param_spec_object ("settings",
       "Settings",
-      "The EmpathyAccountSettings to show and edit",
-      EMPATHY_TYPE_ACCOUNT_SETTINGS,
+      "The TpawAccountSettings to show and edit",
+      TPAW_TYPE_ACCOUNT_SETTINGS,
       G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
   g_object_class_install_property (object_class, PROP_NETWORK,
@@ -710,7 +710,7 @@ tpaw_irc_network_chooser_dialog_init (TpawIrcNetworkChooserDialog *self)
 }
 
 GtkWidget *
-tpaw_irc_network_chooser_dialog_new (EmpathyAccountSettings *settings,
+tpaw_irc_network_chooser_dialog_new (TpawAccountSettings *settings,
     TpawIrcNetwork *network,
     GtkWindow *parent)
 {
diff --git a/tp-account-widgets/tpaw-irc-network-chooser-dialog.h b/tp-account-widgets/tpaw-irc-network-chooser-dialog.h
index e20802901..6549b7063 100644
--- a/tp-account-widgets/tpaw-irc-network-chooser-dialog.h
+++ b/tp-account-widgets/tpaw-irc-network-chooser-dialog.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "empathy-account-settings.h"
+#include "tpaw-account-settings.h"
 #include "tpaw-irc-network.h"
 
 G_BEGIN_DECLS
@@ -56,7 +56,7 @@ typedef struct {
 GType tpaw_irc_network_chooser_dialog_get_type (void) G_GNUC_CONST;
 
 GtkWidget * tpaw_irc_network_chooser_dialog_new (
-    EmpathyAccountSettings *settings,
+    TpawAccountSettings *settings,
     TpawIrcNetwork *network,
     GtkWindow *parent);
 
diff --git a/tp-account-widgets/tpaw-irc-network-chooser.c b/tp-account-widgets/tpaw-irc-network-chooser.c
index 9d0ac0133..7a01a56f0 100644
--- a/tp-account-widgets/tpaw-irc-network-chooser.c
+++ b/tp-account-widgets/tpaw-irc-network-chooser.c
@@ -48,7 +48,7 @@ enum {
 static guint signals[LAST_SIGNAL] = { 0 };
 
 typedef struct {
-    EmpathyAccountSettings *settings;
+    TpawAccountSettings *settings;
 
     TpawIrcNetworkManager *network_manager;
     GtkWidget *dialog;
@@ -103,9 +103,9 @@ unset_server_params (TpawIrcNetworkChooser *self)
   TpawIrcNetworkChooserPriv *priv = GET_PRIV (self);
 
   DEBUG ("Unset server, port and use-ssl");
-  empathy_account_settings_unset (priv->settings, "server");
-  empathy_account_settings_unset (priv->settings, "port");
-  empathy_account_settings_unset (priv->settings, "use-ssl");
+  tpaw_account_settings_unset (priv->settings, "server");
+  tpaw_account_settings_unset (priv->settings, "port");
+  tpaw_account_settings_unset (priv->settings, "use-ssl");
 }
 
 static gchar *
@@ -153,7 +153,7 @@ update_server_params (TpawIrcNetworkChooser *self)
 
   charset = tpaw_irc_network_get_charset (priv->network);
   DEBUG ("Setting charset to %s", charset);
-  empathy_account_settings_set (priv->settings, "charset",
+  tpaw_account_settings_set (priv->settings, "charset",
       g_variant_new_string (charset));
 
   servers = tpaw_irc_network_get_servers (priv->network);
@@ -173,19 +173,19 @@ update_server_params (TpawIrcNetworkChooser *self)
           NULL);
 
       DEBUG ("Setting server to %s", address);
-      empathy_account_settings_set (priv->settings, "server",
+      tpaw_account_settings_set (priv->settings, "server",
           g_variant_new_string (address));
       DEBUG ("Setting port to %u", port);
-      empathy_account_settings_set (priv->settings, "port",
+      tpaw_account_settings_set (priv->settings, "port",
           g_variant_new_uint32 (port));
       DEBUG ("Setting use-ssl to %s", ssl ? "TRUE": "FALSE" );
-      empathy_account_settings_set (priv->settings, "use-ssl",
+      tpaw_account_settings_set (priv->settings, "use-ssl",
           g_variant_new_boolean (ssl));
 
       /* Set Account.Service */
       service = dup_network_service (priv->network);
       DEBUG ("Setting Service to %s", service);
-      empathy_account_settings_set_service (priv->settings, service);
+      tpaw_account_settings_set_service (priv->settings, service);
 
       g_free (address);
       g_free (service);
@@ -219,7 +219,7 @@ set_label_from_settings (TpawIrcNetworkChooser *self)
 
   tp_clear_object (&priv->network);
 
-  server = empathy_account_settings_dup_string (priv->settings, "server");
+  server = tpaw_account_settings_dup_string (priv->settings, "server");
 
   if (server != NULL)
     {
@@ -239,8 +239,8 @@ set_label_from_settings (TpawIrcNetworkChooser *self)
         }
 
       /* We don't have this network. Let's create it */
-      port = empathy_account_settings_get_uint32 (priv->settings, "port");
-      ssl = empathy_account_settings_get_boolean (priv->settings,
+      port = tpaw_account_settings_get_uint32 (priv->settings, "port");
+      ssl = tpaw_account_settings_get_boolean (priv->settings,
           "use-ssl");
 
       DEBUG ("Create a network %s", server);
@@ -375,8 +375,8 @@ tpaw_irc_network_chooser_class_init (TpawIrcNetworkChooserClass *klass)
   g_object_class_install_property (object_class, PROP_SETTINGS,
     g_param_spec_object ("settings",
       "Settings",
-      "The EmpathyAccountSettings to show and edit",
-      EMPATHY_TYPE_ACCOUNT_SETTINGS,
+      "The TpawAccountSettings to show and edit",
+      TPAW_TYPE_ACCOUNT_SETTINGS,
       G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
   signals[SIG_CHANGED] = g_signal_new ("changed",
@@ -405,7 +405,7 @@ tpaw_irc_network_chooser_init (TpawIrcNetworkChooser *self)
 }
 
 GtkWidget *
-tpaw_irc_network_chooser_new (EmpathyAccountSettings *settings)
+tpaw_irc_network_chooser_new (TpawAccountSettings *settings)
 {
   return g_object_new (TPAW_TYPE_IRC_NETWORK_CHOOSER,
       "settings", settings,
diff --git a/tp-account-widgets/tpaw-irc-network-chooser.h b/tp-account-widgets/tpaw-irc-network-chooser.h
index fcba21ab4..cb664d09f 100644
--- a/tp-account-widgets/tpaw-irc-network-chooser.h
+++ b/tp-account-widgets/tpaw-irc-network-chooser.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
-#include "empathy-account-settings.h"
+#include "tpaw-account-settings.h"
 #include "tpaw-irc-network.h"
 
 G_BEGIN_DECLS
@@ -55,7 +55,7 @@ typedef struct {
 
 GType tpaw_irc_network_chooser_get_type (void) G_GNUC_CONST;
 
-GtkWidget * tpaw_irc_network_chooser_new (EmpathyAccountSettings *settings);
+GtkWidget * tpaw_irc_network_chooser_new (TpawAccountSettings *settings);
 
 TpawIrcNetwork * tpaw_irc_network_chooser_get_network (
     TpawIrcNetworkChooser *self);