[next] telepathy-glib: TpAccountManager: remove dead code

[Xavier Claessens]

Module: telepathy-glib
Branch: next
Commit: e56b7cd0be017241c3ff5ba4ac5c23611b1644b0
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=e56b7cd0be017241c3ff5ba4ac5c23611b1644b0

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Thu May 31 16:12:42 2012 +0200

TpAccountManager: remove dead code

---

 telepathy-glib/account-manager.c |   29 -----------------------------
 1 files changed, 0 insertions(+), 29 deletions(-)

diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index a2c3899..406ef44 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -98,7 +98,6 @@
 struct _TpAccountManagerPrivate {
   /* (owned) object path -> (reffed) TpAccount */
   GHashTable *accounts;
-  GHashTable *legacy_accounts;
   gboolean dispose_run;
 
   /* most available presence */
@@ -219,8 +218,6 @@ tp_account_manager_init (TpAccountManager *self)
 
   priv->accounts = g_hash_table_new_full (g_str_hash, g_str_equal,
       g_free, (GDestroyNotify) g_object_unref);
-  self->priv->legacy_accounts = g_hash_table_new_full (
-      g_str_hash, g_str_equal, g_free, g_object_unref);
 }
 
 static void
@@ -552,16 +549,11 @@ _tp_account_manager_finalize (GObject *object)
   G_OBJECT_CLASS (tp_account_manager_parent_class)->finalize (object);
 }
 
-static void legacy_account_invalidated_cb (TpProxy *account, guint domain,
-    gint code, gchar *message, gpointer user_data);
-
 static void
 _tp_account_manager_dispose (GObject *object)
 {
   TpAccountManager *self = TP_ACCOUNT_MANAGER (object);
   TpAccountManagerPrivate *priv = self->priv;
-  GHashTableIter iter;
-  gpointer value;
 
   if (priv->dispose_run)
     return;
@@ -570,14 +562,6 @@ _tp_account_manager_dispose (GObject *object)
 
   g_hash_table_unref (priv->accounts);
 
-  g_hash_table_iter_init (&iter, self->priv->legacy_accounts);
-  while (g_hash_table_iter_next (&iter, NULL, &value))
-    {
-      g_signal_handlers_disconnect_by_func (value,
-          legacy_account_invalidated_cb, self);
-    }
-  tp_clear_pointer (&priv->legacy_accounts, g_hash_table_unref);
-
   tp_dbus_daemon_cancel_name_owner_watch (tp_proxy_get_dbus_daemon (self),
       TP_ACCOUNT_MANAGER_BUS_NAME, _tp_account_manager_name_owner_cb, self);
 
@@ -972,19 +956,6 @@ _tp_account_manager_account_invalidated_cb (TpProxy *proxy,
 }
 
 static void
-legacy_account_invalidated_cb (TpProxy *account,
-    guint domain,
-    gint code,
-    gchar *message,
-    gpointer user_data)
-{
-  TpAccountManager *self = user_data;
-
-  g_hash_table_remove (self->priv->legacy_accounts,
-      tp_proxy_get_object_path (account));
-}
-
-static void
 insert_account (TpAccountManager *self,
     TpAccount *account)
 {