Use g_cclosure_marshal_generic for all signals

No more ugly marshallers \o/

45 files changed, 93 insertions, 190 deletions

diff --git a/configure.ac b/configure.ac
index e72609779..9ca9f61e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AC_COPYRIGHT([
 
 # Hardp deps
 FOLKS_REQUIRED=0.6.2
-GLIB_REQUIRED=2.28.0
+GLIB_REQUIRED=2.30.0
 GNUTLS_REQUIRED=2.8.5
 GTK_REQUIRED=3.0.2
 GSTREAMER_REQUIRED=0.10.32
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 31e0ec8cc..7d790a81a 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -19,9 +19,6 @@ AM_CPPFLAGS =                                           \
 	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = 					\
-	empathy-gtk-marshal.h				\
-	empathy-gtk-marshal.c				\
-	empathy-gtk-marshal.list			\
 	empathy-gtk-enum-types.h			\
 	empathy-gtk-enum-types.c
 
@@ -216,24 +213,6 @@ ui_DATA = 					\
 	empathy-search-bar.ui			\
 	empathy-individual-widget.ui
 
-empathy-gtk-marshal.list: $(libempathy_gtk_la_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*empathy_gtk_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(libempathy_gtk_la_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	@if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-	else \
-		mv $@.tmp $@; \
-	fi
-
-%-marshal.h: %-marshal.list Makefile
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
-
-%-marshal.c: %-marshal.list Makefile
-	$(AM_V_GEN)echo "#include \"empathy-gtk-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
-
 empathy-gtk-enum-types.h: stamp-empathy-gtk-enum-types.h
 	$(AM_V_GEN)true
 stamp-empathy-gtk-enum-types.h: Makefile $(libempathy_gtk_headers)
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index ad4f77846..863992871 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -205,7 +205,7 @@ empathy_account_chooser_class_init (EmpathyAccountChooserClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      0);
 
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 911304c86..897b9bbf2 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -2363,7 +2363,7 @@ empathy_account_widget_class_init (EmpathyAccountWidgetClass *klass)
   signals[HANDLE_APPLY] =
     g_signal_new ("handle-apply", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__BOOLEAN,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_BOOLEAN);
 
@@ -2371,14 +2371,14 @@ empathy_account_widget_class_init (EmpathyAccountWidgetClass *klass)
   signals[ACCOUNT_CREATED] =
       g_signal_new ("account-created", G_TYPE_FROM_CLASS (klass),
           G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_VOID__OBJECT,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE,
           1, G_TYPE_OBJECT);
 
   signals[CANCELLED] =
       g_signal_new ("cancelled", G_TYPE_FROM_CLASS (klass),
           G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_VOID__VOID,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE,
           0);
 
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 0fe972481..0a04fe0c0 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -201,7 +201,7 @@ empathy_avatar_chooser_class_init (EmpathyAvatarChooserClass *klass)
             G_SIGNAL_RUN_LAST,
             0,
             NULL, NULL,
-            g_cclosure_marshal_VOID__VOID,
+            g_cclosure_marshal_generic,
             G_TYPE_NONE, 0);
 
   /**
diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 9c1a6e53b..c2325adec 100644
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -183,7 +183,7 @@ empathy_cell_renderer_activatable_class_init (
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        g_cclosure_marshal_VOID__STRING,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_STRING);
 
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index c9f6dd9d5..a8903b476 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -52,7 +52,6 @@
 #include "empathy-contact-list-store.h"
 #include "empathy-contact-list-view.h"
 #include "empathy-contact-menu.h"
-#include "empathy-gtk-marshal.h"
 #include "empathy-input-text-view.h"
 #include "empathy-search-bar.h"
 #include "empathy-theme-manager.h"
@@ -3241,7 +3240,7 @@ empathy_chat_class_init (EmpathyChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__BOOLEAN,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      1, G_TYPE_BOOLEAN);
 
@@ -3251,7 +3250,7 @@ empathy_chat_class_init (EmpathyChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_gtk_marshal_VOID__OBJECT_BOOLEAN,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      2, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN);
 
@@ -3261,7 +3260,7 @@ empathy_chat_class_init (EmpathyChatClass *klass)
 				  G_SIGNAL_RUN_LAST,
 				  0,
 				  NULL, NULL,
-				  g_cclosure_marshal_VOID__POINTER,
+				  g_cclosure_marshal_generic,
 				  G_TYPE_NONE,
 				  1, G_TYPE_STRV);
 
diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
index 7faee3e09..e9269a9b6 100644
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -118,7 +118,7 @@ empathy_contact_chooser_class_init (
             G_SIGNAL_RUN_LAST,
             0,
             NULL, NULL,
-            g_cclosure_marshal_VOID__OBJECT,
+            g_cclosure_marshal_generic,
             G_TYPE_NONE,
             1, FOLKS_TYPE_INDIVIDUAL);
 }
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 277842ff5..f8c055c7e 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -49,7 +49,6 @@
 #include "empathy-cell-renderer-activatable.h"
 #include "empathy-ui-utils.h"
 #include "empathy-gtk-enum-types.h"
-#include "empathy-gtk-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <libempathy/empathy-debug.h>
@@ -1784,7 +1783,7 @@ empathy_contact_list_view_class_init (EmpathyContactListViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_gtk_marshal_VOID__OBJECT_STRING_STRING,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_STRING);
 
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 5d24cf120..77cbc57d5 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -664,7 +664,7 @@ empathy_individual_menu_class_init (EmpathyIndividualMenuClass *klass)
   signals[SIGNAL_LINK_CONTACTS_ACTIVATED] =
       g_signal_new ("link-contacts-activated", G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_VOID__OBJECT,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 1, EMPATHY_TYPE_LINKING_DIALOG);
 
   g_type_class_add_private (object_class, sizeof (EmpathyIndividualMenuPriv));
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 03fe897ea..51c9dfc29 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -55,7 +55,6 @@
 #include "empathy-cell-renderer-activatable.h"
 #include "empathy-ui-utils.h"
 #include "empathy-gtk-enum-types.h"
-#include "empathy-gtk-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <libempathy/empathy-debug.h>
@@ -2152,7 +2151,7 @@ empathy_individual_view_class_init (EmpathyIndividualViewClass *klass)
       G_SIGNAL_RUN_LAST,
       G_STRUCT_OFFSET (EmpathyIndividualViewClass, drag_individual_received),
       NULL, NULL,
-      _empathy_gtk_marshal_VOID__UINT_OBJECT_STRING_STRING,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 4, G_TYPE_UINT, FOLKS_TYPE_INDIVIDUAL,
       G_TYPE_STRING, G_TYPE_STRING);
 
@@ -2162,7 +2161,7 @@ empathy_individual_view_class_init (EmpathyIndividualViewClass *klass)
       G_SIGNAL_RUN_LAST,
       G_STRUCT_OFFSET (EmpathyIndividualViewClass, drag_persona_received),
       NULL, NULL,
-      _empathy_gtk_marshal_BOOLEAN__UINT_OBJECT_OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN, 3, G_TYPE_UINT, FOLKS_TYPE_PERSONA, FOLKS_TYPE_INDIVIDUAL);
 
   g_object_class_install_property (object_class,
diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c
index 0fbd7b5fd..7a6bd7898 100644
--- a/libempathy-gtk/empathy-irc-network-chooser.c
+++ b/libempathy-gtk/empathy-irc-network-chooser.c
@@ -348,7 +348,7 @@ empathy_irc_network_chooser_class_init (EmpathyIrcNetworkChooserClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       0);
 
diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
index 422bfcb73..968adca77 100644
--- a/libempathy-gtk/empathy-live-search.c
+++ b/libempathy-gtk/empathy-live-search.c
@@ -30,7 +30,6 @@
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-live-search.h"
-#include "empathy-gtk-marshal.h"
 
 G_DEFINE_TYPE (EmpathyLiveSearch, empathy_live_search, GTK_TYPE_HBOX)
 
@@ -546,7 +545,7 @@ empathy_live_search_class_init (EmpathyLiveSearchClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 0);
 
   signals[KEYNAV] = g_signal_new ("key-navigation",
@@ -554,7 +553,7 @@ empathy_live_search_class_init (EmpathyLiveSearchClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       g_signal_accumulator_true_handled, NULL,
-      _empathy_gtk_marshal_BOOLEAN__BOXED,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
   param_spec = g_param_spec_object ("hook-widget", "Live Search Hook Widget",
diff --git a/libempathy-gtk/empathy-persona-view.c b/libempathy-gtk/empathy-persona-view.c
index d5a8c69ab..7df94a630 100644
--- a/libempathy-gtk/empathy-persona-view.c
+++ b/libempathy-gtk/empathy-persona-view.c
@@ -46,7 +46,6 @@
 #include "empathy-cell-renderer-text.h"
 #include "empathy-cell-renderer-activatable.h"
 #include "empathy-gtk-enum-types.h"
-#include "empathy-gtk-marshal.h"
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
@@ -715,7 +714,7 @@ empathy_persona_view_class_init (EmpathyPersonaViewClass *klass)
       G_SIGNAL_RUN_LAST,
       G_STRUCT_OFFSET (EmpathyPersonaViewClass, drag_individual_received),
       NULL, NULL,
-      _empathy_gtk_marshal_BOOLEAN__UINT_OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN, 2, G_TYPE_UINT, FOLKS_TYPE_INDIVIDUAL);
 
   /* We override the "model" property so that we can wrap it in a
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index c771392b9..28cbbf3bc 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -590,7 +590,7 @@ empathy_theme_manager_class_init (EmpathyThemeManagerClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      0);
 
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 3cd971a5d..079b4736b 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -20,9 +20,6 @@ AM_CPPFLAGS =                                           \
 	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = 					\
-	empathy-marshal.h				\
-	empathy-marshal.c				\
-	empathy-marshal.list				\
 	empathy-enum-types.h				\
 	empathy-enum-types.c
 
@@ -135,24 +132,6 @@ check_c_sources = \
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
-empathy-marshal.list: $(libempathy_la_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*empathy_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(libempathy_la_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	@if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-	else \
-		mv $@.tmp $@; \
-	fi
-
-empathy-marshal.h: empathy-marshal.list Makefile
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_empathy_marshal $< > empathy-marshal.h
-
-empathy-marshal.c: empathy-marshal.list Makefile
-	$(AM_V_GEN)echo "#include \"empathy-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) --body --prefix=_empathy_marshal $< >> empathy-marshal.c
-
 empathy-enum-types.h: stamp-empathy-enum-types.h
 	$(AM_V_GEN)true
 stamp-empathy-enum-types.h: $(libempathy_headers) Makefile
@@ -203,7 +182,6 @@ ircnetworks_DATA =		\
 	irc-networks.xml
 
 EXTRA_DIST = 			\
-	empathy-marshal.list	\
 	$(dtd_DATA)		\
 	$(ircnetworks_DATA)
 
diff --git a/libempathy/cheese-camera-device-monitor.c b/libempathy/cheese-camera-device-monitor.c
index 85c6a0aa4..78b40fb70 100644
--- a/libempathy/cheese-camera-device-monitor.c
+++ b/libempathy/cheese-camera-device-monitor.c
@@ -43,7 +43,6 @@
 #endif
 
 #include "cheese-camera-device-monitor.h"
-#include "empathy-marshal.h"
 
 /**
  * SECTION:cheese-camera-device-monitor
@@ -360,7 +359,7 @@ cheese_camera_device_monitor_class_init (CheeseCameraDeviceMonitorClass *klass)
                                          G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                                          G_STRUCT_OFFSET (CheeseCameraDeviceMonitorClass, added),
                                          NULL, NULL,
-                                         _empathy_marshal_VOID__STRING_STRING_STRING_INT,
+                                         g_cclosure_marshal_generic,
                                          G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
 
   /**
@@ -375,7 +374,7 @@ cheese_camera_device_monitor_class_init (CheeseCameraDeviceMonitorClass *klass)
                                            G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                                            G_STRUCT_OFFSET (CheeseCameraDeviceMonitorClass, removed),
                                            NULL, NULL,
-                                           g_cclosure_marshal_VOID__STRING,
+                                           g_cclosure_marshal_generic,
                                            G_TYPE_NONE, 1, G_TYPE_STRING);
 
   g_type_class_add_private (klass, sizeof (CheeseCameraDeviceMonitorPrivate));
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 50c8f992d..cd6b69e8c 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -336,7 +336,7 @@ empathy_account_settings_class_init (
       g_signal_new ("password-retrieved",
           G_TYPE_FROM_CLASS (empathy_account_settings_class),
           G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_VOID__VOID,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 0);
 }
 
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index 56b3b73eb..4eb5134dd 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -552,7 +552,7 @@ empathy_auth_factory_class_init (EmpathyAuthFactoryClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, EMPATHY_TYPE_SERVER_TLS_HANDLER);
 
@@ -561,7 +561,7 @@ empathy_auth_factory_class_init (EmpathyAuthFactoryClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, EMPATHY_TYPE_SERVER_SASL_HANDLER);
 }
diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c
index 3b5221eb8..7d9d695e8 100644
--- a/libempathy/empathy-camera-monitor.c
+++ b/libempathy/empathy-camera-monitor.c
@@ -228,14 +228,14 @@ empathy_camera_monitor_class_init (EmpathyCameraMonitorClass *klass)
       g_signal_new ("added", G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
           0, NULL, NULL,
-          g_cclosure_marshal_VOID__BOXED,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 1, EMPATHY_TYPE_CAMERA);
 
   signals[CAMERA_REMOVED] =
       g_signal_new ("removed", G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
           0, NULL, NULL,
-          g_cclosure_marshal_VOID__BOXED,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 1, EMPATHY_TYPE_CAMERA);
 
   g_type_class_add_private (object_class,
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 67ec6cddb..9a9a7b250 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -648,7 +648,7 @@ empathy_chatroom_manager_class_init (EmpathyChatroomManagerClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, EMPATHY_TYPE_CHATROOM);
 
@@ -656,7 +656,7 @@ empathy_chatroom_manager_class_init (EmpathyChatroomManagerClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, EMPATHY_TYPE_CHATROOM);
 
diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
index 30a9b8471..a45731686 100644
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -150,7 +150,7 @@ empathy_connection_managers_class_init (
     G_TYPE_FROM_CLASS (object_class),
     G_SIGNAL_RUN_LAST,
     0, NULL, NULL,
-    g_cclosure_marshal_VOID__VOID,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 0);
 }
 
diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c
index 3c9805c54..f84505f9b 100644
--- a/libempathy/empathy-connectivity.c
+++ b/libempathy/empathy-connectivity.c
@@ -33,7 +33,6 @@
 #include <telepathy-glib/util.h>
 
 #include "empathy-utils.h"
-#include "empathy-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONNECTIVITY
 #include "empathy-debug.h"
@@ -220,7 +219,7 @@ empathy_connectivity_init (EmpathyConnectivity *connectivity)
           "net.connman.Manager");
 
       dbus_g_object_register_marshaller (
-          _empathy_marshal_VOID__STRING,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INVALID);
 
       dbus_g_proxy_add_signal (priv->proxy, "StateChanged",
@@ -364,7 +363,7 @@ empathy_connectivity_class_init (EmpathyConnectivityClass *klass)
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        _empathy_marshal_VOID__BOOLEAN,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_BOOLEAN, NULL);
 
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);
 
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index f27de0414..935afb556 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -44,7 +44,6 @@
 #include "empathy-individual-manager.h"
 #include "empathy-utils.h"
 #include "empathy-enum-types.h"
-#include "empathy-marshal.h"
 #include "empathy-location.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
@@ -405,7 +404,7 @@ empathy_contact_class_init (EmpathyContactClass *class)
                   G_SIGNAL_RUN_LAST,
                   0,
                   NULL, NULL,
-                  _empathy_marshal_VOID__UINT_UINT,
+                  g_cclosure_marshal_generic,
                   G_TYPE_NONE,
                   2, G_TYPE_UINT,
                   G_TYPE_UINT);
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index 5097f9b1e..fb2497a54 100644
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@ -27,7 +27,6 @@
 
 #include "empathy-ft-factory.h"
 #include "empathy-ft-handler.h"
-#include "empathy-marshal.h"
 #include "empathy-request-util.h"
 #include "empathy-utils.h"
 
@@ -126,7 +125,7 @@ empathy_ft_factory_class_init (EmpathyFTFactoryClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _empathy_marshal_VOID__OBJECT_POINTER,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 2, EMPATHY_TYPE_FT_HANDLER, G_TYPE_POINTER);
 
   /**
@@ -149,7 +148,7 @@ empathy_ft_factory_class_init (EmpathyFTFactoryClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _empathy_marshal_VOID__OBJECT_POINTER,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 2, EMPATHY_TYPE_FT_HANDLER, G_TYPE_POINTER);
 }
 
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 4cc04c8e0..facc49a3b 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -30,7 +30,6 @@
 
 #include "empathy-ft-handler.h"
 #include "empathy-tp-contact-factory.h"
-#include "empathy-marshal.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
 
@@ -440,7 +439,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[TRANSFER_STARTED] =
     g_signal_new ("transfer-started", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__OBJECT,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, EMPATHY_TYPE_TP_FILE);
 
@@ -455,7 +454,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[TRANSFER_DONE] =
     g_signal_new ("transfer-done", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__OBJECT,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, EMPATHY_TYPE_TP_FILE);
 
@@ -473,7 +472,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[TRANSFER_ERROR] =
     g_signal_new ("transfer-error", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__POINTER,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_POINTER);
 
@@ -492,7 +491,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[TRANSFER_PROGRESS] =
     g_signal_new ("transfer-progress", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        _empathy_marshal_VOID__UINT64_UINT64_UINT_DOUBLE,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         4, G_TYPE_UINT64, G_TYPE_UINT64, G_TYPE_UINT, G_TYPE_DOUBLE);
 
@@ -510,7 +509,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[HASHING_STARTED] =
     g_signal_new ("hashing-started", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__VOID,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE, 0);
 
   /**
@@ -525,7 +524,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[HASHING_PROGRESS] =
     g_signal_new ("hashing-progress", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        _empathy_marshal_VOID__UINT64_UINT64,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         2, G_TYPE_UINT64, G_TYPE_UINT64);
 
@@ -539,7 +538,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[HASHING_DONE] =
     g_signal_new ("hashing-done", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__VOID,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE, 0);
 }
 
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index 8d140178c..833a5692d 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -35,7 +35,6 @@
 #include <extensions/extensions.h>
 
 #include "empathy-individual-manager.h"
-#include "empathy-marshal.h"
 #include "empathy-utils.h"
 #include "empathy-contact-manager.h"
 
@@ -314,7 +313,7 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass)
           G_SIGNAL_RUN_LAST,
           0,
           NULL, NULL,
-          _empathy_marshal_VOID__OBJECT_STRING_BOOLEAN,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 3, FOLKS_TYPE_INDIVIDUAL, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
   signals[FAVOURITES_CHANGED] =
@@ -323,7 +322,7 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass)
           G_SIGNAL_RUN_LAST,
           0,
           NULL, NULL,
-          _empathy_marshal_VOID__OBJECT_BOOLEAN,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 2, FOLKS_TYPE_INDIVIDUAL, G_TYPE_BOOLEAN);
 
   signals[MEMBERS_CHANGED] =
@@ -332,7 +331,7 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass)
           G_SIGNAL_RUN_LAST,
           0,
           NULL, NULL,
-          _empathy_marshal_VOID__STRING_OBJECT_OBJECT_UINT,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE,
           4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_UINT);
 
diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c
index 68e071be8..ec0cfffb1 100644
--- a/libempathy/empathy-irc-network.c
+++ b/libempathy/empathy-irc-network.c
@@ -27,7 +27,6 @@
 
 #include <telepathy-glib/util.h>
 
-#include "empathy-marshal.h"
 #include "empathy-irc-network.h"
 #include "empathy-utils.h"
 
@@ -216,7 +215,7 @@ empathy_irc_network_class_init (EmpathyIrcNetworkClass *klass)
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 0);
 }
 
diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c
index 41da5385e..cb1fbfc2f 100644
--- a/libempathy/empathy-irc-server.c
+++ b/libempathy/empathy-irc-server.c
@@ -26,7 +26,6 @@
 
 #include <telepathy-glib/util.h>
 
-#include "empathy-marshal.h"
 #include "empathy-irc-server.h"
 #include "empathy-utils.h"
 
@@ -202,7 +201,7 @@ empathy_irc_server_class_init (EmpathyIrcServerClass *klass)
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 0);
 }
 
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index 78db431e6..d37851405 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -337,7 +337,7 @@ empathy_server_sasl_handler_class_init (EmpathyServerSASLHandlerClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 0);
 }
 
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 11a6e7de5..dcd6193ec 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -30,7 +30,6 @@
 #include "empathy-tp-chat.h"
 #include "empathy-tp-contact-factory.h"
 #include "empathy-contact-list.h"
-#include "empathy-marshal.h"
 #include "empathy-request-util.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
@@ -1267,7 +1266,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      1, EMPATHY_TYPE_MESSAGE);
 
@@ -1277,7 +1276,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__STRING_UINT_STRING,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      3, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING);
 
@@ -1287,7 +1286,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__OBJECT_UINT,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      2, EMPATHY_TYPE_CONTACT, G_TYPE_UINT);
 
@@ -1297,7 +1296,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__STRING_BOXED,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      2, G_TYPE_STRING, G_TYPE_VALUE);
 
@@ -1307,7 +1306,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      1, EMPATHY_TYPE_MESSAGE);
 
diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
index c7a6a7073..ff2099ee9 100644
--- a/libempathy/empathy-tp-file.c
+++ b/libempathy/empathy-tp-file.c
@@ -44,7 +44,6 @@
 #include <telepathy-glib/interfaces.h>
 
 #include "empathy-tp-file.h"
-#include "empathy-marshal.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c
index b70578156..1e53facdc 100644
--- a/libempathy/empathy-tp-roomlist.c
+++ b/libempathy/empathy-tp-roomlist.c
@@ -432,7 +432,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      1, EMPATHY_TYPE_CHATROOM);
 
@@ -442,7 +442,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      0);
 
@@ -452,7 +452,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass)
 			      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      1, G_TYPE_POINTER);
 
diff --git a/libempathy/empathy-tp-streamed-media.c b/libempathy/empathy-tp-streamed-media.c
index b79e4b6b5..87ca01db5 100644
--- a/libempathy/empathy-tp-streamed-media.c
+++ b/libempathy/empathy-tp-streamed-media.c
@@ -30,7 +30,6 @@
 #include "empathy-tp-streamed-media.h"
 #include "empathy-tp-contact-factory.h"
 #include "empathy-utils.h"
-#include "empathy-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
@@ -566,7 +565,7 @@ empathy_tp_streamed_media_class_init (EmpathyTpStreamedMediaClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _empathy_marshal_VOID__UINT_STRING,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       2, G_TYPE_UINT, G_TYPE_STRING);
 
@@ -575,7 +574,7 @@ empathy_tp_streamed_media_class_init (EmpathyTpStreamedMediaClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _empathy_marshal_VOID__UINT_STRING,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       2, G_TYPE_UINT, G_TYPE_STRING);
 }
diff --git a/src/Makefile.am b/src/Makefile.am
index ef4e8d964..c6855d338 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,11 +59,6 @@ libexec_PROGRAMS = \
 	empathy-av \
 	empathy-chat
 
-BUILT_SOURCES = \
-	src-marshal.h \
-	src-marshal.c \
-	src-marshal.list
-
 empathy_accounts_SOURCES =						\
 	empathy-accounts.c empathy-accounts.h				\
 	$(NULL)
@@ -102,8 +97,6 @@ empathy_av_SOURCES = \
 	empathy-mic-monitor.h
 	$(NULL)
 
-nodist_empathy_av_SOURCES = $(BUILT_SOURCES)
-
 empathy_av_CFLAGS = $(EMPATHY_AV_CFLAGS)
 empathy_av_LDFLAGS = $(EMPATHY_AV_LIBS) $(LIBM)
 
@@ -161,8 +154,6 @@ empathy_call_SOURCES = \
        empathy-mic-monitor.c \
        empathy-mic-monitor.h
 
-nodist_empathy_call_SOURCES = $(BUILT_SOURCES)
-
 empathy_call_CFLAGS = $(EMPATHY_CALL_CFLAGS)
 empathy_call_LDFLAGS = $(EMPATHY_CALL_LIBS)
 
@@ -198,8 +189,6 @@ empathy_LDADD =								\
         $(LIBCHAMPLAIN_LIBS)						\
 	$(NULL)
 
-nodist_empathy_SOURCES = $(BUILT_SOURCES)
-
 check_c_sources = \
     $(empathy_handwritten_source) \
     $(empathy_logs_SOURCES) \
@@ -246,23 +235,3 @@ dist_man_MANS =			\
 	empathy.1 \
 	empathy-accounts.1
 
-src-marshal.list: $(empathy_SOURCES) $(empathy_call_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*src_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(empathy_SOURCES) $(empathy_av_SOURCES) $(empathy_call_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	@if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-	else \
-		mv $@.tmp $@; \
-	fi
-
-%-marshal.h: %-marshal.list Makefile
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
-
-%-marshal.c: %-marshal.list Makefile
-	$(AM_V_GEN)echo "#include \"src-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
-
-CLEANFILES = $(BUILT_SOURCES)
-
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index 203082dce..b287555a0 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -27,7 +27,6 @@
 
 #include "empathy-audio-src.h"
 
-#include "src-marshal.h"
 #include "empathy-mic-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
@@ -336,7 +335,7 @@ empathy_audio_src_class_init (EmpathyGstAudioSrcClass
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    g_cclosure_marshal_VOID__DOUBLE,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 1, G_TYPE_DOUBLE);
 
   param_spec = g_param_spec_double ("rms-level", "RMS level", "RMS level",
@@ -349,7 +348,7 @@ empathy_audio_src_class_init (EmpathyGstAudioSrcClass
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    g_cclosure_marshal_VOID__DOUBLE,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 1, G_TYPE_DOUBLE);
 }
 
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index ba17270c7..b3c85f4b0 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -36,7 +36,6 @@
 
 #include "empathy-call-factory.h"
 #include "empathy-call-handler.h"
-#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -141,7 +140,7 @@ empathy_call_factory_class_init (EmpathyCallFactoryClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _src_marshal_VOID__OBJECT_BOOLEAN,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       2, EMPATHY_TYPE_CALL_HANDLER, G_TYPE_BOOLEAN);
 
@@ -150,7 +149,7 @@ empathy_call_factory_class_init (EmpathyCallFactoryClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _src_marshal_BOOLEAN__UINT_OBJECT_OBJECT_OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       4, G_TYPE_UINT, TPY_TYPE_CALL_CHANNEL,
       TP_TYPE_CHANNEL_DISPATCH_OPERATION,
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index cf93a1de3..9fe89337d 100644
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -36,7 +36,6 @@
 #include <libempathy-gtk/empathy-call-utils.h>
 
 #include "empathy-call-handler.h"
-#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -457,55 +456,55 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass)
   signals[CONFERENCE_ADDED] =
     g_signal_new ("conference-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, FS_TYPE_CONFERENCE);
 
   signals[CONFERENCE_REMOVED] =
     g_signal_new ("conference-removed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, FS_TYPE_CONFERENCE);
 
   signals[SRC_PAD_ADDED] =
     g_signal_new ("src-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
   signals[SINK_PAD_ADDED] =
     g_signal_new ("sink-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
   signals[SINK_PAD_REMOVED] =
     g_signal_new ("sink-pad-removed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
   signals[CLOSED] =
     g_signal_new ("closed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       0);
 
   signals[CANDIDATES_CHANGED] =
     g_signal_new ("candidates-changed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_UINT);
 
   signals[STATE_CHANGED] =
     g_signal_new ("state-changed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_UINT);
 }
 
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 0e1745edb..7f37cc5c4 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -349,7 +349,7 @@ empathy_chat_manager_class_init (
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        g_cclosure_marshal_VOID__UINT,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_UINT, NULL);
 
@@ -359,7 +359,7 @@ empathy_chat_manager_class_init (
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        g_cclosure_marshal_VOID__UINT,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_UINT, NULL);
 
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 1e22aa053..79b1f60cb 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -1339,7 +1339,7 @@ empathy_event_manager_class_init (EmpathyEventManagerClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__POINTER,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, G_TYPE_POINTER);
 
@@ -1349,7 +1349,7 @@ empathy_event_manager_class_init (EmpathyEventManagerClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__POINTER,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   signals[EVENT_UPDATED] =
@@ -1358,7 +1358,7 @@ empathy_event_manager_class_init (EmpathyEventManagerClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__POINTER,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   g_type_class_add_private (object_class, sizeof (EmpathyEventManagerPriv));
diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index 1628828e0..29d2d3a3d 100644
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -26,7 +26,6 @@
 
 #include "empathy-mic-monitor.h"
 
-#include "src-marshal.h"
 
 #include <libempathy/empathy-utils.h>
 
@@ -268,7 +267,7 @@ empathy_mic_monitor_class_init (EmpathyMicMonitorClass *klass)
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    _src_marshal_VOID__UINT_STRING_STRING_BOOLEAN,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
   signals[MICROPHONE_REMOVED] = g_signal_new ("microphone-removed",
@@ -276,7 +275,7 @@ empathy_mic_monitor_class_init (EmpathyMicMonitorClass *klass)
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    g_cclosure_marshal_VOID__UINT,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 1, G_TYPE_UINT);
 
   signals[MICROPHONE_CHANGED] = g_signal_new ("microphone-changed",
@@ -284,7 +283,7 @@ empathy_mic_monitor_class_init (EmpathyMicMonitorClass *klass)
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    _src_marshal_VOID__UINT_UINT,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 
   g_type_class_add_private (object_class, sizeof (EmpathyMicMonitorPrivate));
diff --git a/src/empathy-streamed-media-factory.c b/src/empathy-streamed-media-factory.c
index 9ef5da5e1..1c25ae253 100644
--- a/src/empathy-streamed-media-factory.c
+++ b/src/empathy-streamed-media-factory.c
@@ -32,7 +32,6 @@
 
 #include "empathy-streamed-media-factory.h"
 #include "empathy-streamed-media-handler.h"
-#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -166,7 +165,7 @@ empathy_streamed_media_factory_class_init (
       G_TYPE_FROM_CLASS (empathy_streamed_media_factory_class),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _src_marshal_VOID__OBJECT_BOOLEAN,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       2, EMPATHY_TYPE_STREAMED_MEDIA_HANDLER, G_TYPE_BOOLEAN);
 }
diff --git a/src/empathy-streamed-media-handler.c b/src/empathy-streamed-media-handler.c
index 39e3e560d..67527d8e4 100644
--- a/src/empathy-streamed-media-handler.c
+++ b/src/empathy-streamed-media-handler.c
@@ -34,7 +34,6 @@
 #include <libempathy-gtk/empathy-call-utils.h>
 
 #include "empathy-streamed-media-handler.h"
-#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -342,21 +341,21 @@ empathy_streamed_media_handler_class_init (EmpathyStreamedMediaHandlerClass *kla
   signals[CONFERENCE_ADDED] =
     g_signal_new ("conference-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, FS_TYPE_CONFERENCE);
 
   signals[SRC_PAD_ADDED] =
     g_signal_new ("src-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
   signals[SINK_PAD_ADDED] =
     g_signal_new ("sink-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
@@ -364,26 +363,26 @@ empathy_streamed_media_handler_class_init (EmpathyStreamedMediaHandlerClass *kla
     g_signal_new ("request-resource", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       g_signal_accumulator_true_handled, NULL,
-      _src_marshal_BOOLEAN__UINT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN, 2, G_TYPE_UINT, G_TYPE_UINT);
 
   signals[CLOSED] =
     g_signal_new ("closed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       0);
 
   signals[STREAM_CLOSED] =
     g_signal_new ("stream-closed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, TF_TYPE_STREAM);
 
   signals[CANDIDATES_CHANGED] =
     g_signal_new ("candidates-changed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_UINT);
 }
 
diff --git a/src/ev-sidebar.c b/src/ev-sidebar.c
index 56e5cf982..1d0b2df2f 100644
--- a/src/ev-sidebar.c
+++ b/src/ev-sidebar.c
@@ -76,7 +76,7 @@ ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class)
 				G_SIGNAL_RUN_LAST,
 				G_STRUCT_OFFSET (EvSidebarClass, closed),
 				NULL, NULL,
-				g_cclosure_marshal_VOID__VOID,
+				g_cclosure_marshal_generic,
 				G_TYPE_NONE, 0);
 
 	ev_sidebar_table_signals[CHANGED] =
@@ -85,7 +85,7 @@ ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class)
 				G_SIGNAL_RUN_LAST,
 				G_STRUCT_OFFSET (EvSidebarClass, closed),
 				NULL, NULL,
-				g_cclosure_marshal_VOID__STRING,
+				g_cclosure_marshal_generic,
 				G_TYPE_NONE, 1, G_TYPE_STRING);
 
 }