build: use 'g_cclosure_marshal_generic' by default

Avoid custom marshalers, and just use libffi-based 'g_cclosure_marshal_generic'.

6 files changed, 17 insertions, 39 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index d3afed22..2051472d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -129,15 +129,6 @@ mm-daemon-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c
 		--template $(top_srcdir)/build-aux/mm-enums-template.c \
 		$(DAEMON_ENUMS) > $@
 
-# Marshallers
-
-mm-marshal.h: mm-marshal.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --prefix=mm_marshal --header > $@
-
-mm-marshal.c: mm-marshal.list mm-marshal.h
-	$(AM_V_GEN) echo "#include \"mm-marshal.h\"" > $@ && \
-		$(GLIB_GENMARSHAL) $< --prefix=mm_marshal --body >> $@
-
 sbin_PROGRAMS = ModemManager
 
 ModemManager_CPPFLAGS = \
@@ -160,8 +151,6 @@ ModemManager_LDADD = \
 	$(top_builddir)/libqcdm/src/libqcdm.la
 
 nodist_ModemManager_SOURCES = \
-	mm-marshal.h \
-	mm-marshal.c \
 	mm-daemon-enums-types.h \
 	mm-daemon-enums-types.c
 
@@ -234,8 +223,6 @@ ModemManager_SOURCES = \
 
 # Additional dependency rules
 mm-bearer.c: mm-daemon-enums-types.h
-mm-sms-list.c: mm-marshal.h
-mm-sim.c: mm-marshal.h
 
 # Additional Polkit support
 if WITH_POLKIT
@@ -277,12 +264,9 @@ ModemManager_LDADD += $(MBIM_LIBS)
 endif
 
 EXTRA_DIST = \
-	$(udevrules_DATA) \
-	mm-marshal.list
+	$(udevrules_DATA)
 
 CLEANFILES = \
-	mm-marshal.h \
-	mm-marshal.c \
 	mm-daemon-enums-types.h \
 	mm-daemon-enums-types.c \
 	mm-serial-enums-types.h \
diff --git a/src/mm-marshal.list b/src/mm-marshal.list
deleted file mode 100644
index 62b68822..00000000
--- a/src/mm-marshal.list
+++ /dev/null
@@ -1,3 +0,0 @@
-VOID:STRING,BOOLEAN
-VOID:STRING
-VOID:BOOLEAN
diff --git a/src/mm-plugin.c b/src/mm-plugin.c
index 7318985e..1d8bc835 100644
--- a/src/mm-plugin.c
+++ b/src/mm-plugin.c
@@ -33,7 +33,6 @@
 #include "mm-at-serial-port.h"
 #include "mm-qcdm-serial-port.h"
 #include "mm-serial-parsers.h"
-#include "mm-marshal.h"
 #include "mm-private-boxed-types.h"
 #include "mm-log.h"
 #include "mm-daemon-enums-types.h"
diff --git a/src/mm-serial-port.c b/src/mm-serial-port.c
index dd82ce94..4aaac0ef 100644
--- a/src/mm-serial-port.c
+++ b/src/mm-serial-port.c
@@ -1800,12 +1800,12 @@ mm_serial_port_class_init (MMSerialPortClass *klass)
     /* Signals */
     signals[BUFFER_FULL] =
         g_signal_new ("buffer-full",
-                  G_OBJECT_CLASS_TYPE (object_class),
-                  G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (MMSerialPortClass, buffer_full),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__POINTER,
-                  G_TYPE_NONE, 1, G_TYPE_POINTER);
+                      G_OBJECT_CLASS_TYPE (object_class),
+                      G_SIGNAL_RUN_FIRST,
+                      G_STRUCT_OFFSET (MMSerialPortClass, buffer_full),
+                      NULL, NULL,
+                      g_cclosure_marshal_generic,
+                      G_TYPE_NONE, 1, G_TYPE_POINTER);
 
     signals[TIMED_OUT] =
         g_signal_new ("timed-out",
@@ -1813,15 +1813,15 @@ mm_serial_port_class_init (MMSerialPortClass *klass)
                       G_SIGNAL_RUN_FIRST,
                       G_STRUCT_OFFSET (MMSerialPortClass, timed_out),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__UINT,
+                      g_cclosure_marshal_generic,
 					  G_TYPE_NONE, 1, G_TYPE_UINT);
 
     signals[FORCED_CLOSE] =
         g_signal_new ("forced-close",
-                  G_OBJECT_CLASS_TYPE (object_class),
-                  G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (MMSerialPortClass, forced_close),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
+                      G_OBJECT_CLASS_TYPE (object_class),
+                      G_SIGNAL_RUN_FIRST,
+                      G_STRUCT_OFFSET (MMSerialPortClass, forced_close),
+                      NULL, NULL,
+                      g_cclosure_marshal_generic,
+                      G_TYPE_NONE, 0);
 }
diff --git a/src/mm-sim.c b/src/mm-sim.c
index 53235bc4..da667e22 100644
--- a/src/mm-sim.c
+++ b/src/mm-sim.c
@@ -32,7 +32,6 @@
 #include "mm-base-modem.h"
 #include "mm-log.h"
 #include "mm-modem-helpers.h"
-#include "mm-marshal.h"
 
 static void async_initable_iface_init     (GAsyncInitableIface *iface);
 
@@ -1797,6 +1796,6 @@ mm_sim_class_init (MMSimClass *klass)
                       G_SIGNAL_RUN_FIRST,
                       G_STRUCT_OFFSET (MMSimClass, pin_lock_enabled),
                       NULL, NULL,
-                      mm_marshal_VOID__BOOLEAN,
+                      g_cclosure_marshal_generic,
                       G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 }
diff --git a/src/mm-sms-list.c b/src/mm-sms-list.c
index 258470eb..e6f9da3e 100644
--- a/src/mm-sms-list.c
+++ b/src/mm-sms-list.c
@@ -25,7 +25,6 @@
 #include <libmm-glib.h>
 
 #include "mm-iface-modem-messaging.h"
-#include "mm-marshal.h"
 #include "mm-sms-list.h"
 #include "mm-sms.h"
 #include "mm-log.h"
@@ -481,7 +480,7 @@ mm_sms_list_class_init (MMSmsListClass *klass)
                       G_SIGNAL_RUN_FIRST,
                       G_STRUCT_OFFSET (MMSmsListClass, sms_added),
                       NULL, NULL,
-                      mm_marshal_VOID__STRING_BOOLEAN,
+                      g_cclosure_marshal_generic,
                       G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
     signals[SIGNAL_DELETED] =
@@ -490,6 +489,6 @@ mm_sms_list_class_init (MMSmsListClass *klass)
                       G_SIGNAL_RUN_FIRST,
                       G_STRUCT_OFFSET (MMSmsListClass, sms_deleted),
                       NULL, NULL,
-                      mm_marshal_VOID__STRING,
+                      g_cclosure_marshal_generic,
                       G_TYPE_NONE, 1, G_TYPE_STRING);
 }