Use GLib's default marshaller everywhere

In contrast to the previous commit, I'm just using NULL here -
telepathy-glib has an explicit dependency on GLib 2.30.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46523
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

39 files changed, 75 insertions, 181 deletions

diff --git a/examples/cm/call/conn.c b/examples/cm/call/conn.c
index 2b7503c16..696256788 100644
--- a/examples/cm/call/conn.c
+++ b/examples/cm/call/conn.c
@@ -416,8 +416,7 @@ example_call_connection_class_init (
    * available */
   signals[SIGNAL_AVAILABLE] = g_signal_new ("available",
       G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__STRING,
-      G_TYPE_NONE, 1, G_TYPE_STRING);
+      NULL, G_TYPE_NONE, 1, G_TYPE_STRING);
 
   tp_contacts_mixin_class_init (object_class,
       G_STRUCT_OFFSET (ExampleCallConnectionClass, contacts_mixin));
diff --git a/examples/cm/contactlist/contact-list.c b/examples/cm/contactlist/contact-list.c
index 8c1590e1d..5c21564b9 100644
--- a/examples/cm/contactlist/contact-list.c
+++ b/examples/cm/contactlist/contact-list.c
@@ -1675,14 +1675,14 @@ example_contact_list_class_init (ExampleContactListClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT);
+      NULL, G_TYPE_NONE, 1, G_TYPE_UINT);
 
   signals[PRESENCE_UPDATED] = g_signal_new ("presence-updated",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT);
+      NULL, G_TYPE_NONE, 1, G_TYPE_UINT);
 }
 
 static void
diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c
index c6499a42c..7e7235115 100644
--- a/telepathy-glib/account-channel-request.c
+++ b/telepathy-glib/account-channel-request.c
@@ -87,7 +87,6 @@
 #include "telepathy-glib/debug-internal.h"
 #include "telepathy-glib/deprecated-internal.h"
 #include "telepathy-glib/simple-client-factory-internal.h"
-#include "telepathy-glib/_gen/signals-marshal.h"
 
 struct _TpAccountChannelRequestClass {
     /*<private>*/
@@ -440,8 +439,7 @@ tp_account_channel_request_class_init (
       "re-handled", G_OBJECT_CLASS_TYPE (cls),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__OBJECT_INT64_OBJECT,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 3, TP_TYPE_CHANNEL, G_TYPE_INT64,
       TP_TYPE_HANDLE_CHANNELS_CONTEXT);
 }
diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 3cb499d81..231223437 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -32,7 +32,6 @@
 #include <telepathy-glib/util.h>
 
 #include "telepathy-glib/account-manager.h"
-#include "telepathy-glib/_gen/signals-marshal.h"
 
 #define DEBUG_FLAG TP_DEBUG_ACCOUNTS
 #include "telepathy-glib/dbus-internal.h"
@@ -600,8 +599,7 @@ tp_account_manager_class_init (TpAccountManagerClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__OBJECT_BOOLEAN,
+      NULL, NULL, NULL,
       G_TYPE_NONE,
       2, TP_TYPE_ACCOUNT, G_TYPE_BOOLEAN);
 
@@ -618,8 +616,7 @@ tp_account_manager_class_init (TpAccountManagerClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      NULL, NULL, NULL,
       G_TYPE_NONE,
       1, TP_TYPE_ACCOUNT);
 
@@ -640,8 +637,7 @@ tp_account_manager_class_init (TpAccountManagerClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      NULL, NULL, NULL,
       G_TYPE_NONE,
       1, TP_TYPE_ACCOUNT);
 
@@ -658,8 +654,7 @@ tp_account_manager_class_init (TpAccountManagerClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      NULL, NULL, NULL,
       G_TYPE_NONE,
       1, TP_TYPE_ACCOUNT);
 
@@ -679,8 +674,7 @@ tp_account_manager_class_init (TpAccountManagerClass *klass)
         G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST,
         0,
-        NULL, NULL,
-        _tp_marshal_VOID__UINT_STRING_STRING,
+        NULL, NULL, NULL,
         G_TYPE_NONE,
         3, G_TYPE_UINT, /* Presence type */
         G_TYPE_STRING,  /* status */
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index f012fe9a1..455f8c1e0 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -41,7 +41,6 @@
 #include "telepathy-glib/simple-client-factory-internal.h"
 #include <telepathy-glib/util-internal.h>
 
-#include "telepathy-glib/_gen/signals-marshal.h"
 #include "telepathy-glib/_gen/tp-cli-account-body.h"
 
 /**
@@ -1956,8 +1955,7 @@ tp_account_class_init (TpAccountClass *klass)
   signals[STATUS_CHANGED] = g_signal_new ("status-changed",
       G_TYPE_FROM_CLASS (object_class),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tp_marshal_VOID__UINT_UINT_UINT_STRING_BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 5, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING,
       G_TYPE_HASH_TABLE);
 
@@ -1975,8 +1973,7 @@ tp_account_class_init (TpAccountClass *klass)
   signals[PRESENCE_CHANGED] = g_signal_new ("presence-changed",
       G_TYPE_FROM_CLASS (object_class),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tp_marshal_VOID__UINT_STRING_STRING,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING);
 
   proxy_class->interface = TP_IFACE_QUARK_ACCOUNT;
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index d2f1ca815..5906b30a4 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -202,7 +202,6 @@
 #include "telepathy-glib/debug-internal.h"
 #include "telepathy-glib/deprecated-internal.h"
 #include "telepathy-glib/simple-client-factory-internal.h"
-#include "telepathy-glib/_gen/signals-marshal.h"
 #include "telepathy-glib/util-internal.h"
 
 static void observer_iface_init (gpointer, gpointer);
@@ -1511,8 +1510,7 @@ tp_base_client_class_init (TpBaseClientClass *cls)
       "request-added", G_OBJECT_CLASS_TYPE (cls),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__OBJECT_OBJECT,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 2,
       TP_TYPE_ACCOUNT, TP_TYPE_CHANNEL_REQUEST);
 
@@ -1535,8 +1533,7 @@ tp_base_client_class_init (TpBaseClientClass *cls)
       "request-removed", G_OBJECT_CLASS_TYPE (cls),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__OBJECT_STRING_STRING,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 3,
       TP_TYPE_CHANNEL_REQUEST, G_TYPE_STRING, G_TYPE_STRING);
 
diff --git a/telepathy-glib/base-connection-manager.c b/telepathy-glib/base-connection-manager.c
index 5178b1771..f65a94c04 100644
--- a/telepathy-glib/base-connection-manager.c
+++ b/telepathy-glib/base-connection-manager.c
@@ -533,8 +533,7 @@ tp_base_connection_manager_class_init (TpBaseConnectionManagerClass *klass)
                   G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   tp_dbus_properties_mixin_class_init (object_class, 0);
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index d19d216b7..44cb4b125 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -1637,8 +1637,7 @@ tp_base_connection_class_init (TpBaseConnectionClass *klass)
                   G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   /**
@@ -1661,8 +1660,7 @@ tp_base_connection_class_init (TpBaseConnectionClass *klass)
                   G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__STRING,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, G_TYPE_STRING);
 
   /**
@@ -1686,8 +1684,7 @@ tp_base_connection_class_init (TpBaseConnectionClass *klass)
                   G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__STRING,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, G_TYPE_STRING);
 
   tp_dbus_properties_mixin_class_init (object_class, 0);
diff --git a/telepathy-glib/base-media-call-content.c b/telepathy-glib/base-media-call-content.c
index 326e778c9..b0c9857e3 100644
--- a/telepathy-glib/base-media-call-content.c
+++ b/telepathy-glib/base-media-call-content.c
@@ -72,7 +72,6 @@
 #include "telepathy-glib/svc-properties-interface.h"
 #include "telepathy-glib/util.h"
 #include "telepathy-glib/util-internal.h"
-#include "telepathy-glib/_gen/signals-marshal.h"
 
 #define DTMF_PAUSE_MS (3000)
 
@@ -453,8 +452,7 @@ tp_base_media_call_content_class_init (TpBaseMediaCallContentClass *klass)
       "local-media-description-updated",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tp_marshal_VOID__UINT_BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       2, G_TYPE_UINT, G_TYPE_HASH_TABLE);
 
diff --git a/telepathy-glib/base-password-channel.c b/telepathy-glib/base-password-channel.c
index f2c054e24..6e3b53288 100644
--- a/telepathy-glib/base-password-channel.c
+++ b/telepathy-glib/base-password-channel.c
@@ -65,8 +65,6 @@
 #define DEBUG_FLAG TP_DEBUG_SASL
 #include "telepathy-glib/debug-internal.h"
 
-#include "telepathy-glib/_gen/signals-marshal.h"
-
 static void sasl_auth_iface_init (gpointer g_iface, gpointer iface_data);
 
 G_DEFINE_TYPE_WITH_CODE (TpBasePasswordChannel, tp_base_password_channel,
@@ -405,8 +403,7 @@ tp_base_password_channel_class_init (TpBasePasswordChannelClass *tp_base_passwor
       G_TYPE_FROM_CLASS (object_class),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__BOXED_UINT_INT_STRING,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 4,
       G_TYPE_GSTRING, G_TYPE_UINT, G_TYPE_INT, G_TYPE_STRING);
 
diff --git a/telepathy-glib/call-channel.c b/telepathy-glib/call-channel.c
index c86e1458b..5ab947e53 100644
--- a/telepathy-glib/call-channel.c
+++ b/telepathy-glib/call-channel.c
@@ -65,7 +65,6 @@
 #include "telepathy-glib/debug-internal.h"
 #include "telepathy-glib/proxy-internal.h"
 #include "telepathy-glib/util-internal.h"
-#include "telepathy-glib/_gen/signals-marshal.h"
 
 G_DEFINE_TYPE (TpCallChannel, tp_call_channel, TP_TYPE_CHANNEL)
 
@@ -922,8 +921,7 @@ tp_call_channel_class_init (TpCallChannelClass *klass)
   _signals[CONTENT_ADDED] = g_signal_new ("content-added",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       1, G_TYPE_OBJECT);
 
@@ -944,8 +942,7 @@ tp_call_channel_class_init (TpCallChannelClass *klass)
   _signals[CONTENT_REMOVED] = g_signal_new ("content-removed",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tp_marshal_VOID__OBJECT_BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       2, G_TYPE_OBJECT, TP_TYPE_CALL_STATE_REASON);
 
@@ -965,8 +962,7 @@ tp_call_channel_class_init (TpCallChannelClass *klass)
   _signals[STATE_CHANGED] = g_signal_new ("state-changed",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tp_marshal_VOID__UINT_UINT_BOXED_BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       4, G_TYPE_UINT, G_TYPE_UINT, TP_TYPE_CALL_STATE_REASON,
       G_TYPE_HASH_TABLE);
@@ -992,8 +988,7 @@ tp_call_channel_class_init (TpCallChannelClass *klass)
   _signals[MEMBERS_CHANGED] = g_signal_new ("members-changed",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tp_marshal_VOID__BOXED_BOXED_BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       3, G_TYPE_HASH_TABLE, G_TYPE_PTR_ARRAY, TP_TYPE_CALL_STATE_REASON);
 }
diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c
index c464371c4..8ad6114bc 100644
--- a/telepathy-glib/call-content.c
+++ b/telepathy-glib/call-content.c
@@ -63,7 +63,6 @@
 #include "telepathy-glib/call-internal.h"
 #include "telepathy-glib/proxy-internal.h"
 #include "telepathy-glib/util-internal.h"
-#include "telepathy-glib/_gen/signals-marshal.h"
 
 #include "_gen/tp-cli-call-content-body.h"
 
@@ -639,8 +638,7 @@ tp_call_content_class_init (TpCallContentClass *klass)
   _signals[REMOVED] = g_signal_new ("removed",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       0);
 
@@ -661,8 +659,7 @@ tp_call_content_class_init (TpCallContentClass *klass)
   _signals[STREAMS_ADDED] = g_signal_new ("streams-added",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      g_cclosure_marshal_VOID__BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       1, G_TYPE_PTR_ARRAY);
 
@@ -684,8 +681,7 @@ tp_call_content_class_init (TpCallContentClass *klass)
   _signals[STREAMS_REMOVED] = g_signal_new ("streams-removed",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tp_marshal_VOID__BOXED_BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       2, G_TYPE_PTR_ARRAY, TP_TYPE_CALL_STATE_REASON);
 
diff --git a/telepathy-glib/call-stream-endpoint.c b/telepathy-glib/call-stream-endpoint.c
index 2e3f5788c..88b49bd32 100644
--- a/telepathy-glib/call-stream-endpoint.c
+++ b/telepathy-glib/call-stream-endpoint.c
@@ -67,7 +67,6 @@
 #include "telepathy-glib/svc-properties-interface.h"
 #include "telepathy-glib/util.h"
 #include "telepathy-glib/util-internal.h"
-#include "telepathy-glib/_gen/signals-marshal.h"
 
 static void call_stream_endpoint_iface_init (gpointer, gpointer);
 
@@ -447,8 +446,7 @@ tp_call_stream_endpoint_class_init (TpCallStreamEndpointClass *klass)
   _signals[CANDIDATE_SELECTED] = g_signal_new ("candidate-selected",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tp_marshal_VOID__BOXED_BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       2, TP_STRUCT_TYPE_CANDIDATE, TP_STRUCT_TYPE_CANDIDATE);
 
@@ -466,8 +464,7 @@ tp_call_stream_endpoint_class_init (TpCallStreamEndpointClass *klass)
   _signals[CANDIDATE_ACCEPTED] = g_signal_new ("candidate-accepted",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tp_marshal_VOID__BOXED_BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       2, TP_STRUCT_TYPE_CANDIDATE, TP_STRUCT_TYPE_CANDIDATE);
 
@@ -485,8 +482,7 @@ tp_call_stream_endpoint_class_init (TpCallStreamEndpointClass *klass)
   _signals[CANDIDATE_REJECTED] = g_signal_new ("candidate-rejected",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tp_marshal_VOID__BOXED_BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       2, TP_STRUCT_TYPE_CANDIDATE, TP_STRUCT_TYPE_CANDIDATE);
 }
diff --git a/telepathy-glib/call-stream.c b/telepathy-glib/call-stream.c
index 71a2d9e6a..198b53a2a 100644
--- a/telepathy-glib/call-stream.c
+++ b/telepathy-glib/call-stream.c
@@ -61,7 +61,6 @@
 #include "telepathy-glib/call-internal.h"
 #include "telepathy-glib/proxy-internal.h"
 #include "telepathy-glib/util-internal.h"
-#include "telepathy-glib/_gen/signals-marshal.h"
 
 #include "_gen/tp-cli-call-stream-body.h"
 
@@ -393,8 +392,7 @@ tp_call_stream_class_init (TpCallStreamClass *klass)
   _signals[LOCAL_SENDING_STATE_CHANGED] = g_signal_new ("local-sending-state-changed",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tp_marshal_VOID__UINT_BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       4, G_TYPE_UINT, G_TYPE_UINT, TP_TYPE_CALL_STATE_REASON,
       G_TYPE_HASH_TABLE);
@@ -418,8 +416,7 @@ tp_call_stream_class_init (TpCallStreamClass *klass)
   _signals[REMOTE_MEMBERS_CHANGED] = g_signal_new ("remote-members-changed",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tp_marshal_VOID__BOXED_BOXED_BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       3, G_TYPE_HASH_TABLE, G_TYPE_PTR_ARRAY, TP_TYPE_CALL_STATE_REASON);
 }
diff --git a/telepathy-glib/channel-dispatch-operation.c b/telepathy-glib/channel-dispatch-operation.c
index 08f9b765c..690e36fee 100644
--- a/telepathy-glib/channel-dispatch-operation.c
+++ b/telepathy-glib/channel-dispatch-operation.c
@@ -39,7 +39,6 @@
 #include "telepathy-glib/dbus-internal.h"
 #include "telepathy-glib/debug-internal.h"
 #include "telepathy-glib/simple-client-factory-internal.h"
-#include "telepathy-glib/_gen/signals-marshal.h"
 
 #include "telepathy-glib/_gen/tp-cli-channel-dispatch-operation-body.h"
 
@@ -830,8 +829,7 @@ tp_channel_dispatch_operation_class_init (TpChannelDispatchOperationClass *klass
       "channel-lost", G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__OBJECT_UINT_INT_STRING,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 4,
       TP_TYPE_CHANNEL, G_TYPE_UINT, G_TYPE_INT, G_TYPE_STRING);
 
diff --git a/telepathy-glib/channel-factory-iface.c b/telepathy-glib/channel-factory-iface.c
index 266ae6d3f..c2e1756e8 100644
--- a/telepathy-glib/channel-factory-iface.c
+++ b/telepathy-glib/channel-factory-iface.c
@@ -43,8 +43,6 @@
 
 #include <telepathy-glib/channel-iface.h>
 
-#include "_gen/signals-marshal.h"
-
 enum {
     NEW_CHANNEL,
     CHANNEL_ERROR,
@@ -83,8 +81,7 @@ tp_channel_factory_iface_base_init (gpointer klass)
                   G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  _tp_marshal_VOID__OBJECT_POINTER,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_POINTER);
 
     /**
@@ -104,8 +101,7 @@ tp_channel_factory_iface_base_init (gpointer klass)
                   G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  _tp_marshal_VOID__OBJECT_POINTER_POINTER,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE,
                   3, G_TYPE_OBJECT, G_TYPE_POINTER, G_TYPE_POINTER);
   }
diff --git a/telepathy-glib/channel-manager.c b/telepathy-glib/channel-manager.c
index d149aef74..0aef44399 100644
--- a/telepathy-glib/channel-manager.c
+++ b/telepathy-glib/channel-manager.c
@@ -204,8 +204,6 @@
 #include <telepathy-glib/exportable-channel.h>
 #include <telepathy-glib/util.h>
 
-#include "_gen/signals-marshal.h"
-
 enum {
     S_NEW_CHANNELS,
     S_REQUEST_ALREADY_SATISFIED,
@@ -244,8 +242,7 @@ channel_manager_base_init (gpointer klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
           0,
-          NULL, NULL,
-          g_cclosure_marshal_VOID__POINTER,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 1, G_TYPE_POINTER);
 
       /**
@@ -265,8 +262,7 @@ channel_manager_base_init (gpointer klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
           0,
-          NULL, NULL,
-          _tp_marshal_VOID__POINTER_OBJECT,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_OBJECT);
 
       /**
@@ -289,8 +285,7 @@ channel_manager_base_init (gpointer klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
           0,
-          NULL, NULL,
-          _tp_marshal_VOID__POINTER_UINT_INT_STRING,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 4, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_INT,
           G_TYPE_STRING);
 
@@ -306,8 +301,7 @@ channel_manager_base_init (gpointer klass)
           G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
           0,
-          NULL, NULL,
-          g_cclosure_marshal_VOID__STRING,
+          NULL, NULL, NULL,
           G_TYPE_NONE, 1, G_TYPE_STRING);
 
     }
diff --git a/telepathy-glib/channel-request.c b/telepathy-glib/channel-request.c
index 333e5cc45..08fcf1f9c 100644
--- a/telepathy-glib/channel-request.c
+++ b/telepathy-glib/channel-request.c
@@ -42,8 +42,6 @@
 #include "telepathy-glib/simple-client-factory-internal.h"
 #include "telepathy-glib/_gen/tp-cli-channel-request-body.h"
 
-#include "_gen/signals-marshal.h"
-
 /**
  * SECTION:channel-request
  * @title: TpChannelRequest
@@ -490,8 +488,7 @@ tp_channel_request_class_init (TpChannelRequestClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 0);
 
   /**
@@ -518,8 +515,7 @@ tp_channel_request_class_init (TpChannelRequestClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__OBJECT_OBJECT,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 2, TP_TYPE_CONNECTION, TP_TYPE_CHANNEL);
 }
 
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index 075b678d1..3982529fb 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -35,7 +35,6 @@
 #include "telepathy-glib/debug-internal.h"
 #include "telepathy-glib/proxy-internal.h"
 #include "telepathy-glib/simple-client-factory-internal.h"
-#include "telepathy-glib/_gen/signals-marshal.h"
 
 #include "_gen/tp-cli-channel-body.h"
 
@@ -1779,8 +1778,7 @@ tp_channel_class_init (TpChannelClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__UINT_UINT,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 
   /**
@@ -1805,8 +1803,7 @@ tp_channel_class_init (TpChannelClass *klass)
       "group-members-changed", G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__STRING_BOXED_BOXED_BOXED_BOXED_UINT_UINT,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 7,
       G_TYPE_STRING, au_type, au_type, au_type, au_type, G_TYPE_UINT,
       G_TYPE_UINT);
@@ -1838,8 +1835,7 @@ tp_channel_class_init (TpChannelClass *klass)
       "group-members-changed-detailed", G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__BOXED_BOXED_BOXED_BOXED_BOXED,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 5,
       au_type, au_type, au_type, au_type, TP_HASH_TYPE_STRING_VARIANT_MAP);
 
@@ -1858,8 +1854,7 @@ tp_channel_class_init (TpChannelClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__UINT_UINT,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 
   /**
@@ -1962,8 +1957,7 @@ tp_channel_class_init (TpChannelClass *klass)
       "group-contacts-changed", G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__BOXED_BOXED_BOXED_BOXED_OBJECT_BOXED,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 6,
       G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY,
       TP_TYPE_CONTACT, TP_HASH_TYPE_STRING_VARIANT_MAP);
diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 9d207697b..03b21b423 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -1521,8 +1521,7 @@ tp_connection_manager_class_init (TpConnectionManagerClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 0);
 
   /**
@@ -1536,8 +1535,7 @@ tp_connection_manager_class_init (TpConnectionManagerClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 0);
 
   /**
@@ -1554,8 +1552,7 @@ tp_connection_manager_class_init (TpConnectionManagerClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__UINT,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 1, G_TYPE_UINT);
 }
 
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index 9094ababb..f91c6b6e8 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -47,7 +47,6 @@
 #include "telepathy-glib/proxy-internal.h"
 #include "telepathy-glib/simple-client-factory-internal.h"
 #include "telepathy-glib/util-internal.h"
-#include "telepathy-glib/_gen/signals-marshal.h"
 
 #include "_gen/tp-cli-connection-body.h"
 
@@ -1954,8 +1953,7 @@ tp_connection_class_init (TpConnectionClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__INT_UINT_STRING,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_UINT, G_TYPE_STRING);
 
   /**
@@ -2181,8 +2179,7 @@ tp_connection_class_init (TpConnectionClass *klass)
       G_TYPE_FROM_CLASS (object_class),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__BOXED,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 1, G_TYPE_STRV);
 
   /**
@@ -2207,8 +2204,7 @@ tp_connection_class_init (TpConnectionClass *klass)
       G_TYPE_FROM_CLASS (object_class),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__BOXED,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 1, G_TYPE_STRV);
 
   /**
@@ -2242,8 +2238,7 @@ tp_connection_class_init (TpConnectionClass *klass)
       G_TYPE_FROM_CLASS (object_class),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__STRING_STRING,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
   /**
    * TpConnection::contact-list-changed:
@@ -2272,8 +2267,7 @@ tp_connection_class_init (TpConnectionClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__BOXED_BOXED,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY);
 
   /**
@@ -2303,8 +2297,7 @@ tp_connection_class_init (TpConnectionClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__BOXED_BOXED,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY);
 
 }
diff --git a/telepathy-glib/contact-search.c b/telepathy-glib/contact-search.c
index b63f2bb3c..dacea81e6 100644
--- a/telepathy-glib/contact-search.c
+++ b/telepathy-glib/contact-search.c
@@ -474,8 +474,7 @@ tp_contact_search_class_init (TpContactSearchClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__POINTER,
+      NULL, NULL, NULL,
       G_TYPE_NONE,
       1, G_TYPE_POINTER);
 
diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c
index 7575cbf07..46c2826d2 100644
--- a/telepathy-glib/contact.c
+++ b/telepathy-glib/contact.c
@@ -38,8 +38,6 @@
 #include "telepathy-glib/debug-internal.h"
 #include "telepathy-glib/util-internal.h"
 
-#include "telepathy-glib/_gen/signals-marshal.h"
-
 /**
  * SECTION:contact
  * @title: TpContact
@@ -1337,8 +1335,7 @@ tp_contact_class_init (TpContactClass *klass)
       G_TYPE_FROM_CLASS (object_class),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__BOXED_BOXED,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_STRV, G_TYPE_STRV);
 
   /**
@@ -1357,8 +1354,7 @@ tp_contact_class_init (TpContactClass *klass)
       G_TYPE_FROM_CLASS (object_class),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__UINT_UINT_STRING,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING);
 
   /**
@@ -1376,8 +1372,7 @@ tp_contact_class_init (TpContactClass *klass)
       G_TYPE_FROM_CLASS (object_class),
       G_SIGNAL_RUN_LAST,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__UINT_STRING_STRING,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING);
 }
 
diff --git a/telepathy-glib/dbus-daemon.c b/telepathy-glib/dbus-daemon.c
index 7e139f769..478ff3b29 100644
--- a/telepathy-glib/dbus-daemon.c
+++ b/telepathy-glib/dbus-daemon.c
@@ -32,8 +32,6 @@
 #include <telepathy-glib/proxy-subclass.h>
 #include <telepathy-glib/util.h>
 
-#include "telepathy-glib/_gen/signals-marshal.h"
-
 #include "telepathy-glib/_gen/tp-cli-dbus-daemon-body.h"
 
 #define DEBUG_FLAG TP_DEBUG_PROXY
diff --git a/telepathy-glib/dbus-tube-channel.c b/telepathy-glib/dbus-tube-channel.c
index b9ba0f1a6..08748676f 100644
--- a/telepathy-glib/dbus-tube-channel.c
+++ b/telepathy-glib/dbus-tube-channel.c
@@ -63,8 +63,6 @@
 #include "telepathy-glib/automatic-client-factory-internal.h"
 #include "telepathy-glib/debug-internal.h"
 
-#include "_gen/signals-marshal.h"
-
 #include <stdio.h>
 #include <glib/gstdio.h>
 
diff --git a/telepathy-glib/dtmf.c b/telepathy-glib/dtmf.c
index 83c17d972..25da24d64 100644
--- a/telepathy-glib/dtmf.c
+++ b/telepathy-glib/dtmf.c
@@ -479,7 +479,7 @@ tp_dtmf_player_class_init (TpDTMFPlayerClass *cls)
    */
   sig_id_started_tone =  g_signal_new ("started-tone",
       G_OBJECT_CLASS_TYPE (cls), G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT);
+      NULL, G_TYPE_NONE, 1, G_TYPE_UINT);
 
   /**
    * TpDTMFPlayer::stopped-tone:
@@ -491,7 +491,7 @@ tp_dtmf_player_class_init (TpDTMFPlayerClass *cls)
    */
   sig_id_stopped_tone =  g_signal_new ("stopped-tone",
       G_OBJECT_CLASS_TYPE (cls), G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+      NULL, G_TYPE_NONE, 0);
 
   /**
    * TpDTMFPlayer::finished:
@@ -506,7 +506,7 @@ tp_dtmf_player_class_init (TpDTMFPlayerClass *cls)
    */
   sig_id_finished =  g_signal_new ("finished",
       G_OBJECT_CLASS_TYPE (cls), G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+      NULL, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
   /**
    * TpDTMFPlayer::tones-deferred:
@@ -523,7 +523,7 @@ tp_dtmf_player_class_init (TpDTMFPlayerClass *cls)
    */
   sig_id_tones_deferred =  g_signal_new ("tones-deferred",
       G_OBJECT_CLASS_TYPE (cls), G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+      NULL, G_TYPE_NONE, 1, G_TYPE_STRING);
 }
 
 /**
diff --git a/telepathy-glib/file-transfer-channel.c b/telepathy-glib/file-transfer-channel.c
index 6dc15c86e..a046bd897 100644
--- a/telepathy-glib/file-transfer-channel.c
+++ b/telepathy-glib/file-transfer-channel.c
@@ -110,7 +110,6 @@
 #define DEBUG_FLAG TP_DEBUG_CHANNEL
 #include "telepathy-glib/automatic-client-factory-internal.h"
 #include "telepathy-glib/debug-internal.h"
-#include "_gen/signals-marshal.h"
 
 #include <stdio.h>
 #include <glib.h>
diff --git a/telepathy-glib/group-mixin.c b/telepathy-glib/group-mixin.c
index f3d64a0cb..182aaf4f0 100644
--- a/telepathy-glib/group-mixin.c
+++ b/telepathy-glib/group-mixin.c
@@ -74,8 +74,6 @@
 
 #include "debug-internal.h"
 
-#include "_gen/signals-marshal.h"
-
 static const char *
 group_change_reason_str (guint reason)
 {
diff --git a/telepathy-glib/handle-channels-context.c b/telepathy-glib/handle-channels-context.c
index 25d994502..c05023812 100644
--- a/telepathy-glib/handle-channels-context.c
+++ b/telepathy-glib/handle-channels-context.c
@@ -60,7 +60,6 @@
 
 #define DEBUG_FLAG TP_DEBUG_CLIENT
 #include "telepathy-glib/debug-internal.h"
-#include "telepathy-glib/_gen/signals-marshal.h"
 
 struct _TpHandleChannelsContextClass {
     /*<private>*/
@@ -433,8 +432,7 @@ tp_handle_channels_context_class_init (
       "done", G_OBJECT_CLASS_TYPE (cls),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__VOID,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 0);
 
 }
diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
index 00b24c74a..0c94250ff 100644
--- a/telepathy-glib/protocol.c
+++ b/telepathy-glib/protocol.c
@@ -45,7 +45,6 @@
 #include "telepathy-glib/debug-internal.h"
 #include "telepathy-glib/proxy-internal.h"
 
-#include "telepathy-glib/_gen/signals-marshal.h"
 #include "telepathy-glib/_gen/tp-cli-protocol-body.h"
 
 #include <string.h>
diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c
index 4f74efd97..60a0b4946 100644
--- a/telepathy-glib/proxy.c
+++ b/telepathy-glib/proxy.c
@@ -36,8 +36,6 @@
 #include "simple-client-factory-internal.h"
 #include "util-internal.h"
 
-#include "_gen/signals-marshal.h"
-
 #include "_gen/tp-cli-generic-body.h"
 
 #if 0
@@ -1366,8 +1364,7 @@ tp_proxy_class_init (TpProxyClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__UINT_OBJECT,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 2, G_TYPE_UINT, DBUS_TYPE_G_PROXY);
 
   /**
@@ -1392,8 +1389,7 @@ tp_proxy_class_init (TpProxyClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      _tp_marshal_VOID__UINT_INT_STRING,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_INT, G_TYPE_STRING);
 }
 
diff --git a/telepathy-glib/stream-tube-channel.c b/telepathy-glib/stream-tube-channel.c
index 524223724..94bb23d1d 100644
--- a/telepathy-glib/stream-tube-channel.c
+++ b/telepathy-glib/stream-tube-channel.c
@@ -64,8 +64,6 @@
 #include "telepathy-glib/debug-internal.h"
 #include "telepathy-glib/automatic-client-factory-internal.h"
 
-#include "_gen/signals-marshal.h"
-
 #include <stdio.h>
 #include <glib/gstdio.h>
 
@@ -454,8 +452,7 @@ tp_stream_tube_channel_class_init (TpStreamTubeChannelClass *klass)
   _signals[INCOMING] = g_signal_new ("incoming",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       1, TP_TYPE_STREAM_TUBE_CONNECTION);
 
diff --git a/telepathy-glib/stream-tube-connection.c b/telepathy-glib/stream-tube-connection.c
index 1c151ede8..67e657341 100644
--- a/telepathy-glib/stream-tube-connection.c
+++ b/telepathy-glib/stream-tube-connection.c
@@ -252,8 +252,7 @@ tp_stream_tube_connection_class_init (TpStreamTubeConnectionClass *cls)
   _signals[CLOSED] = g_signal_new ("closed",
       G_OBJECT_CLASS_TYPE (cls),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      g_cclosure_marshal_VOID__POINTER,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       1, G_TYPE_POINTER);
 }
diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
index 7ec1a76d4..cc7052d16 100644
--- a/telepathy-glib/text-channel.c
+++ b/telepathy-glib/text-channel.c
@@ -65,8 +65,6 @@
 #include "telepathy-glib/automatic-client-factory-internal.h"
 #include "telepathy-glib/channel-internal.h"
 
-#include "_gen/signals-marshal.h"
-
 #include <stdio.h>
 #include <glib/gstdio.h>
 
@@ -971,8 +969,7 @@ tp_text_channel_class_init (TpTextChannelClass *klass)
   signals[SIG_MESSAGE_RECEIVED] = g_signal_new ("message-received",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       1, TP_TYPE_SIGNALLED_MESSAGE);
 
@@ -997,8 +994,7 @@ tp_text_channel_class_init (TpTextChannelClass *klass)
       "pending-message-removed",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       1, TP_TYPE_SIGNALLED_MESSAGE);
 
@@ -1024,8 +1020,7 @@ tp_text_channel_class_init (TpTextChannelClass *klass)
       "message-sent",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      _tp_marshal_VOID__OBJECT_UINT_STRING,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       3, TP_TYPE_SIGNALLED_MESSAGE, G_TYPE_UINT, G_TYPE_STRING);
 
diff --git a/tests/lib/bug16307-conn.c b/tests/lib/bug16307-conn.c
index a75c9417f..3320bd389 100644
--- a/tests/lib/bug16307-conn.c
+++ b/tests/lib/bug16307-conn.c
@@ -169,8 +169,7 @@ tp_tests_bug16307_connection_class_init (TpTestsBug16307ConnectionClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 0);
 
   /* break the Connection D-Bus properties implementation, so that we always
diff --git a/tests/lib/simple-channel-dispatcher.c b/tests/lib/simple-channel-dispatcher.c
index b7fcbf90b..d3cb44b7c 100644
--- a/tests/lib/simple-channel-dispatcher.c
+++ b/tests/lib/simple-channel-dispatcher.c
@@ -429,8 +429,7 @@ tp_tests_simple_channel_dispatcher_class_init (
   signals[CHANNEL_REQUEST_CREATED] = g_signal_new ("channel-request-created",
       G_TYPE_FROM_CLASS (object_class),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, TP_TESTS_TYPE_SIMPLE_CHANNEL_REQUEST);
 
   klass->dbus_props_class.interfaces = prop_interfaces;
diff --git a/tests/lib/simple-channel-manager.c b/tests/lib/simple-channel-manager.c
index adae74a46..28cb6a9a6 100644
--- a/tests/lib/simple-channel-manager.c
+++ b/tests/lib/simple-channel-manager.c
@@ -37,8 +37,7 @@ tp_tests_simple_channel_manager_class_init (TpTestsSimpleChannelManagerClass *kl
   signals[REQUEST] = g_signal_new ("request",
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      g_cclosure_marshal_VOID__BOXED,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, G_TYPE_HASH_TABLE);
 }
 
diff --git a/tests/lib/simple-conn.c b/tests/lib/simple-conn.c
index c83e9d469..8a481afa5 100644
--- a/tests/lib/simple-conn.c
+++ b/tests/lib/simple-conn.c
@@ -329,8 +329,7 @@ tp_tests_simple_connection_class_init (TpTestsSimpleConnectionClass *klass)
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      NULL, NULL, NULL,
       G_TYPE_NONE, 0);
 }
 
diff --git a/tests/lib/stream-tube-chan.c b/tests/lib/stream-tube-chan.c
index 5b542c28c..0d1ec27e1 100644
--- a/tests/lib/stream-tube-chan.c
+++ b/tests/lib/stream-tube-chan.c
@@ -304,8 +304,7 @@ tp_tests_stream_tube_channel_class_init (TpTestsStreamTubeChannelClass *klass)
   signals[SIG_INCOMING_CONNECTION] = g_signal_new ("incoming-connection",
       G_OBJECT_CLASS_TYPE (klass),
       G_SIGNAL_RUN_LAST,
-      0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      0, NULL, NULL, NULL,
       G_TYPE_NONE,
       1, G_TYPE_IO_STREAM);