Fix indentation Fix not returning the contact in tp_contact_list_find()

[empathy.git] / libempathy / empathy-contact-manager.c

diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index ebc6b05730c1d6e1727c989a1db8f1c1d8a55a3a..fa62da98fed3642f6ace2308408907fe75589d4b 100644 (file)
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -27,6 +27,7 @@
 #include <libtelepathy/tp-constants.h>
 
 #include "empathy-contact-manager.h"
 #include <libtelepathy/tp-constants.h>
 
 #include "empathy-contact-manager.h"

+#include "empathy-contact-list.h"

 #include "gossip-utils.h"
 #include "gossip-debug.h"
 
 #include "gossip-utils.h"
 #include "gossip-debug.h"
 


@@ -51,50 +52,55 @@ typedef struct {
        const gchar   *id;
 } ContactManagerFindData;
 
        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
-};
-
-static guint signals[LAST_SIGNAL];
-
-G_DEFINE_TYPE (EmpathyContactManager, empathy_contact_manager, G_TYPE_OBJECT);
+static void           empathy_contact_manager_class_init   (EmpathyContactManagerClass      *klass);
+static void           contact_manager_iface_init           (EmpathyContactListIface         *iface);
+static void           empathy_contact_manager_init         (EmpathyContactManager           *manager);
+static void           contact_manager_finalize             (GObject                         *object);
+static void           contact_manager_setup                (EmpathyContactList              *manager);
+static GossipContact *contact_manager_find                 (EmpathyContactList              *manager,
+                                                           const gchar                     *id);
+static void           contact_manager_add                  (EmpathyContactList              *manager,
+                                                           GossipContact                   *contact,
+                                                           const gchar                     *message);
+static void           contact_manager_remove               (EmpathyContactList              *manager,
+                                                           GossipContact                   *contact,
+                                                           const gchar                     *message);
+static GList *        contact_manager_get_contacts         (EmpathyContactList              *manager);
+static void           contact_manager_setup_foreach        (McAccount                       *account,
+                                                           EmpathyTpContactList            *list,
+                                                           EmpathyContactManager           *manager);
+static gboolean       contact_manager_find_foreach         (McAccount                       *account,
+                                                           EmpathyTpContactList            *list,
+                                                           ContactManagerFindData          *data);
+static void           contact_manager_add_account          (EmpathyContactManager           *manager,
+                                                           McAccount                       *account);
+static void           contact_manager_added_cb             (EmpathyTpContactList            *list,
+                                                           GossipContact                   *contact,
+                                                           EmpathyContactManager           *manager);
+static void           contact_manager_removed_cb           (EmpathyTpContactList            *list,
+                                                           GossipContact                   *contact,
+                                                           EmpathyContactManager           *manager);
+static void           contact_manager_destroy_cb           (EmpathyTpContactList            *list,
+                                                           EmpathyContactManager           *manager);
+static void           contact_manager_rename_group_foreach (McAccount                       *account,
+                                                           EmpathyTpContactList            *list,
+                                                           ContactManagerRenameGroupData   *data);
+static void           contact_manager_get_groups_foreach   (McAccount                       *account,
+                                                           EmpathyTpContactList            *list,
+                                                           GList                          **all_groups);
+static void           contact_manager_get_contacts_foreach (McAccount                       *account,
+                                                           EmpathyTpContactList            *list,
+                                                           GList                          **contacts);
+static void           contact_manager_status_changed_cb    (MissionControl                  *mc,
+                                                           TelepathyConnectionStatus        status,
+                                                           McPresence                       presence,
+                                                           TelepathyConnectionStatusReason  reason,
+                                                           const gchar                     *unique_name,
+                                                           EmpathyContactManager           *manager);
+
+G_DEFINE_TYPE_WITH_CODE (EmpathyContactManager, empathy_contact_manager, G_TYPE_OBJECT,
+                        G_IMPLEMENT_INTERFACE (EMPATHY_TYPE_CONTACT_LIST,
+                                               contact_manager_iface_init));

 
 static void
 empathy_contact_manager_class_init (EmpathyContactManagerClass *klass)
 
 static void
 empathy_contact_manager_class_init (EmpathyContactManagerClass *klass)


@@ -103,29 +109,19 @@ empathy_contact_manager_class_init (EmpathyContactManagerClass *klass)
 
        object_class->finalize = contact_manager_finalize;
 
 
        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));
 }
 
        g_type_class_add_private (object_class, sizeof (EmpathyContactManagerPriv));
 }
 

+static void
+contact_manager_iface_init (EmpathyContactListIface *iface)
+{
+       iface->setup = contact_manager_setup;
+       iface->find = contact_manager_find;
+       iface->add = contact_manager_add;
+       iface->remove = contact_manager_remove;
+       iface->get_contacts = contact_manager_get_contacts;
+}
+

 static void
 empathy_contact_manager_init (EmpathyContactManager *manager)
 {
 static void
 empathy_contact_manager_init (EmpathyContactManager *manager)
 {


@@ -185,8 +181,8 @@ empathy_contact_manager_new (void)
        return manager;
 }
 
        return manager;
 }
 

-void
-empathy_contact_manager_setup (EmpathyContactManager *manager)
+static void
+contact_manager_setup (EmpathyContactList *manager)

 {
        EmpathyContactManagerPriv *priv;
 
 {
        EmpathyContactManagerPriv *priv;
 


@@ -206,131 +202,145 @@ empathy_contact_manager_setup (EmpathyContactManager *manager)
        priv->setup = TRUE;
 }
 
        priv->setup = TRUE;
 }
 

-EmpathyContactList *
-empathy_contact_manager_get_list (EmpathyContactManager *manager,
-                                 McAccount             *account)
+static GossipContact *
+contact_manager_find (EmpathyContactList *manager,
+                     const gchar        *id)

 {
        EmpathyContactManagerPriv *priv;
 {
        EmpathyContactManagerPriv *priv;

+       ContactManagerFindData     data;

 
        g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
 
        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);
 
 
        priv = GET_PRIV (manager);
 

-       return g_hash_table_lookup (priv->lists, account);
+       data.contact = NULL;
+       data.id = id;
+
+       g_hash_table_find (priv->lists,
+                          (GHRFunc) contact_manager_find_foreach,
+                          &data);
+
+       return data.contact;

 }
 
 }
 

-GossipContact *
-empathy_contact_manager_get_own (EmpathyContactManager *manager,
-                                McAccount             *account)
+static void
+contact_manager_add (EmpathyContactList *manager,
+                    GossipContact      *contact,
+                    const gchar        *message)

 {
        EmpathyContactManagerPriv *priv;
        EmpathyContactList        *list;
 {
        EmpathyContactManagerPriv *priv;
        EmpathyContactList        *list;

+       McAccount                 *account;

 
 

-       g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
-       g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
+       g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
+       g_return_if_fail (GOSSIP_IS_CONTACT (contact));

 
        priv = GET_PRIV (manager);
 
 
        priv = GET_PRIV (manager);
 

+       account = gossip_contact_get_account (contact);

        list = g_hash_table_lookup (priv->lists, account);
        list = g_hash_table_lookup (priv->lists, account);

-       
-       if (!list) {
-               return NULL;
-       }

 
 

-       return empathy_contact_list_get_own (list);
+       if (list) {
+               empathy_contact_list_add (list, contact, message);
+       }

 }
 
 }
 

-GossipContact *
-empathy_contact_manager_create (EmpathyContactManager *manager,
-                               McAccount             *account,
-                               const gchar           *id)
+static void
+contact_manager_remove (EmpathyContactList *manager,
+                       GossipContact      *contact,
+                       const gchar        *message)

 {
        EmpathyContactManagerPriv *priv;
        EmpathyContactList        *list;
 {
        EmpathyContactManagerPriv *priv;
        EmpathyContactList        *list;

+       McAccount                 *account;

 
 

-       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);
+       g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
+       g_return_if_fail (GOSSIP_IS_CONTACT (contact));

 
        priv = GET_PRIV (manager);
 
 
        priv = GET_PRIV (manager);
 

+       account = gossip_contact_get_account (contact);

        list = g_hash_table_lookup (priv->lists, account);
        list = g_hash_table_lookup (priv->lists, account);

-       
-       if (!list) {
-               return NULL;
-       }

 
 

-       return empathy_contact_list_get_from_id (list, id);
+       if (list) {
+               empathy_contact_list_remove (list, contact, message);
+       }

 }
 
 }
 

-GossipContact *
-empathy_contact_manager_find (EmpathyContactManager *manager,
-                             const gchar           *id)
+static GList *
+contact_manager_get_contacts (EmpathyContactList *manager)

 {
        EmpathyContactManagerPriv *priv;
 {
        EmpathyContactManagerPriv *priv;

-       ContactManagerFindData     data;
+       GList                     *contacts = NULL;

 
        g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
 
        g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);

-       g_return_val_if_fail (id != NULL, NULL);

 
        priv = GET_PRIV (manager);
 
 
        priv = GET_PRIV (manager);
 

-       data.contact = NULL;
-       data.id = id;
+       g_hash_table_foreach (priv->lists,
+                             (GHFunc) contact_manager_get_contacts_foreach,
+                             &contacts);

 
 

-       g_hash_table_find (priv->lists,
-                          (GHRFunc) contact_manager_find_foreach,
-                          &data);
+       return contacts;
+}

 
 

-       return data.contact;
+EmpathyTpContactList *
+empathy_contact_manager_get_list (EmpathyContactManager *manager,
+                                 McAccount             *account)
+{
+       EmpathyContactManagerPriv *priv;
+
+       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);

 }
 
 }
 

-void
-empathy_contact_manager_add (EmpathyContactManager *manager,
-                            GossipContact         *contact,
-                            const gchar           *message)
+GossipContact *
+empathy_contact_manager_get_user (EmpathyContactManager *manager,
+                                 McAccount             *account)

 {
        EmpathyContactManagerPriv *priv;
 {
        EmpathyContactManagerPriv *priv;

-       EmpathyContactList        *list;
-       McAccount                 *account;
-       guint                      handle;
+       EmpathyTpContactList        *list;

 
 

-       g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
-       g_return_if_fail (GOSSIP_IS_CONTACT (contact));
+       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);
 
 
        priv = GET_PRIV (manager);
 

-       account = gossip_contact_get_account (contact);
-       handle = gossip_contact_get_handle (contact);

        list = g_hash_table_lookup (priv->lists, account);
        list = g_hash_table_lookup (priv->lists, account);

-
-       if (list) {
-               empathy_contact_list_add (list, handle, message);
+       
+       if (!list) {
+               return NULL;

        }
        }

+
+       return empathy_tp_contact_list_get_user (list);

 }
 
 }
 

-void
-empathy_contact_manager_remove (EmpathyContactManager *manager,
-                               GossipContact         *contact)
+GossipContact *
+empathy_contact_manager_create (EmpathyContactManager *manager,
+                               McAccount             *account,
+                               const gchar           *id)

 {
        EmpathyContactManagerPriv *priv;
 {
        EmpathyContactManagerPriv *priv;

-       EmpathyContactList        *list;
-       McAccount                 *account;
-       guint                      handle;
+       EmpathyTpContactList      *list;

 
 

-       g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager));
-       g_return_if_fail (GOSSIP_IS_CONTACT (contact));
+       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);
 
 
        priv = GET_PRIV (manager);
 

-       account = gossip_contact_get_account (contact);
-       handle = gossip_contact_get_handle (contact);

        list = g_hash_table_lookup (priv->lists, account);
        list = g_hash_table_lookup (priv->lists, account);

-
-       if (list) {
-               empathy_contact_list_remove (list, handle);
+       
+       if (!list) {
+               return NULL;

        }
        }

+
+       return empathy_tp_contact_list_get_from_id (list, id);

 }
 
 void
 }
 
 void


@@ -372,38 +382,22 @@ empathy_contact_manager_get_groups (EmpathyContactManager *manager)
        return groups;
 }
 
        return groups;
 }
 

-GList *
-empathy_contact_manager_get_contacts (EmpathyContactManager *manager)
-{
-       EmpathyContactManagerPriv *priv;
-       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,
-                             &contacts);
-
-       return contacts;
-}
-

 static void
 contact_manager_setup_foreach (McAccount             *account,
 static void
 contact_manager_setup_foreach (McAccount             *account,

-                              EmpathyContactList    *list,
+                              EmpathyTpContactList  *list,

                               EmpathyContactManager *manager)
 {
                               EmpathyContactManager *manager)
 {

-       empathy_contact_list_setup (list);
+       empathy_contact_list_setup (EMPATHY_CONTACT_LIST (list));

 }
 
 static gboolean
 contact_manager_find_foreach (McAccount              *account,
 }
 
 static gboolean
 contact_manager_find_foreach (McAccount              *account,

-                             EmpathyContactList     *list,
+                             EmpathyTpContactList   *list,

                               ContactManagerFindData *data)
 {
                               ContactManagerFindData *data)
 {

-       data->contact = empathy_contact_list_find (list, data->id);
-       
+       data->contact = empathy_contact_list_find (EMPATHY_CONTACT_LIST (list),
+                                                  data->id);
+

        if (data->contact) {
                return TRUE;
        }
        if (data->contact) {
                return TRUE;
        }


@@ -416,7 +410,7 @@ contact_manager_add_account (EmpathyContactManager *manager,
                             McAccount             *account)
 {
        EmpathyContactManagerPriv *priv;
                             McAccount             *account)
 {
        EmpathyContactManagerPriv *priv;

-       EmpathyContactList        *list;
+       EmpathyTpContactList        *list;

 
        priv = GET_PRIV (manager);
 
 
        priv = GET_PRIV (manager);
 


@@ -427,7 +421,7 @@ contact_manager_add_account (EmpathyContactManager *manager,
        gossip_debug (DEBUG_DOMAIN, "Adding new account: %s",
                      mc_account_get_display_name (account));
 
        gossip_debug (DEBUG_DOMAIN, "Adding new account: %s",
                      mc_account_get_display_name (account));
 

-       list = empathy_contact_list_new (account);
+       list = empathy_tp_contact_list_new (account);

        if (!list) {
                return;
        }
        if (!list) {
                return;
        }


@@ -446,28 +440,28 @@ contact_manager_add_account (EmpathyContactManager *manager,
                          manager);
 
        if (priv->setup) {
                          manager);
 
        if (priv->setup) {

-               empathy_contact_list_setup (list);
+               empathy_contact_list_setup (EMPATHY_CONTACT_LIST (list));

        }
 }
 
 static void
        }
 }
 
 static void

-contact_manager_added_cb (EmpathyContactList    *list,
+contact_manager_added_cb (EmpathyTpContactList  *list,

                          GossipContact         *contact,
                          EmpathyContactManager *manager)
 {
                          GossipContact         *contact,
                          EmpathyContactManager *manager)
 {

-       g_signal_emit (manager, signals[CONTACT_ADDED], 0, contact);
+       g_signal_emit_by_name (manager, "contact-added", contact);

 }
 
 static void
 }
 
 static void

-contact_manager_removed_cb (EmpathyContactList    *list,
+contact_manager_removed_cb (EmpathyTpContactList  *list,

                            GossipContact         *contact,
                            EmpathyContactManager *manager)
 {
                            GossipContact         *contact,
                            EmpathyContactManager *manager)
 {

-       g_signal_emit (manager, signals[CONTACT_REMOVED], 0, contact);
+       g_signal_emit_by_name (manager, "contact-removed", contact);

 }
 
 static void
 }
 
 static void

-contact_manager_destroy_cb (EmpathyContactList    *list,
+contact_manager_destroy_cb (EmpathyTpContactList  *list,

                            EmpathyContactManager *manager)
 {
        EmpathyContactManagerPriv *priv;
                            EmpathyContactManager *manager)
 {
        EmpathyContactManagerPriv *priv;


@@ -475,7 +469,7 @@ contact_manager_destroy_cb (EmpathyContactList    *list,
 
        priv = GET_PRIV (manager);
 
 
        priv = GET_PRIV (manager);
 

-       account = empathy_contact_list_get_account (list);
+       account = empathy_tp_contact_list_get_account (list);

 
        gossip_debug (DEBUG_DOMAIN, "Removing account: %s",
                      mc_account_get_display_name (account));
 
        gossip_debug (DEBUG_DOMAIN, "Removing account: %s",
                      mc_account_get_display_name (account));


@@ -496,22 +490,22 @@ contact_manager_destroy_cb (EmpathyContactList    *list,
 
 static void
 contact_manager_rename_group_foreach (McAccount                     *account,
 
 static void
 contact_manager_rename_group_foreach (McAccount                     *account,

-                                     EmpathyContactList            *list,
+                                     EmpathyTpContactList          *list,

                                      ContactManagerRenameGroupData *data)
 {
                                      ContactManagerRenameGroupData *data)
 {

-       empathy_contact_list_rename_group (list,
-                                          data->old_group,
-                                          data->new_group);
+       empathy_tp_contact_list_rename_group (list,
+                                             data->old_group,
+                                             data->new_group);

 }
 
 static void
 }
 
 static void

-contact_manager_get_groups_foreach (McAccount           *account,
-                                   EmpathyContactList  *list,
-                                   GList              **all_groups)
+contact_manager_get_groups_foreach (McAccount             *account,
+                                   EmpathyTpContactList  *list,
+                                   GList                **all_groups)

 {
        GList *groups, *l;
 
 {
        GList *groups, *l;
 

-       groups = empathy_contact_list_get_groups (list);
+       groups = empathy_tp_contact_list_get_groups (list);

        for (l = groups; l; l = l->next) {
                if (!g_list_find_custom (*all_groups,
                                         l->data,
        for (l = groups; l; l = l->next) {
                if (!g_list_find_custom (*all_groups,
                                         l->data,


@@ -526,13 +520,13 @@ contact_manager_get_groups_foreach (McAccount           *account,
 }
 
 static void
 }
 
 static void

-contact_manager_get_contacts_foreach (McAccount           *account,
-                                     EmpathyContactList  *list,
-                                     GList              **contacts)
+contact_manager_get_contacts_foreach (McAccount             *account,
+                                     EmpathyTpContactList  *list,
+                                     GList                **contacts)

 {
        GList *l;
 
 {
        GList *l;
 

-       l = empathy_contact_list_get_contacts (list);
+       l = empathy_contact_list_get_contacts (EMPATHY_CONTACT_LIST (list));

        *contacts = g_list_concat (*contacts, l);
 }
 
        *contacts = g_list_concat (*contacts, l);
 }