colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: use 'g_cclosure_marshal_generic' by default

Browse Source 
Avoid custom marshalers, and just use libffi-based 'g_cclosure_marshal_generic'.
This commit is contained in:
Aleksander Morgado
2013-11-20 15:07:45 +01:00
parent fe744b4534
commit 5e7fee1d11
6 changed files with 17 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Makefile.am
View File

@@ -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 \ --template $(top_srcdir)/build-aux/mm-enums-template.c \
$(DAEMON_ENUMS) > $@ $(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 sbin_PROGRAMS = ModemManager
ModemManager_CPPFLAGS = \ ModemManager_CPPFLAGS = \
@@ -160,8 +151,6 @@ ModemManager_LDADD = \
$(top_builddir)/libqcdm/src/libqcdm.la $(top_builddir)/libqcdm/src/libqcdm.la
nodist_ModemManager_SOURCES = \ nodist_ModemManager_SOURCES = \
mm-marshal.h \
mm-marshal.c \
mm-daemon-enums-types.h \ mm-daemon-enums-types.h \
mm-daemon-enums-types.c mm-daemon-enums-types.c
@@ -234,8 +223,6 @@ ModemManager_SOURCES = \
# Additional dependency rules # Additional dependency rules
mm-bearer.c: mm-daemon-enums-types.h mm-bearer.c: mm-daemon-enums-types.h
mm-sms-list.c: mm-marshal.h
mm-sim.c: mm-marshal.h
# Additional Polkit support # Additional Polkit support
if WITH_POLKIT if WITH_POLKIT
@@ -277,12 +264,9 @@ ModemManager_LDADD += $(MBIM_LIBS)
endif endif
EXTRA_DIST = \ EXTRA_DIST = \
$(udevrules_DATA) \ $(udevrules_DATA)
mm-marshal.list
CLEANFILES = \ CLEANFILES = \
mm-marshal.h \
mm-marshal.c \
mm-daemon-enums-types.h \ mm-daemon-enums-types.h \
mm-daemon-enums-types.c \ mm-daemon-enums-types.c \
mm-serial-enums-types.h \ mm-serial-enums-types.h \

3
src/mm-marshal.list
View File

@@ -1,3 +0,0 @@
VOID:STRING,BOOLEAN
VOID:STRING
VOID:BOOLEAN

1
src/mm-plugin.c
View File

@@ -33,7 +33,6 @@
#include "mm-at-serial-port.h" #include "mm-at-serial-port.h"
#include "mm-qcdm-serial-port.h" #include "mm-qcdm-serial-port.h"
#include "mm-serial-parsers.h" #include "mm-serial-parsers.h"
#include "mm-marshal.h"
#include "mm-private-boxed-types.h" #include "mm-private-boxed-types.h"
#include "mm-log.h" #include "mm-log.h"
#include "mm-daemon-enums-types.h" #include "mm-daemon-enums-types.h"

6
src/mm-serial-port.c
View File

@@ -1804,7 +1804,7 @@ mm_serial_port_class_init (MMSerialPortClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MMSerialPortClass, buffer_full), G_STRUCT_OFFSET (MMSerialPortClass, buffer_full),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__POINTER, g_cclosure_marshal_generic,
G_TYPE_NONE, 1, G_TYPE_POINTER); G_TYPE_NONE, 1, G_TYPE_POINTER);
signals[TIMED_OUT] = signals[TIMED_OUT] =
@@ -1813,7 +1813,7 @@ mm_serial_port_class_init (MMSerialPortClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MMSerialPortClass, timed_out), G_STRUCT_OFFSET (MMSerialPortClass, timed_out),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__UINT, g_cclosure_marshal_generic,
G_TYPE_NONE, 1, G_TYPE_UINT); G_TYPE_NONE, 1, G_TYPE_UINT);
signals[FORCED_CLOSE] = signals[FORCED_CLOSE] =
@@ -1822,6 +1822,6 @@ mm_serial_port_class_init (MMSerialPortClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MMSerialPortClass, forced_close), G_STRUCT_OFFSET (MMSerialPortClass, forced_close),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_generic,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
} }

3
src/mm-sim.c
View File

@@ -32,7 +32,6 @@
#include "mm-base-modem.h" #include "mm-base-modem.h"
#include "mm-log.h" #include "mm-log.h"
#include "mm-modem-helpers.h" #include "mm-modem-helpers.h"
#include "mm-marshal.h"
static void async_initable_iface_init (GAsyncInitableIface *iface); static void async_initable_iface_init (GAsyncInitableIface *iface);
@@ -1797,6 +1796,6 @@ mm_sim_class_init (MMSimClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MMSimClass, pin_lock_enabled), G_STRUCT_OFFSET (MMSimClass, pin_lock_enabled),
NULL, NULL, NULL, NULL,
mm_marshal_VOID__BOOLEAN, g_cclosure_marshal_generic,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN); G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
} }

5
src/mm-sms-list.c
View File

@@ -25,7 +25,6 @@
#include <libmm-glib.h> #include <libmm-glib.h>
#include "mm-iface-modem-messaging.h" #include "mm-iface-modem-messaging.h"
#include "mm-marshal.h"
#include "mm-sms-list.h" #include "mm-sms-list.h"
#include "mm-sms.h" #include "mm-sms.h"
#include "mm-log.h" #include "mm-log.h"
@@ -481,7 +480,7 @@ mm_sms_list_class_init (MMSmsListClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MMSmsListClass, sms_added), G_STRUCT_OFFSET (MMSmsListClass, sms_added),
NULL, NULL, NULL, NULL,
mm_marshal_VOID__STRING_BOOLEAN, g_cclosure_marshal_generic,
G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN); G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN);
signals[SIGNAL_DELETED] = signals[SIGNAL_DELETED] =
@@ -490,6 +489,6 @@ mm_sms_list_class_init (MMSmsListClass *klass)
G_SIGNAL_RUN_FIRST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MMSmsListClass, sms_deleted), G_STRUCT_OFFSET (MMSmsListClass, sms_deleted),
NULL, NULL, NULL, NULL,
mm_marshal_VOID__STRING, g_cclosure_marshal_generic,
G_TYPE_NONE, 1, G_TYPE_STRING); G_TYPE_NONE, 1, G_TYPE_STRING);
} }