remove old school get_all_groups

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

diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c
index 3f24998fbf41322a436c105fc6b0687d609b5d46..b80071c533d1efedcdcc7aaed5d7b09f6ec1d9d8 100644 (file)
--- a/libempathy/empathy-contact-list.c
+++ b/libempathy/empathy-contact-list.c
@@ -145,18 +145,6 @@ empathy_contact_list_get_pendings (EmpathyContactList *list)
        return NULL;
 }
 
        return NULL;
 }
 

-GList *
-empathy_contact_list_get_all_groups (EmpathyContactList *list)
-{
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), NULL);
-
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_all_groups) {
-               return EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_all_groups (list);
-       }
-
-       return NULL;
-}
-

 GList *
 empathy_contact_list_get_groups (EmpathyContactList *list,
                                 EmpathyContact     *contact)
 GList *
 empathy_contact_list_get_groups (EmpathyContactList *list,
                                 EmpathyContact     *contact)

diff --git a/libempathy/empathy-contact-list.h b/libempathy/empathy-contact-list.h
index ddd81c332d8f77fbdf1fd781c3c066d0128a1f3f..a9149369bbcda3d23d0a8b615b1753fd796ec3f0 100644 (file)
--- a/libempathy/empathy-contact-list.h
+++ b/libempathy/empathy-contact-list.h
@@ -48,7 +48,6 @@ struct _EmpathyContactListIface {
                                               const gchar        *message);
        GList *          (*get_members)       (EmpathyContactList *list);
        GList *          (*get_pendings)      (EmpathyContactList *list);
                                               const gchar        *message);
        GList *          (*get_members)       (EmpathyContactList *list);
        GList *          (*get_pendings)      (EmpathyContactList *list);

-       GList *          (*get_all_groups)    (EmpathyContactList *list);

        GList *          (*get_groups)        (EmpathyContactList *list,
                                               EmpathyContact     *contact);
        void             (*add_to_group)      (EmpathyContactList *list,
        GList *          (*get_groups)        (EmpathyContactList *list,
                                               EmpathyContact     *contact);
        void             (*add_to_group)      (EmpathyContactList *list,


@@ -73,7 +72,6 @@ void     empathy_contact_list_remove            (EmpathyContactList *list,
                                                 const gchar        *message);
 GList *  empathy_contact_list_get_members       (EmpathyContactList *list);
 GList *  empathy_contact_list_get_pendings      (EmpathyContactList *list);
                                                 const gchar        *message);
 GList *  empathy_contact_list_get_members       (EmpathyContactList *list);
 GList *  empathy_contact_list_get_pendings      (EmpathyContactList *list);

-GList *  empathy_contact_list_get_all_groups    (EmpathyContactList *list);

 GList *  empathy_contact_list_get_groups        (EmpathyContactList *list,
                                                 EmpathyContact     *contact);
 void     empathy_contact_list_add_to_group      (EmpathyContactList *list,
 GList *  empathy_contact_list_get_groups        (EmpathyContactList *list,
                                                 EmpathyContact     *contact);
 void     empathy_contact_list_add_to_group      (EmpathyContactList *list,

diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index 1ec6cba185043c445042bd20d09298b32368992e..fd2b3e1a4f25239de58b6f22359ddc71ef6a3065 100644 (file)
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -415,42 +415,6 @@ contact_manager_get_pendings (EmpathyContactList *manager)
        return contacts;
 }
 
        return contacts;
 }
 

-static void
-contact_manager_get_all_groups_foreach (TpConnection          *connection,
-                                       EmpathyTpContactList  *list,
-                                       GList                **all_groups)
-{
-       GList *groups, *l;
-
-       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);
-               }
-       }
-
-       g_list_free (groups);
-}
-
-static GList *
-contact_manager_get_all_groups (EmpathyContactList *manager)
-{
-       EmpathyContactManagerPriv *priv = GET_PRIV (manager);
-       GList                     *groups = NULL;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), NULL);
-
-       g_hash_table_foreach (priv->lists,
-                             (GHFunc) contact_manager_get_all_groups_foreach,
-                             &groups);
-
-       return groups;
-}
-

 static GList *
 contact_manager_get_groups (EmpathyContactList *manager,
                            EmpathyContact     *contact)
 static GList *
 contact_manager_get_groups (EmpathyContactList *manager,
                            EmpathyContact     *contact)


@@ -569,7 +533,6 @@ contact_manager_iface_init (EmpathyContactListIface *iface)
        iface->remove            = contact_manager_remove;
        iface->get_members       = contact_manager_get_members;
        iface->get_pendings      = contact_manager_get_pendings;
        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->get_groups        = contact_manager_get_groups;
        iface->add_to_group      = contact_manager_add_to_group;
        iface->remove_from_group = contact_manager_remove_from_group;

diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index d3964d6bc7bcca67976514cc5073b6f1ac29b713..f116d15d35ae2c25033a1a706f84729ae6bd5f63 100644 (file)
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -1068,20 +1068,6 @@ tp_contact_list_get_pendings (EmpathyContactList *list)
        return ret;
 }
 
        return ret;
 }
 

-static GList *
-tp_contact_list_get_all_groups (EmpathyContactList *list)
-{
-       EmpathyTpContactListPriv *priv = GET_PRIV (list);
-       GList                    *ret, *l;
-
-       ret = g_hash_table_get_keys (priv->groups);
-       for (l = ret; l; l = l->next) {
-               l->data = g_strdup (l->data);
-       }
-
-       return ret;
-}
-

 static GList *
 tp_contact_list_get_groups (EmpathyContactList *list,
                            EmpathyContact     *contact)
 static GList *
 tp_contact_list_get_groups (EmpathyContactList *list,
                            EmpathyContact     *contact)


@@ -1205,7 +1191,6 @@ tp_contact_list_iface_init (EmpathyContactListIface *iface)
        iface->remove            = tp_contact_list_remove;
        iface->get_members       = tp_contact_list_get_members;
        iface->get_pendings      = tp_contact_list_get_pendings;
        iface->remove            = tp_contact_list_remove;
        iface->get_members       = tp_contact_list_get_members;
        iface->get_pendings      = tp_contact_list_get_pendings;

-       iface->get_all_groups    = tp_contact_list_get_all_groups;

        iface->get_groups        = tp_contact_list_get_groups;
        iface->add_to_group      = tp_contact_list_add_to_group;
        iface->remove_from_group = tp_contact_list_remove_from_group;
        iface->get_groups        = tp_contact_list_get_groups;
        iface->add_to_group      = tp_contact_list_add_to_group;
        iface->remove_from_group = tp_contact_list_remove_from_group;