]> git.0d.be Git - empathy.git/blobdiff - libempathy/empathy-contact-manager.c
Updated.
[empathy.git] / libempathy / empathy-contact-manager.c
index ebc6b05730c1d6e1727c989a1db8f1c1d8a55a3a..ad25cac0dd3e91b7febd4492d2fe90c3bb45bbae 100644 (file)
@@ -2,20 +2,19 @@
 /*
  * Copyright (C) 2007 Collabora Ltd.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * 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 program is distributed in the hope that it will be useful,
+ * 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
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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
  * 
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
@@ -27,8 +26,9 @@
 #include <libtelepathy/tp-constants.h>
 
 #include "empathy-contact-manager.h"
-#include "gossip-utils.h"
-#include "gossip-debug.h"
+#include "empathy-contact-list.h"
+#include "empathy-utils.h"
+#include "empathy-debug.h"
 
 #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
                       EMPATHY_TYPE_CONTACT_MANAGER, EmpathyContactManagerPriv))
 struct _EmpathyContactManagerPriv {
        GHashTable     *lists;
        MissionControl *mc;
-       gboolean        setup;
 };
 
-typedef struct {
-       const gchar *old_group;
-       const gchar *new_group;
-} ContactManagerRenameGroupData;
+static void empathy_contact_manager_class_init (EmpathyContactManagerClass *klass);
+static void empathy_contact_manager_init       (EmpathyContactManager      *manager);
+static void contact_manager_iface_init         (EmpathyContactListIface    *iface);
 
-typedef struct {
-       GossipContact *contact;
-       const gchar   *id;
-} ContactManagerFindData;
-
-static void     empathy_contact_manager_class_init   (EmpathyContactManagerClass      *klass);
-static void     empathy_contact_manager_init         (EmpathyContactManager           *manager);
-static void     contact_manager_finalize             (GObject                         *object);
-static void     contact_manager_setup_foreach        (McAccount                       *account,
-                                                     EmpathyContactList              *list,
-                                                     EmpathyContactManager           *manager);
-static gboolean contact_manager_find_foreach         (McAccount                       *account,
-                                                     EmpathyContactList              *list,
-                                                     ContactManagerFindData          *data);
-static void     contact_manager_add_account          (EmpathyContactManager           *manager,
-                                                     McAccount                       *account);
-static void     contact_manager_added_cb             (EmpathyContactList              *list,
-                                                     GossipContact                   *contact,
-                                                     EmpathyContactManager           *manager);
-static void     contact_manager_removed_cb           (EmpathyContactList              *list,
-                                                     GossipContact                   *contact,
-                                                     EmpathyContactManager           *manager);
-static void     contact_manager_destroy_cb           (EmpathyContactList              *list,
-                                                     EmpathyContactManager           *manager);
-static void     contact_manager_rename_group_foreach (McAccount                       *account,
-                                                     EmpathyContactList              *list,
-                                                     ContactManagerRenameGroupData   *data);
-static void     contact_manager_get_groups_foreach   (McAccount                       *account,
-                                                     EmpathyContactList              *list,
-                                                     GList                          **all_groups);
-static void     contact_manager_get_contacts_foreach (McAccount                       *account,
-                                                     EmpathyContactList              *list,
-                                                     GList                          **contacts);
-static void     contact_manager_status_changed_cb    (MissionControl                  *mc,
-                                                     TelepathyConnectionStatus        status,
-                                                     McPresence                       presence,
-                                                     TelepathyConnectionStatusReason  reason,
-                                                     const gchar                     *unique_name,
-                                                     EmpathyContactManager           *manager);
-
-enum {
-       CONTACT_ADDED,
-       CONTACT_REMOVED,
-       LAST_SIGNAL
-};
+G_DEFINE_TYPE_WITH_CODE (EmpathyContactManager, empathy_contact_manager, G_TYPE_OBJECT,
+                        G_IMPLEMENT_INTERFACE (EMPATHY_TYPE_CONTACT_LIST,
+                                               contact_manager_iface_init));
 
-static guint signals[LAST_SIGNAL];
+static void
+contact_manager_members_changed_cb (EmpathyTpContactList  *list,
+                                   EmpathyContact        *contact,
+                                   EmpathyContact        *actor,
+                                   guint                  reason,
+                                   gchar                 *message,
+                                   gboolean               is_member,
+                                   EmpathyContactManager *manager)
+{
+       g_signal_emit_by_name (manager, "members-changed",
+                              contact, actor, reason, message, is_member);
+}
 
-G_DEFINE_TYPE (EmpathyContactManager, empathy_contact_manager, G_TYPE_OBJECT);
+static void
+contact_manager_pendings_changed_cb (EmpathyTpContactList  *list,
+                                    EmpathyContact        *contact,
+                                    EmpathyContact        *actor,
+                                    guint                  reason,
+                                    gchar                 *message,
+                                    gboolean               is_pending,
+                                    EmpathyContactManager *manager)
+{
+       g_signal_emit_by_name (manager, "pendings-changed",
+                              contact, actor, reason, message, is_pending);
+}
+
+static void
+contact_manager_groups_changed_cb (EmpathyTpContactList  *list,
+                                  EmpathyContact        *contact,
+                                  gchar                 *group,
+                                  gboolean               is_member,
+                                  EmpathyContactManager *manager)
+{
+       g_signal_emit_by_name (manager, "groups-changed",
+                              contact, group, is_member);
+}
+
+static void contact_manager_destroy_cb (EmpathyTpContactList  *list,
+                                       EmpathyContactManager *manager);
+
+static void
+contact_manager_disconnect_foreach (gpointer key,
+                                   gpointer value,
+                                   gpointer user_data)
+{
+       EmpathyTpContactList  *list = value;
+       EmpathyContactManager *manager = user_data;
+
+       /* Disconnect signals from the list */
+       g_signal_handlers_disconnect_by_func (list,
+                                             contact_manager_members_changed_cb,
+                                             manager);
+       g_signal_handlers_disconnect_by_func (list,
+                                             contact_manager_pendings_changed_cb,
+                                             manager);
+       g_signal_handlers_disconnect_by_func (list,
+                                             contact_manager_groups_changed_cb,
+                                             manager);
+       g_signal_handlers_disconnect_by_func (list,
+                                             contact_manager_destroy_cb,
+                                             manager);
+}
+
+static void
+contact_manager_destroy_cb (EmpathyTpContactList  *list,
+                           EmpathyContactManager *manager)
+{
+       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
+       McAccount                 *account;
+
+       account = empathy_tp_contact_list_get_account (list);
+
+       empathy_debug (DEBUG_DOMAIN, "Removing account: %s",
+                      mc_account_get_display_name (account));
+
+       contact_manager_disconnect_foreach (account, list, manager);
+       g_hash_table_remove (priv->lists, account);
+}
+
+static void
+contact_manager_add_account (EmpathyContactManager *manager,
+                            McAccount             *account)
+{
+       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
+       EmpathyTpContactList      *list;
+
+       if (g_hash_table_lookup (priv->lists, account)) {
+               return;
+       }
+
+       empathy_debug (DEBUG_DOMAIN, "Adding new account: %s",
+                      mc_account_get_display_name (account));
+
+       list = empathy_tp_contact_list_new (account);
+       if (!list) {
+               return;
+       }
+
+       g_hash_table_insert (priv->lists, g_object_ref (account), list);
+
+       /* Connect signals */
+       g_signal_connect (list, "members-changed",
+                         G_CALLBACK (contact_manager_members_changed_cb),
+                         manager);
+       g_signal_connect (list, "pendings-changed",
+                         G_CALLBACK (contact_manager_pendings_changed_cb),
+                         manager);
+       g_signal_connect (list, "groups-changed",
+                         G_CALLBACK (contact_manager_groups_changed_cb),
+                         manager);
+       g_signal_connect (list, "destroy",
+                         G_CALLBACK (contact_manager_destroy_cb),
+                         manager);
+}
+
+static void
+contact_manager_status_changed_cb (MissionControl                  *mc,
+                                  TelepathyConnectionStatus        status,
+                                  McPresence                       presence,
+                                  TelepathyConnectionStatusReason  reason,
+                                  const gchar                     *unique_name,
+                                  EmpathyContactManager           *manager)
+{
+       McAccount *account;
+
+       if (status != TP_CONN_STATUS_CONNECTED) {
+               /* We only care about newly connected accounts */
+               return;
+       }
+
+       account = mc_account_lookup (unique_name);
+       contact_manager_add_account (manager, account);
+       g_object_unref (account);
+}
+
+static void
+contact_manager_finalize (GObject *object)
+{
+       EmpathyContactManagerPriv *priv = GET_PRIV (object);
+
+       dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (priv->mc),
+                                       "AccountStatusChanged",
+                                       G_CALLBACK (contact_manager_status_changed_cb),
+                                       object);
+
+       g_hash_table_foreach (priv->lists,
+                             contact_manager_disconnect_foreach,
+                             object);
+       g_hash_table_destroy (priv->lists);
+       g_object_unref (priv->mc);
+}
 
 static void
 empathy_contact_manager_class_init (EmpathyContactManagerClass *klass)
@@ -103,26 +207,6 @@ empathy_contact_manager_class_init (EmpathyContactManagerClass *klass)
 
        object_class->finalize = contact_manager_finalize;
 
-       signals[CONTACT_ADDED] =
-               g_signal_new ("contact-added",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
-                             G_TYPE_NONE,
-                             1, GOSSIP_TYPE_CONTACT);
-
-       signals[CONTACT_REMOVED] =
-               g_signal_new ("contact-removed",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
-                             G_TYPE_NONE,
-                             1, GOSSIP_TYPE_CONTACT);
-
        g_type_class_add_private (object_class, sizeof (EmpathyContactManagerPriv));
 }
 
@@ -134,12 +218,12 @@ empathy_contact_manager_init (EmpathyContactManager *manager)
 
        priv = GET_PRIV (manager);
 
-       priv->lists = g_hash_table_new_full (gossip_account_hash,
-                                            gossip_account_equal,
+       priv->lists = g_hash_table_new_full (empathy_account_hash,
+                                            empathy_account_equal,
                                             (GDestroyNotify) g_object_unref,
                                             (GDestroyNotify) g_object_unref);
 
-       priv->mc = gossip_mission_control_new ();
+       priv->mc = empathy_mission_control_new ();
 
        dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc),
                                     "AccountStatusChanged",
@@ -149,27 +233,12 @@ empathy_contact_manager_init (EmpathyContactManager *manager)
        /* Get ContactList for existing connections */
        accounts = mission_control_get_online_connections (priv->mc, NULL);
        for (l = accounts; l; l = l->next) {
-               McAccount *account;
-
-               account = l->data;
-               contact_manager_add_account (manager, account);
-               
-               g_object_unref (account);
+               contact_manager_add_account (manager, l->data);
+               g_object_unref (l->data);
        }
        g_slist_free (accounts);
 }
 
-static void
-contact_manager_finalize (GObject *object)
-{
-       EmpathyContactManagerPriv *priv;
-
-       priv = GET_PRIV (object);
-
-       g_hash_table_destroy (priv->lists);
-       g_object_unref (priv->mc);
-}
-
 EmpathyContactManager *
 empathy_contact_manager_new (void)
 {
@@ -185,378 +254,245 @@ empathy_contact_manager_new (void)
        return manager;
 }
 
-void
-empathy_contact_manager_setup (EmpathyContactManager *manager)
-{
-       EmpathyContactManagerPriv *priv;
-
-       g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
-
-       priv = GET_PRIV (manager);
-
-       if (priv->setup) {
-               /* Already done */
-               return;
-       }
-
-       g_hash_table_foreach (priv->lists,
-                             (GHFunc) contact_manager_setup_foreach,
-                             manager);
-
-       priv->setup = TRUE;
-}
-
-EmpathyContactList *
+EmpathyTpContactList *
 empathy_contact_manager_get_list (EmpathyContactManager *manager,
                                  McAccount             *account)
 {
-       EmpathyContactManagerPriv *priv;
+       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
 
        g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
        g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
 
-       priv = GET_PRIV (manager);
-
        return g_hash_table_lookup (priv->lists, account);
 }
 
-GossipContact *
-empathy_contact_manager_get_own (EmpathyContactManager *manager,
-                                McAccount             *account)
-{
-       EmpathyContactManagerPriv *priv;
-       EmpathyContactList        *list;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
-       g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
-
-       priv = GET_PRIV (manager);
-
-       list = g_hash_table_lookup (priv->lists, account);
-       
-       if (!list) {
-               return NULL;
-       }
-
-       return empathy_contact_list_get_own (list);
-}
-
-GossipContact *
-empathy_contact_manager_create (EmpathyContactManager *manager,
-                               McAccount             *account,
-                               const gchar           *id)
-{
-       EmpathyContactManagerPriv *priv;
-       EmpathyContactList        *list;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
-       g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
-       g_return_val_if_fail (id != NULL, NULL);
-
-       priv = GET_PRIV (manager);
-
-       list = g_hash_table_lookup (priv->lists, account);
-       
-       if (!list) {
-               return NULL;
-       }
-
-       return empathy_contact_list_get_from_id (list, id);
-}
-
-GossipContact *
-empathy_contact_manager_find (EmpathyContactManager *manager,
-                             const gchar           *id)
-{
-       EmpathyContactManagerPriv *priv;
-       ContactManagerFindData     data;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
-       g_return_val_if_fail (id != NULL, NULL);
-
-       priv = GET_PRIV (manager);
-
-       data.contact = NULL;
-       data.id = id;
-
-       g_hash_table_find (priv->lists,
-                          (GHRFunc) contact_manager_find_foreach,
-                          &data);
-
-       return data.contact;
-}
-
-void
-empathy_contact_manager_add (EmpathyContactManager *manager,
-                            GossipContact         *contact,
-                            const gchar           *message)
+static void
+contact_manager_add (EmpathyContactList *manager,
+                    EmpathyContact     *contact,
+                    const gchar        *message)
 {
-       EmpathyContactManagerPriv *priv;
+       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
        EmpathyContactList        *list;
        McAccount                 *account;
-       guint                      handle;
 
        g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
-       g_return_if_fail (GOSSIP_IS_CONTACT (contact));
 
-       priv = GET_PRIV (manager);
-
-       account = gossip_contact_get_account (contact);
-       handle = gossip_contact_get_handle (contact);
+       account = empathy_contact_get_account (contact);
        list = g_hash_table_lookup (priv->lists, account);
 
        if (list) {
-               empathy_contact_list_add (list, handle, message);
+               empathy_contact_list_add (list, contact, message);
        }
 }
 
-void
-empathy_contact_manager_remove (EmpathyContactManager *manager,
-                               GossipContact         *contact)
+static void
+contact_manager_remove (EmpathyContactList *manager,
+                       EmpathyContact      *contact,
+                       const gchar        *message)
 {
-       EmpathyContactManagerPriv *priv;
+       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
        EmpathyContactList        *list;
        McAccount                 *account;
-       guint                      handle;
 
        g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
-       g_return_if_fail (GOSSIP_IS_CONTACT (contact));
 
-       priv = GET_PRIV (manager);
-
-       account = gossip_contact_get_account (contact);
-       handle = gossip_contact_get_handle (contact);
+       account = empathy_contact_get_account (contact);
        list = g_hash_table_lookup (priv->lists, account);
 
        if (list) {
-               empathy_contact_list_remove (list, handle);
+               empathy_contact_list_remove (list, contact, message);
        }
 }
 
-void
-empathy_contact_manager_rename_group (EmpathyContactManager *manager,
-                                     const gchar           *old_group,
-                                     const gchar           *new_group)
+static void
+contact_manager_get_members_foreach (McAccount             *account,
+                                    EmpathyTpContactList  *list,
+                                    GList                **contacts)
 {
-       EmpathyContactManagerPriv   *priv;
-       ContactManagerRenameGroupData  data;
-
-       g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
-       g_return_if_fail (old_group != NULL);
-       g_return_if_fail (new_group != NULL);
-
-       priv = GET_PRIV (manager);
-
-       data.old_group = old_group;
-       data.new_group = new_group;
+       GList *l;
 
-       g_hash_table_foreach (priv->lists,
-                             (GHFunc) contact_manager_rename_group_foreach,
-                             &data);
+       l = empathy_contact_list_get_members (EMPATHY_CONTACT_LIST (list));
+       *contacts = g_list_concat (*contacts, l);
 }
 
-GList *
-empathy_contact_manager_get_groups (EmpathyContactManager *manager)
+static GList *
+contact_manager_get_members (EmpathyContactList *manager)
 {
-       EmpathyContactManagerPriv *priv;
-       GList                     *groups = NULL;
+       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
+       GList                     *contacts = NULL;
 
        g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
 
-       priv = GET_PRIV (manager);
-
        g_hash_table_foreach (priv->lists,
-                             (GHFunc) contact_manager_get_groups_foreach,
-                             &groups);
+                             (GHFunc) contact_manager_get_members_foreach,
+                             &contacts);
 
-       return groups;
+       return contacts;
 }
 
-GList *
-empathy_contact_manager_get_contacts (EmpathyContactManager *manager)
+static void
+contact_manager_get_pendings_foreach (McAccount             *account,
+                                     EmpathyTpContactList  *list,
+                                     GList                **contacts)
 {
-       EmpathyContactManagerPriv *priv;
+       GList *l;
+
+       l = empathy_contact_list_get_pendings (EMPATHY_CONTACT_LIST (list));
+       *contacts = g_list_concat (*contacts, l);
+}
+
+static GList *
+contact_manager_get_pendings (EmpathyContactList *manager)
+{
+       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
        GList                     *contacts = NULL;
 
        g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
 
-       priv = GET_PRIV (manager);
-
        g_hash_table_foreach (priv->lists,
-                             (GHFunc) contact_manager_get_contacts_foreach,
+                             (GHFunc) contact_manager_get_pendings_foreach,
                              &contacts);
 
        return contacts;
 }
 
 static void
-contact_manager_setup_foreach (McAccount             *account,
-                              EmpathyContactList    *list,
-                              EmpathyContactManager *manager)
+contact_manager_get_all_groups_foreach (McAccount             *account,
+                                       EmpathyTpContactList  *list,
+                                       GList                **all_groups)
 {
-       empathy_contact_list_setup (list);
-}
+       GList *groups, *l;
 
-static gboolean
-contact_manager_find_foreach (McAccount              *account,
-                             EmpathyContactList     *list,
-                              ContactManagerFindData *data)
-{
-       data->contact = empathy_contact_list_find (list, data->id);
-       
-       if (data->contact) {
-               return TRUE;
+       groups = empathy_contact_list_get_all_groups (EMPATHY_CONTACT_LIST (list));
+       for (l = groups; l; l = l->next) {
+               if (!g_list_find_custom (*all_groups,
+                                        l->data,
+                                        (GCompareFunc) strcmp)) {
+                       *all_groups = g_list_prepend (*all_groups, l->data);
+               } else {
+                       g_free (l->data);
+               }
        }
 
-       return FALSE;
+       g_list_free (groups);
 }
 
-static void
-contact_manager_add_account (EmpathyContactManager *manager,
-                            McAccount             *account)
+static GList *
+contact_manager_get_all_groups (EmpathyContactList *manager)
 {
-       EmpathyContactManagerPriv *priv;
-       EmpathyContactList        *list;
+       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
+       GList                     *groups = NULL;
 
-       priv = GET_PRIV (manager);
+       g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
 
-       if (g_hash_table_lookup (priv->lists, account)) {
-               return;
-       }
+       g_hash_table_foreach (priv->lists,
+                             (GHFunc) contact_manager_get_all_groups_foreach,
+                             &groups);
 
-       gossip_debug (DEBUG_DOMAIN, "Adding new account: %s",
-                     mc_account_get_display_name (account));
+       return groups;
+}
 
-       list = empathy_contact_list_new (account);
-       if (!list) {
-               return;
-       }
+static GList *
+contact_manager_get_groups (EmpathyContactList *manager,
+                           EmpathyContact     *contact)
+{
+       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
+       EmpathyContactList        *list;
+       McAccount                 *account;
 
-       g_hash_table_insert (priv->lists, g_object_ref (account), list);
+       g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
 
-       /* Connect signals */
-       g_signal_connect (list, "contact-added",
-                         G_CALLBACK (contact_manager_added_cb),
-                         manager);
-       g_signal_connect (list, "contact-removed",
-                         G_CALLBACK (contact_manager_removed_cb),
-                         manager);
-       g_signal_connect (list, "destroy",
-                         G_CALLBACK (contact_manager_destroy_cb),
-                         manager);
+       account = empathy_contact_get_account (contact);
+       list = g_hash_table_lookup (priv->lists, account);
 
-       if (priv->setup) {
-               empathy_contact_list_setup (list);
+       if (list) {
+               return empathy_contact_list_get_groups (list, contact);
        }
-}
 
-static void
-contact_manager_added_cb (EmpathyContactList    *list,
-                         GossipContact         *contact,
-                         EmpathyContactManager *manager)
-{
-       g_signal_emit (manager, signals[CONTACT_ADDED], 0, contact);
+       return NULL;
 }
 
 static void
-contact_manager_removed_cb (EmpathyContactList    *list,
-                           GossipContact         *contact,
-                           EmpathyContactManager *manager)
+contact_manager_add_to_group (EmpathyContactList *manager,
+                             EmpathyContact     *contact,
+                             const gchar        *group)
 {
-       g_signal_emit (manager, signals[CONTACT_REMOVED], 0, contact);
+       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
+       EmpathyContactList        *list;
+       McAccount                 *account;
+
+       g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
+
+       account = empathy_contact_get_account (contact);
+       list = g_hash_table_lookup (priv->lists, account);
+
+       if (list) {
+               empathy_contact_list_add_to_group (list, contact, group);
+       }
 }
 
 static void
-contact_manager_destroy_cb (EmpathyContactList    *list,
-                           EmpathyContactManager *manager)
+contact_manager_remove_from_group (EmpathyContactList *manager,
+                                  EmpathyContact     *contact,
+                                  const gchar        *group)
 {
-       EmpathyContactManagerPriv *priv;
+       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
+       EmpathyContactList        *list;
        McAccount                 *account;
 
-       priv = GET_PRIV (manager);
-
-       account = empathy_contact_list_get_account (list);
-
-       gossip_debug (DEBUG_DOMAIN, "Removing account: %s",
-                     mc_account_get_display_name (account));
+       g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
 
-       /* Disconnect signals from the list */
-       g_signal_handlers_disconnect_by_func (list,
-                                             contact_manager_added_cb,
-                                             manager);
-       g_signal_handlers_disconnect_by_func (list,
-                                             contact_manager_removed_cb,
-                                             manager);
-       g_signal_handlers_disconnect_by_func (list,
-                                             contact_manager_destroy_cb,
-                                             manager);
+       account = empathy_contact_get_account (contact);
+       list = g_hash_table_lookup (priv->lists, account);
 
-       g_hash_table_remove (priv->lists, account);
+       if (list) {
+               empathy_contact_list_remove_from_group (list, contact, group);
+       }
 }
 
+typedef struct {
+       const gchar *old_group;
+       const gchar *new_group;
+} RenameGroupData;
+
 static void
-contact_manager_rename_group_foreach (McAccount                     *account,
-                                     EmpathyContactList            *list,
-                                     ContactManagerRenameGroupData *data)
+contact_manager_rename_group_foreach (McAccount            *account,
+                                     EmpathyTpContactList *list,
+                                     RenameGroupData      *data)
 {
-       empathy_contact_list_rename_group (list,
+       empathy_contact_list_rename_group (EMPATHY_CONTACT_LIST (list),
                                           data->old_group,
                                           data->new_group);
 }
 
 static void
-contact_manager_get_groups_foreach (McAccount           *account,
-                                   EmpathyContactList  *list,
-                                   GList              **all_groups)
+contact_manager_rename_group (EmpathyContactList *manager,
+                             const gchar        *old_group,
+                             const gchar        *new_group)
 {
-       GList *groups, *l;
+       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
+       RenameGroupData            data;
 
-       groups = empathy_contact_list_get_groups (list);
-       for (l = groups; l; l = l->next) {
-               if (!g_list_find_custom (*all_groups,
-                                        l->data,
-                                        (GCompareFunc) strcmp)) {
-                       *all_groups = g_list_append (*all_groups,
-                                                    g_strdup (l->data));
-               }
-               g_free (l->data);
-       }
-
-       g_list_free (groups);
-}
-
-static void
-contact_manager_get_contacts_foreach (McAccount           *account,
-                                     EmpathyContactList  *list,
-                                     GList              **contacts)
-{
-       GList *l;
+       g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
 
-       l = empathy_contact_list_get_contacts (list);
-       *contacts = g_list_concat (*contacts, l);
+       data.old_group = old_group;
+       data.new_group = new_group;
+       g_hash_table_foreach (priv->lists,
+                             (GHFunc) contact_manager_rename_group_foreach,
+                             &data);
 }
 
 static void
-contact_manager_status_changed_cb (MissionControl                  *mc,
-                                  TelepathyConnectionStatus        status,
-                                  McPresence                       presence,
-                                  TelepathyConnectionStatusReason  reason,
-                                  const gchar                     *unique_name,
-                                  EmpathyContactManager           *manager)
+contact_manager_iface_init (EmpathyContactListIface *iface)
 {
-       EmpathyContactManagerPriv *priv;
-       McAccount                 *account;
-
-       priv = GET_PRIV (manager);
-
-       if (status != TP_CONN_STATUS_CONNECTED) {
-               /* We only care about newly connected accounts */
-               return;
-       }
-
-       account = mc_account_lookup (unique_name);
-       contact_manager_add_account (manager, account);
-
-       g_object_unref (account);
+       iface->add               = contact_manager_add;
+       iface->remove            = contact_manager_remove;
+       iface->get_members       = contact_manager_get_members;
+       iface->get_pendings      = contact_manager_get_pendings;
+       iface->get_all_groups    = contact_manager_get_all_groups;
+       iface->get_groups        = contact_manager_get_groups;
+       iface->add_to_group      = contact_manager_add_to_group;
+       iface->remove_from_group = contact_manager_remove_from_group;
+       iface->rename_group      = contact_manager_rename_group;
 }