From 7978eacb5d49b518a7f7b4e7b92c8a7bfb8fc400 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 28 Sep 2011 13:41:11 +0200 Subject: Use g_cclosure_marshal_generic for all signals No more ugly marshallers \o/ --- libempathy/empathy-contact-list.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'libempathy/empathy-contact-list.c') diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c index d28866735..e532782d5 100644 --- 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_BOOLEAN, + g_cclosure_marshal_generic, G_TYPE_NONE, 2, EMPATHY_TYPE_CONTACT, G_TYPE_BOOLEAN); @@ -87,7 +86,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); @@ -97,7 +96,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); -- cgit v1.2.3