remove old blocking API

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

diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c
index d9493af1e8091307d7bf05fc4ef96ee06872f15a..38d0a446ac723fdfc630984e2263a49e2cb0c4da 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);
 
@@ -54,12 +53,21 @@ contact_list_base_init (gpointer klass)
        static gboolean initialized = FALSE;
 
        if (!initialized) {
+               g_signal_new ("member-renamed",
+                             G_TYPE_FROM_CLASS (klass),
+                             G_SIGNAL_RUN_LAST,
+                             0,
+                             NULL, NULL,
+                             g_cclosure_marshal_generic,
+                             G_TYPE_NONE,
+                             4, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING);
+
                g_signal_new ("members-changed",
                              G_TYPE_FROM_CLASS (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);
@@ -69,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);
@@ -79,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);
 
@@ -125,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)
 {