]> git.0d.be Git - empathy.git/blobdiff - libempathy/empathy-account-manager.c
Merge branch 'master' into tp-tube
[empathy.git] / libempathy / empathy-account-manager.c
index fea4fe72ebdc34f7221586de33d04ae197a08b77..b84543176757fcddb7c169c1950270f0f5cd74d3 100644 (file)
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2008 Collabora Ltd.
  *
  * Authors: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <libmissioncontrol/mc-account-monitor.h>
 
 #include "empathy-account-manager.h"
+#include "empathy-marshal.h"
 #include "empathy-utils.h"
 
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
+#include <libempathy/empathy-debug.h>
+
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountManager)
 
 typedef struct {
-       McAccountMonitor *monitor;
-       MissionControl *mc;
-
-       GHashTable *accounts;
+  McAccountMonitor *monitor;
+  MissionControl   *mc;
+
+  GHashTable       *accounts; /* McAccount -> AccountData */
+  GHashTable       *connections; /* TpConnection -> McAccount */
+  int               connected;
+  int               connecting;
+  gboolean          dispose_run;
 } EmpathyAccountManagerPriv;
 
 typedef struct {
-       McPresence presence;
-       TpConnectionStatus connection;
-       gboolean is_enabled;    
+  TpConnection *connection;
+  McPresence presence;
+  TpConnectionStatus status;
+  gboolean is_enabled;
+
+  guint source_id;
 } AccountData;
 
 enum {
-       ACCOUNT_CREATED,
-       ACCOUNT_DELETED,
-       ACCOUNT_ENABLED,
-       ACCOUNT_DISABLED,
-       ACCOUNT_CHANGED,
-       ACCOUNT_CONNECTION_CHANGED,
-       ACCOUNT_PRESENCE_CHANGED,
-       LAST_SIGNAL
+  ACCOUNT_CREATED,
+  ACCOUNT_DELETED,
+  ACCOUNT_ENABLED,
+  ACCOUNT_DISABLED,
+  ACCOUNT_CHANGED,
+  ACCOUNT_CONNECTION_CHANGED,
+  ACCOUNT_PRESENCE_CHANGED,
+  NEW_CONNECTION,
+  LAST_SIGNAL
 };
 
 static guint signals[LAST_SIGNAL];
-static EmpathyAccountManager *manager = NULL;
+static EmpathyAccountManager *manager_singleton = NULL;
 
 G_DEFINE_TYPE (EmpathyAccountManager, empathy_account_manager, G_TYPE_OBJECT);
 
 static AccountData *
-account_data_new (McPresence presence, TpConnectionStatus connection,
-                 gboolean is_enabled)
+account_data_new (McPresence presence,
+                  TpConnectionStatus status,
+                  gboolean is_enabled)
 {
-       AccountData *retval;
+  AccountData *retval;
 
-       retval = g_slice_new0 (AccountData);
-       retval->presence = presence;
-       retval->connection = connection;
-       retval->is_enabled = is_enabled;
+  retval = g_slice_new0 (AccountData);
+  retval->presence = presence;
+  retval->status = status;
+  retval->is_enabled = is_enabled;
+  retval->source_id = 0;
 
-       return retval;
+  return retval;
 }
 
 static AccountData *
 account_data_new_default (MissionControl *mc,
-                         McAccount *account)
+                          McAccount *account)
 {
-       McPresence actual_p;
-       TpConnectionStatus actual_c;
-       GError *err = NULL;
-
-       actual_p = mission_control_get_presence_actual (mc, &err);
-       if (err) {
-               actual_p = MC_PRESENCE_UNSET;
-               g_clear_error (&err);
-       }
-
-       actual_c = mission_control_get_connection_status (mc,
-                                                         account, &err);
-       if (err) {
-               actual_c = TP_CONNECTION_STATUS_DISCONNECTED;
-       }
-
-       return account_data_new (actual_p, actual_c, mc_account_is_enabled (account));
+  McPresence actual_p;
+  TpConnectionStatus actual_c;
+  GError *err = NULL;
+
+  actual_p = mission_control_get_presence_actual (mc, &err);
+  if (err != NULL)
+    {
+      actual_p = MC_PRESENCE_UNSET;
+      g_clear_error (&err);
+    }
+
+  actual_c = mission_control_get_connection_status (mc, account, &err);
+
+  if (err != NULL)
+    {
+      actual_c = TP_CONNECTION_STATUS_DISCONNECTED;
+      g_error_free (err);
+    }
+
+  return account_data_new (actual_p, actual_c, mc_account_is_enabled (account));
 }
 
 static void
 account_data_free (AccountData *data)
 {
-       g_slice_free (AccountData, data);
+  if (data->source_id > 0)
+    {
+      g_source_remove (data->source_id);
+      data->source_id = 0;
+    }
+  if (data->connection != NULL)
+    {
+      g_object_unref (data->connection);
+      data->connection = NULL;
+    }
+
+  g_slice_free (AccountData, data);
+}
+
+static void
+connection_invalidated_cb (TpProxy *connection,
+                           guint    domain,
+                           gint     code,
+                           gchar   *message,
+                           EmpathyAccountManager *manager)
+{
+  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+  McAccount *account;
+  AccountData *data;
+
+  DEBUG ("Message: %s", message);
+
+  account = g_hash_table_lookup (priv->connections, connection);
+  g_assert (account != NULL);
+
+  data = g_hash_table_lookup (priv->accounts, account);
+  g_assert (data != NULL);
+
+  g_object_unref (data->connection);
+  data->connection = NULL;
+
+  g_hash_table_remove (priv->connections, connection);
+}
+
+static void
+connection_ready_cb (TpConnection *connection,
+                     const GError *error,
+                     gpointer manager)
+{
+  /* Errors will be handled in invalidated callback */
+  if (error != NULL)
+    return;
+
+  g_signal_emit (manager, signals[NEW_CONNECTION], 0, connection);
+}
+
+static void
+account_manager_update_connection (EmpathyAccountManager *manager,
+                                   AccountData *data,
+                                   McAccount *account)
+{
+  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+
+  if (data->connection)
+    return;
+
+  data->connection = mission_control_get_tpconnection (priv->mc, account, NULL);
+  if (data->connection != NULL)
+    {
+      g_signal_connect (data->connection, "invalidated",
+          G_CALLBACK (connection_invalidated_cb), manager);
+      g_hash_table_insert (priv->connections, g_object_ref (data->connection),
+          g_object_ref (account));
+      tp_connection_call_when_ready (data->connection, connection_ready_cb,
+          manager);
+    }
 }
 
 static void
 account_created_cb (McAccountMonitor *mon,
-                   gchar *account_name,
-                   EmpathyAccountManager *manager)
+                    gchar *account_name,
+                    EmpathyAccountManager *manager)
 {
-       McAccount *account;
-       EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+  McAccount *account;
+  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+  TpConnectionStatus initial_status;
 
-       account = mc_account_lookup (account_name);
+  account = mc_account_lookup (account_name);
 
-       if (account) {
-               AccountData *data;
+  if (account)
+    {
+      AccountData *data;
 
-               data = account_data_new_default (priv->mc, account);
+      data = account_data_new_default (priv->mc, account);
+      g_hash_table_insert (priv->accounts, g_object_ref (account), data);
 
-               g_hash_table_insert (priv->accounts, account, data);
+      initial_status = mission_control_get_connection_status (priv->mc,
+                                                             account, NULL);
 
-               g_signal_emit (manager, signals[ACCOUNT_CREATED], 0, account);
-       }
+      if (initial_status == TP_CONNECTION_STATUS_CONNECTED)
+       priv->connected++;
+      else if (initial_status == TP_CONNECTION_STATUS_CONNECTING)
+       priv->connecting++;
+
+      account_manager_update_connection (manager, data, account);
+
+      g_signal_emit (manager, signals[ACCOUNT_CREATED], 0, account);
+      g_object_unref (account);
+    }
 }
 
 static void
 account_deleted_cb (McAccountMonitor *mon,
-                   gchar *account_name,
-                   EmpathyAccountManager *manager)
+                    gchar *account_name,
+                    EmpathyAccountManager *manager)
 {
-       McAccount *account;
-       EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
-
-       account = mc_account_lookup (account_name);
+  McAccount *account;
+  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
 
-       if (account) {
-               g_signal_emit (manager, signals[ACCOUNT_DELETED], 0, account);
+  account = mc_account_lookup (account_name);
 
-               g_hash_table_remove (priv->accounts, account);
-               g_object_unref (account);
-       }
+  if (account)
+    {
+      g_hash_table_remove (priv->accounts, account);
+      g_signal_emit (manager, signals[ACCOUNT_DELETED], 0, account);
+      g_object_unref (account);
+    }
 }
 
 static void
 account_changed_cb (McAccountMonitor *mon,
-                   gchar *account_name,
-                   EmpathyAccountManager *manager)
+                    gchar *account_name,
+                    EmpathyAccountManager *manager)
 {
-       McAccount *account;
+  McAccount *account;
 
-       account = mc_account_lookup (account_name);
+  account = mc_account_lookup (account_name);
 
-       if (account) {
-               g_signal_emit (manager, signals[ACCOUNT_CHANGED], 0, account);
-               g_object_unref (account);
-       }
+  if (account)
+    {
+      g_signal_emit (manager, signals[ACCOUNT_CHANGED], 0, account);
+      g_object_unref (account);
+    }
 }
 
 static void
 account_disabled_cb (McAccountMonitor *mon,
-                    gchar *account_name,
-                    EmpathyAccountManager *manager)
+                     gchar *account_name,
+                     EmpathyAccountManager *manager)
 {
-       McAccount *account;
-       EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
-       AccountData *data;
+  McAccount *account;
+  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+  AccountData *data;
 
-       account = mc_account_lookup (account_name);
+  account = mc_account_lookup (account_name);
 
-       if (account) {
-               data = g_hash_table_lookup (priv->accounts, account);
-               g_assert (data);
-               data->is_enabled = FALSE;
+  if (account)
+    {
+      data = g_hash_table_lookup (priv->accounts, account);
+      g_assert (data);
+      data->is_enabled = FALSE;
 
-               g_signal_emit (manager, signals[ACCOUNT_DISABLED], 0, account);
-       }
+      g_signal_emit (manager, signals[ACCOUNT_DISABLED], 0, account);
+      g_object_unref (account);
+    }
 }
 
 static void
 account_enabled_cb (McAccountMonitor *mon,
-                   gchar *account_name,
-                   EmpathyAccountManager *manager)
+                    gchar *account_name,
+                    EmpathyAccountManager *manager)
+{
+  McAccount *account;
+  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+  AccountData *data;
+
+  account = mc_account_lookup (account_name);
+
+  if (account)
+    {
+      data = g_hash_table_lookup (priv->accounts, account);
+      g_assert (data);
+      data->is_enabled = TRUE;
+
+      g_signal_emit (manager, signals[ACCOUNT_ENABLED], 0, account);
+      g_object_unref (account);
+    }
+}
+
+static void
+update_connection_numbers (EmpathyAccountManager *manager,
+                           TpConnectionStatus status,
+                           TpConnectionStatus old_s)
+{
+  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+
+  if (status == TP_CONNECTION_STATUS_CONNECTED)
+    {
+      priv->connected++;
+      if (old_s == TP_CONNECTION_STATUS_CONNECTING)
+        priv->connecting--;
+    }
+
+  if (status == TP_CONNECTION_STATUS_CONNECTING)
+    {
+      priv->connecting++;
+      if (old_s == TP_CONNECTION_STATUS_CONNECTED)
+        priv->connected--;
+    }
+
+  if (status == TP_CONNECTION_STATUS_DISCONNECTED)
+    {
+      if (old_s == TP_CONNECTION_STATUS_CONNECTED)
+        priv->connected--;
+
+      if (old_s == TP_CONNECTION_STATUS_CONNECTING)
+        priv->connecting--;
+    }
+}
+
+static gboolean
+remove_data_timeout (gpointer _data)
 {
-       McAccount *account;
-       EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
-       AccountData *data;
+  AccountData *data = _data;
 
-       account = mc_account_lookup (account_name);
+  data->source_id = 0;
 
-       if (account) {
-               data = g_hash_table_lookup (priv->accounts, account);
-               g_assert (data);
-               data->is_enabled = TRUE;
+  return FALSE;
+}
 
-               g_signal_emit (manager, signals[ACCOUNT_ENABLED], 0, account);
-               g_object_unref (account);
-       }
+typedef struct {
+  TpConnectionStatus status;
+  McPresence presence;
+  TpConnectionStatusReason reason;
+  gchar *unique_name;
+  EmpathyAccountManager *manager;
+} ChangedSignalData;
+
+static gboolean
+account_status_changed_idle_cb (ChangedSignalData *signal_data)
+{
+  McAccount *account;
+  AccountData *data;
+  McPresence presence, old_p;
+  TpConnectionStatus status, old_s;
+  gboolean emit_presence = FALSE, emit_connection = FALSE;
+  EmpathyAccountManager *manager = signal_data->manager;
+  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+
+  presence = signal_data->presence;
+  status = signal_data->status;
+  account = mc_account_lookup (signal_data->unique_name);
+
+  if (account)
+    {
+      data = g_hash_table_lookup (priv->accounts, account);
+      g_assert (data);
+
+      old_p = data->presence;
+      old_s = data->status;
+
+      if (old_p != presence)
+        {
+          data->presence = presence;
+          emit_presence = TRUE;
+        }
+
+      if (old_s != status)
+        {
+          data->status = status;
+          update_connection_numbers (manager, status, old_s);
+
+          if (status == TP_CONNECTION_STATUS_CONNECTED)
+            {
+                if (data->source_id > 0)
+                  {
+                    g_source_remove (data->source_id);
+                    data->source_id = 0;
+                  }
+
+                data->source_id = g_timeout_add_seconds (10,
+                                                         remove_data_timeout,
+                                                         data);
+            }
+          emit_connection = TRUE;
+        }
+
+      account_manager_update_connection (manager, data, account);
+
+      if (emit_presence)
+        g_signal_emit (manager, signals[ACCOUNT_PRESENCE_CHANGED], 0,
+                       account, presence, old_p);
+
+      if (emit_connection)
+        g_signal_emit (manager, signals[ACCOUNT_CONNECTION_CHANGED], 0,
+                       account, signal_data->reason, status, old_s);
+
+      g_object_unref (account);
+    }
+
+  g_object_unref (signal_data->manager);
+  g_free (signal_data->unique_name);
+  g_slice_free (ChangedSignalData, signal_data);
+
+  return FALSE;
 }
 
 static void
 account_status_changed_cb (MissionControl *mc,
-                          TpConnectionStatus connection,
-                          McPresence presence,
-                          TpConnectionStatusReason reason,
-                          const gchar *unique_name,
-                          EmpathyAccountManager *manager)
+                           TpConnectionStatus status,
+                           McPresence presence,
+                           TpConnectionStatusReason reason,
+                           const gchar *unique_name,
+                           EmpathyAccountManager *manager)
 {
-       McAccount *account;
-       EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
-       AccountData *data;
-       McPresence old_p;
-       TpConnectionStatus old_c;
-
-       account = mc_account_lookup (unique_name);
-
-       if (account) {
-               data = g_hash_table_lookup (priv->accounts, account);
-               g_assert (data);
-
-               old_p = data->presence;
-               old_c = data->connection;
-
-               if (old_p != presence) {
-                       data->presence = presence;
-                       g_signal_emit (manager, signals[ACCOUNT_PRESENCE_CHANGED], 0,
-                                      account, presence, old_p);
-               }
-
-               if (old_c != connection) {
-                       data->connection = connection;
-                       g_signal_emit (manager, signals[ACCOUNT_PRESENCE_CHANGED], 0,
-                                      account, reason, connection, old_c);
-               }
-       
-               g_object_unref (account);
-       }
+  ChangedSignalData *data;
+
+  data = g_slice_new0 (ChangedSignalData);
+  data->status = status;
+  data->presence = presence;
+  data->reason = reason;
+  data->unique_name = g_strdup (unique_name);
+  data->manager = g_object_ref (manager);
+
+  g_idle_add ((GSourceFunc) account_status_changed_idle_cb, data);
 }
 
 static void
 empathy_account_manager_init (EmpathyAccountManager *manager)
 {
-       EmpathyAccountManagerPriv *priv =
-               G_TYPE_INSTANCE_GET_PRIVATE (manager,
-                                            EMPATHY_TYPE_ACCOUNT_MANAGER, EmpathyAccountManagerPriv);
-       GList *mc_accounts, *l;
-       AccountData *data;
-
-       manager->priv = priv;
-       priv->monitor = mc_account_monitor_new ();
-       priv->mc = empathy_mission_control_new ();
-
-       priv->accounts = g_hash_table_new_full (empathy_account_hash,
-                                               empathy_account_equal,
-                                               g_object_unref, 
-                                               (GDestroyNotify) account_data_free);
-
-       mc_accounts = mc_accounts_list ();
-
-       for (l = mc_accounts; l; l = l->next) {
-               data = account_data_new_default (priv->mc, l->data);
-
-               g_hash_table_insert (priv->accounts, g_object_ref (l->data),
-                                    data);
-       }
-
-       g_signal_connect (priv->monitor, "account-created",
-                         G_CALLBACK (account_created_cb), manager);
-       g_signal_connect (priv->monitor, "account-deleted",
-                         G_CALLBACK (account_deleted_cb), manager);
-       g_signal_connect (priv->monitor, "account-disabled",
-                         G_CALLBACK (account_disabled_cb), manager);
-       g_signal_connect (priv->monitor, "account-enabled",
-                         G_CALLBACK (account_enabled_cb), manager);
-       g_signal_connect (priv->monitor, "account-changed",
-                         G_CALLBACK (account_changed_cb), manager);
-
-       dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc), "AccountStatusChanged",
-                                    G_CALLBACK (account_status_changed_cb),
-                                    g_object_ref (manager),
-                                    (GClosureNotify) g_object_unref);
+  EmpathyAccountManagerPriv *priv;
+  GList *mc_accounts, *l;
+
+  priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
+                                     EMPATHY_TYPE_ACCOUNT_MANAGER, EmpathyAccountManagerPriv);
+  manager->priv = priv;
+  priv->monitor = mc_account_monitor_new ();
+  priv->mc = empathy_mission_control_dup_singleton ();
+  priv->connected = priv->connecting = 0;
+  priv->dispose_run = FALSE;
+
+  priv->accounts = g_hash_table_new_full (empathy_account_hash,
+                                          empathy_account_equal,
+                                          g_object_unref, 
+                                          (GDestroyNotify) account_data_free);
+  priv->connections = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+                                             g_object_unref, g_object_unref);
+
+  mc_accounts = mc_accounts_list ();
+
+  for (l = mc_accounts; l; l = l->next)
+    account_created_cb (priv->monitor, (char *) mc_account_get_unique_name (l->data), manager);
+
+  g_signal_connect (priv->monitor, "account-created",
+                    G_CALLBACK (account_created_cb), manager);
+  g_signal_connect (priv->monitor, "account-deleted",
+                    G_CALLBACK (account_deleted_cb), manager);
+  g_signal_connect (priv->monitor, "account-disabled",
+                    G_CALLBACK (account_disabled_cb), manager);
+  g_signal_connect (priv->monitor, "account-enabled",
+                    G_CALLBACK (account_enabled_cb), manager);
+  g_signal_connect (priv->monitor, "account-changed",
+                    G_CALLBACK (account_changed_cb), manager);
+
+  dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc), "AccountStatusChanged",
+                               G_CALLBACK (account_status_changed_cb),
+                               manager, NULL);
+
+  mc_accounts_list_free (mc_accounts);
 }
-                                          
+
 static void
 do_finalize (GObject *obj)
 {
-       EmpathyAccountManager *manager = EMPATHY_ACCOUNT_MANAGER (obj);
-       EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+  EmpathyAccountManager *manager = EMPATHY_ACCOUNT_MANAGER (obj);
+  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
 
-       g_object_unref (priv->monitor);
-       g_object_unref (priv->mc);
+  g_hash_table_unref (priv->accounts);
+  g_hash_table_unref (priv->connections);
 
-       g_hash_table_destroy (priv->accounts);
+  G_OBJECT_CLASS (empathy_account_manager_parent_class)->finalize (obj);
+}
 
-       G_OBJECT_CLASS (empathy_account_manager_parent_class)->finalize (obj);
+static void
+do_dispose (GObject *obj)
+{
+  EmpathyAccountManager *manager = EMPATHY_ACCOUNT_MANAGER (obj);
+  EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
+
+  if (priv->dispose_run)
+    return;
+
+  priv->dispose_run = TRUE;
+
+  dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (priv->mc),
+                                  "AccountStatusChanged",
+                                  G_CALLBACK (account_status_changed_cb),
+                                  obj);
+
+  if (priv->monitor)
+    {
+      g_signal_handlers_disconnect_by_func (priv->monitor,
+                                            account_created_cb, obj);
+      g_signal_handlers_disconnect_by_func (priv->monitor,
+                                            account_deleted_cb, obj);
+      g_signal_handlers_disconnect_by_func (priv->monitor,
+                                            account_disabled_cb, obj);
+      g_signal_handlers_disconnect_by_func (priv->monitor,
+                                            account_enabled_cb, obj);
+      g_signal_handlers_disconnect_by_func (priv->monitor,
+                                            account_changed_cb, obj);
+      g_object_unref (priv->monitor);
+      priv->monitor = NULL;
+    }
+
+  if (priv->mc)
+    g_object_unref (priv->mc);
+
+  g_hash_table_remove_all (priv->accounts);
+
+  G_OBJECT_CLASS (empathy_account_manager_parent_class)->dispose (obj);
+}
+
+static GObject*
+do_constructor (GType type,
+                guint n_construct_params,
+                GObjectConstructParam *construct_params)
+{
+  GObject *retval;
+
+  if (!manager_singleton)
+    {
+      retval = G_OBJECT_CLASS (empathy_account_manager_parent_class)->constructor (type,
+                                                                                   n_construct_params,
+                                                                                   construct_params);
+      manager_singleton = EMPATHY_ACCOUNT_MANAGER (retval);
+      g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
+    }
+  else
+    {
+      retval = g_object_ref (manager_singleton);
+    }
+
+  return retval;
 }
 
 static void
 empathy_account_manager_class_init (EmpathyAccountManagerClass *klass)
 {
-       GObjectClass *oclass = G_OBJECT_CLASS (klass);
-
-       oclass->finalize = do_finalize;
-
-       signals[ACCOUNT_CREATED] =
-               g_signal_new ("account-created",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
-                             G_TYPE_NONE,
-                             1, MC_TYPE_ACCOUNT);
-       signals[ACCOUNT_DELETED] =
-               g_signal_new ("account-deleted",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
-                             G_TYPE_NONE,
-                             1, MC_TYPE_ACCOUNT);
-
-       signals[ACCOUNT_ENABLED] =
-               g_signal_new ("account-enabled",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
-                             G_TYPE_NONE,
-                             1, MC_TYPE_ACCOUNT);
-
-       signals[ACCOUNT_DISABLED] =
-               g_signal_new ("account-disabled",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
-                             G_TYPE_NONE,
-                             1, MC_TYPE_ACCOUNT);
-
-       signals[ACCOUNT_CHANGED] =
-               g_signal_new ("account-changed",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
-                             G_TYPE_NONE,
-                             1, MC_TYPE_ACCOUNT);
-
-       signals[ACCOUNT_CONNECTION_CHANGED] =
-               g_signal_new ("account-connection-changed",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
-                             G_TYPE_NONE,
-                             4, MC_TYPE_ACCOUNT,
-                             G_TYPE_INT,   /* reason */
-                             G_TYPE_UINT,  /* actual connection */
-                             G_TYPE_UINT); /* previous connection */
-
-       signals[ACCOUNT_PRESENCE_CHANGED] =
-               g_signal_new ("account-presence-changed",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
-                             G_TYPE_NONE,
-                             3, MC_TYPE_ACCOUNT,
-                             G_TYPE_INT,  /* actual presence */
-                             G_TYPE_INT); /* previous presence */
-
-
-       g_type_class_add_private (oclass, sizeof (EmpathyAccountManagerPriv));
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  oclass->finalize = do_finalize;
+  oclass->dispose = do_dispose;
+  oclass->constructor = do_constructor;
+
+  signals[ACCOUNT_CREATED] =
+    g_signal_new ("account-created",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE,
+                  1, MC_TYPE_ACCOUNT);
+
+  signals[ACCOUNT_DELETED] =
+    g_signal_new ("account-deleted",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE,
+                  1, MC_TYPE_ACCOUNT);
+
+  signals[ACCOUNT_ENABLED] =
+    g_signal_new ("account-enabled",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE,
+                  1, MC_TYPE_ACCOUNT);
+
+  signals[ACCOUNT_DISABLED] =
+    g_signal_new ("account-disabled",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE,
+                  1, MC_TYPE_ACCOUNT);
+
+  signals[ACCOUNT_CHANGED] =
+    g_signal_new ("account-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE,
+                  1, MC_TYPE_ACCOUNT);
+
+  signals[ACCOUNT_CONNECTION_CHANGED] =
+    g_signal_new ("account-connection-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  _empathy_marshal_VOID__OBJECT_INT_UINT_UINT,
+                  G_TYPE_NONE,
+                  4, MC_TYPE_ACCOUNT,
+                  G_TYPE_INT,   /* reason */
+                  G_TYPE_UINT,  /* actual connection */
+                  G_TYPE_UINT); /* previous connection */
+
+  signals[ACCOUNT_PRESENCE_CHANGED] =
+    g_signal_new ("account-presence-changed",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  _empathy_marshal_VOID__OBJECT_INT_INT,
+                  G_TYPE_NONE,
+                  3, MC_TYPE_ACCOUNT,
+                  G_TYPE_INT,  /* actual presence */
+                  G_TYPE_INT); /* previous presence */
+
+  signals[NEW_CONNECTION] =
+    g_signal_new ("new-connection",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
+                  G_TYPE_NONE,
+                  1, TP_TYPE_CONNECTION);
+  
+  g_type_class_add_private (oclass, sizeof (EmpathyAccountManagerPriv));
 }
 
+/* public methods */
+
 EmpathyAccountManager *
-empathy_account_manager_new (void)
+empathy_account_manager_dup_singleton (void)
 {
-       if (!manager) {
-               manager = g_object_new (EMPATHY_TYPE_ACCOUNT_MANAGER, NULL);
-               g_object_add_weak_pointer (G_OBJECT (manager), (gpointer) &manager);
-       } else {
-               g_object_ref (manager);
-       }
-
-       return manager;
-}
\ No newline at end of file
+  return g_object_new (EMPATHY_TYPE_ACCOUNT_MANAGER, NULL);
+}
+
+int
+empathy_account_manager_get_connected_accounts (EmpathyAccountManager *manager)
+{
+  EmpathyAccountManagerPriv *priv;
+
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), 0);
+
+  priv = GET_PRIV (manager);
+
+  return priv->connected;
+}
+
+int
+empathy_account_manager_get_connecting_accounts (EmpathyAccountManager *manager)
+{
+  EmpathyAccountManagerPriv *priv;
+
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), 0);
+
+  priv = GET_PRIV (manager);
+
+  return priv->connecting;
+}
+
+gboolean
+empathy_account_manager_is_account_just_connected (EmpathyAccountManager *manager,
+                                                   McAccount *account)
+{
+  EmpathyAccountManagerPriv *priv;
+  AccountData *data;
+
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), FALSE);
+
+  priv = GET_PRIV (manager);
+  data = g_hash_table_lookup (priv->accounts, account);
+
+  g_assert (data);
+
+  return (data->source_id > 0);
+}
+
+/**
+ * empathy_account_manager_get_count:
+ * @manager: a #EmpathyAccountManager
+ *
+ * Get the number of accounts.
+ *
+ * Returns: the number of accounts.
+ **/
+int
+empathy_account_manager_get_count (EmpathyAccountManager *manager)
+{
+  EmpathyAccountManagerPriv *priv;
+
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), 0);
+
+  priv = GET_PRIV (manager);
+
+  return g_hash_table_size (priv->accounts);
+}
+
+McAccount *
+empathy_account_manager_get_account (EmpathyAccountManager *manager,
+                                     TpConnection          *connection)
+{
+  EmpathyAccountManagerPriv *priv;
+
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), 0);
+
+  priv = GET_PRIV (manager);
+
+  return g_hash_table_lookup (priv->connections, connection);
+}
+
+GList *
+empathy_account_manager_dup_accounts (EmpathyAccountManager *manager)
+{
+  EmpathyAccountManagerPriv *priv;
+  GList *ret;
+
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), NULL);
+
+  priv = GET_PRIV (manager);
+
+  ret = g_hash_table_get_keys (priv->accounts);
+  g_list_foreach (ret, (GFunc) g_object_ref, NULL);
+
+  return ret;
+}
+
+/**
+ * empathy_account_manager_get_connection:
+ * @manager: a #EmpathyAccountManager
+ * @account: a #McAccount
+ *
+ * Get the connection of the accounts, or NULL if account is offline or the
+ * connection is not yet ready. This function does not return a new ref.
+ *
+ * Returns: the connection of the accounts.
+ **/
+TpConnection *
+empathy_account_manager_get_connection (EmpathyAccountManager *manager,
+                                        McAccount *account)
+{
+  EmpathyAccountManagerPriv *priv;
+  AccountData *data;
+
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), NULL);
+  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
+
+  priv = GET_PRIV (manager);
+
+  data = g_hash_table_lookup (priv->accounts, account);
+  if (data && data->connection && tp_connection_is_ready (data->connection))
+    return data->connection;
+
+  return NULL;
+}
+
+/**
+ * empathy_account_manager_dup_connections:
+ * @manager: a #EmpathyAccountManager
+ *
+ * Get a #GList of all ready #TpConnection. The list must be freed with
+ * g_list_free, and its elements must be unreffed.
+ *
+ * Returns: the list of connections
+ **/
+GList *
+empathy_account_manager_dup_connections (EmpathyAccountManager *manager)
+{
+  EmpathyAccountManagerPriv *priv;
+  GHashTableIter iter;
+  gpointer connection;
+  GList *ret = NULL;
+
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), NULL);
+
+  priv = GET_PRIV (manager);
+
+  g_hash_table_iter_init (&iter, priv->connections);
+  while (g_hash_table_iter_next (&iter, &connection, NULL)) 
+    if (connection != NULL && tp_connection_is_ready (connection))
+      ret = g_list_prepend (ret, g_object_ref (connection));
+
+  return ret;
+}
+