account-settings: allow to change the service

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

diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c
index 611a40fe54f006300ac752a8ae603df822c6f1f9..b80071c533d1efedcdcc7aaed5d7b09f6ec1d9d8 100644 (file)
--- a/libempathy/empathy-contact-list.c
+++ b/libempathy/empathy-contact-list.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include "empathy-contact-list.h"
-#include "empathy-marshal.h"
 
 static void contact_list_base_init (gpointer klass);
 
@@ -59,7 +58,7 @@ contact_list_base_init (gpointer klass)
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
-                             _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING,
+                             g_cclosure_marshal_generic,
                              G_TYPE_NONE,
                              4, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING);
 
@@ -68,7 +67,7 @@ contact_list_base_init (gpointer klass)
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
-                             _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING_BOOLEAN,
+                             g_cclosure_marshal_generic,
                              G_TYPE_NONE,
                              5, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT,
                              G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
@@ -78,7 +77,7 @@ contact_list_base_init (gpointer klass)
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
-                             _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING_BOOLEAN,
+                             g_cclosure_marshal_generic,
                              G_TYPE_NONE,
                              5, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT,
                              G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
@@ -88,7 +87,7 @@ contact_list_base_init (gpointer klass)
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
-                             _empathy_marshal_VOID__OBJECT_STRING_BOOLEAN,
+                             g_cclosure_marshal_generic,
                              G_TYPE_NONE,
                              3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
@@ -134,18 +133,6 @@ empathy_contact_list_get_members (EmpathyContactList *list)
        return NULL;
 }
 
-EmpathyContactMonitor *
-empathy_contact_list_get_monitor (EmpathyContactList *list)
-{
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), NULL);
-
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_monitor) {
-               return EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_monitor (list);
-       }
-
-       return NULL;
-}
-
 GList *
 empathy_contact_list_get_pendings (EmpathyContactList *list)
 {
@@ -158,18 +145,6 @@ empathy_contact_list_get_pendings (EmpathyContactList *list)
        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)
@@ -237,55 +212,3 @@ empathy_contact_list_remove_group (EmpathyContactList *list,
                EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_group (list, group);
        }
 }
-
-EmpathyContactListFlags
-empathy_contact_list_get_flags (EmpathyContactList *list)
-{
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list), 0);
-
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_flags) {
-               return EMPATHY_CONTACT_LIST_GET_IFACE (list)->get_flags (list);
-       } else {
-               return 0;
-       }
-}
-
-gboolean
-empathy_contact_list_is_favourite (EmpathyContactList *list,
-                                   EmpathyContact     *contact)
-{
-#if HAVE_FAVOURITE_CONTACTS
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->is_favourite) {
-               return EMPATHY_CONTACT_LIST_GET_IFACE (list)->is_favourite (
-                                list, contact);
-       }
-#endif /* HAVE_FAVOURITE_CONTACTS */
-
-        return FALSE;
-}
-
-void
-empathy_contact_list_add_to_favourites (EmpathyContactList *list,
-                                        EmpathyContact     *contact)
-{
-#if HAVE_FAVOURITE_CONTACTS
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->add_favourite) {
-                EMPATHY_CONTACT_LIST_GET_IFACE (list)->add_favourite (list,
-                                contact);
-       }
-#endif /* HAVE_FAVOURITE_CONTACTS */
-}
-
-void
-empathy_contact_list_remove_from_favourites (EmpathyContactList *list,
-                                             EmpathyContact     *contact)
-{
-#if HAVE_FAVOURITE_CONTACTS
-       if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_favourite) {
-                EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_favourite (list,
-                                contact);
-       }
-#endif /* HAVE_FAVOURITE_CONTACTS */
-}
-
-