marshallers: delete

Delete the custom-marshaller code and use g_cclosure_marshal_generic()
everywhere.

15 files changed, 15 insertions, 68 deletions

diff --git a/configure.ac b/configure.ac
index 639810b4..1a48d605 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,7 +204,6 @@ src/libnm-gtk/Makefile
 src/libnm-gtk/tests/Makefile
 src/libnm-gtk/examples/Makefile
 src/libnm-gtk/libnm-gtk.pc
-src/marshallers/Makefile
 src/utils/Makefile
 src/utils/tests/Makefile
 src/gconf-helpers/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index c0407a60..14ddb99f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = marshallers utils wireless-security libnm-gtk connection-editor gnome-bluetooth
+SUBDIRS = utils wireless-security libnm-gtk connection-editor gnome-bluetooth
 
 bin_PROGRAMS = nm-applet
 
@@ -22,7 +22,6 @@ nm_applet_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\""nm-applet"\" \
 	$(DBUS_CFLAGS)										\
 	$(DISABLE_DEPRECATED)	\
-	-I${top_builddir}/src/marshallers \
 	-I${top_srcdir}/src/utils \
 	-I${top_srcdir}/src/wireless-security \
 	-I${top_srcdir}/src/libnm-gtk
@@ -84,7 +83,6 @@ nm_applet_LDADD = \
 	$(NOTIFY_LIBS) \
 	$(MM_GLIB_LIBS) \
 	$(APPINDICATOR_LIBS) \
-	${top_builddir}/src/marshallers/libmarshallers.la \
 	${top_builddir}/src/utils/libutils.la \
 	${top_builddir}/src/wireless-security/libwireless-security.la \
 	${top_builddir}/src/libnm-gtk/libnm-gtk.la
diff --git a/src/applet-agent.c b/src/applet-agent.c
index 5ea0d3a8..33585197 100644
--- a/src/applet-agent.c
+++ b/src/applet-agent.c
@@ -39,7 +39,6 @@
 
 #include "applet-agent.h"
 #include "utils.h"
-#include "nma-marshal.h"
 
 #define KEYRING_UUID_TAG "connection-uuid"
 #define KEYRING_SN_TAG "setting-name"
@@ -875,8 +874,7 @@ applet_agent_class_init (AppletAgentClass *agent_class)
 		              G_OBJECT_CLASS_TYPE (object_class),
 		              G_SIGNAL_RUN_FIRST,
 		              G_STRUCT_OFFSET (AppletAgentClass, get_secrets),
-		              NULL, NULL,
-		              _nma_marshal_VOID__POINTER_POINTER_STRING_POINTER_UINT_POINTER_POINTER,
+		              NULL, NULL, NULL,
 		              G_TYPE_NONE, 7,
 		              G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_POINTER, G_TYPE_POINTER);
 
@@ -885,8 +883,7 @@ applet_agent_class_init (AppletAgentClass *agent_class)
 		              G_OBJECT_CLASS_TYPE (object_class),
 		              G_SIGNAL_RUN_FIRST,
 		              G_STRUCT_OFFSET (AppletAgentClass, cancel_secrets),
-		              NULL, NULL,
-		              g_cclosure_marshal_VOID__POINTER,
+		              NULL, NULL, NULL,
 		              G_TYPE_NONE, 1, G_TYPE_POINTER);
 }
 
diff --git a/src/applet-device-wimax.c b/src/applet-device-wimax.c
index a23cecd2..ecd96cd3 100644
--- a/src/applet-device-wimax.c
+++ b/src/applet-device-wimax.c
@@ -36,7 +36,6 @@
 #include "applet.h"
 #include "applet-device-wimax.h"
 #include "applet-dialogs.h"
-#include "nma-marshal.h"
 #include "mb-menu-item.h"
 #include "nm-ui-utils.h"
 
diff --git a/src/applet-vpn-request.c b/src/applet-vpn-request.c
index 09b94c06..62f7a989 100644
--- a/src/applet-vpn-request.c
+++ b/src/applet-vpn-request.c
@@ -33,7 +33,6 @@
 #include <glib-object.h>
 
 #include "applet-vpn-request.h"
-#include "nma-marshal.h"
 #include <nm-connection.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-vpn.h>
diff --git a/src/connection-editor/Makefile.am b/src/connection-editor/Makefile.am
index 2422a866..b1b5588e 100644
--- a/src/connection-editor/Makefile.am
+++ b/src/connection-editor/Makefile.am
@@ -16,8 +16,7 @@ nm_connection_editor_CPPFLAGS = \
 	$(DISABLE_DEPRECATED) \
 	-I${top_srcdir}/src/utils \
 	-I${top_srcdir}/src/wireless-security \
-	-I${top_srcdir}/src/libnm-gtk \
-	-I${top_builddir}/src/marshallers
+	-I${top_srcdir}/src/libnm-gtk
 
 nm_connection_editor_SOURCES = \
 	nm-connection-editor.c \
@@ -90,7 +89,6 @@ nm-connection-editor-service-glue.h: $(top_srcdir)/src/connection-editor/nm-conn
 nm_connection_editor_LDADD = \
 	${top_builddir}/src/wireless-security/libwireless-security.la \
 	${top_builddir}/src/utils/libutils.la \
-	${top_builddir}/src/marshallers/libmarshallers.la \
 	${top_builddir}/src/libnm-gtk/libnm-gtk.la \
 	$(GTK_LIBS) \
 	$(NMA_LIBS) \
diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
index bde329f9..278e9466 100644
--- a/src/connection-editor/ce-page.c
+++ b/src/connection-editor/ce-page.c
@@ -33,7 +33,6 @@
 #include <nm-utils.h>
 
 #include "ce-page.h"
-#include "nma-marshal.h"
 
 G_DEFINE_ABSTRACT_TYPE (CEPage, ce_page, G_TYPE_OBJECT)
 
@@ -506,8 +505,7 @@ ce_page_class_init (CEPageClass *page_class)
 	                      G_OBJECT_CLASS_TYPE (object_class),
 	                      G_SIGNAL_RUN_FIRST,
 	                      G_STRUCT_OFFSET (CEPageClass, changed),
-	                      NULL, NULL,
-	                      g_cclosure_marshal_VOID__VOID,
+	                      NULL, NULL, NULL,
 	                      G_TYPE_NONE, 0);
 
 	signals[INITIALIZED] = 
@@ -515,8 +513,7 @@ ce_page_class_init (CEPageClass *page_class)
 	                      G_OBJECT_CLASS_TYPE (object_class),
 	                      G_SIGNAL_RUN_FIRST,
 	                      G_STRUCT_OFFSET (CEPageClass, initialized),
-	                      NULL, NULL,
-	                      g_cclosure_marshal_VOID__POINTER,
+	                      NULL, NULL, NULL,
 	                      G_TYPE_NONE, 1, G_TYPE_POINTER);
 }
 
diff --git a/src/connection-editor/ce-polkit-button.c b/src/connection-editor/ce-polkit-button.c
index 892311a6..ebd43551 100644
--- a/src/connection-editor/ce-polkit-button.c
+++ b/src/connection-editor/ce-polkit-button.c
@@ -230,16 +230,14 @@ ce_polkit_button_class_init (CEPolkitButtonClass *pb_class)
 	                                    G_OBJECT_CLASS_TYPE (object_class),
 	                                    G_SIGNAL_RUN_FIRST,
 	                                    G_STRUCT_OFFSET (CEPolkitButtonClass, actionable),
-	                                    NULL, NULL,
-	                                    g_cclosure_marshal_VOID__BOOLEAN,
+	                                    NULL, NULL, NULL,
 	                                    G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
 	signals[AUTHORIZED] = g_signal_new ("authorized",
 	                                    G_OBJECT_CLASS_TYPE (object_class),
 	                                    G_SIGNAL_RUN_FIRST,
 	                                    G_STRUCT_OFFSET (CEPolkitButtonClass, authorized),
-	                                    NULL, NULL,
-	                                    g_cclosure_marshal_VOID__BOOLEAN,
+	                                    NULL, NULL, NULL,
 	                                    G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 }
 
diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
index df463e21..e5889944 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -55,7 +55,6 @@
 #include <nm-remote-connection.h>
 
 #include "nm-connection-editor.h"
-#include "nma-marshal.h"
 
 #include "ce-page.h"
 #include "page-general.h"
@@ -389,8 +388,7 @@ nm_connection_editor_class_init (NMConnectionEditorClass *klass)
 		              G_OBJECT_CLASS_TYPE (object_class),
 		              G_SIGNAL_RUN_FIRST,
 		              G_STRUCT_OFFSET (NMConnectionEditorClass, done),
-		              NULL, NULL,
-		              _nma_marshal_VOID__ENUM,
+		              NULL, NULL, NULL,
 		              G_TYPE_NONE, 1, GTK_TYPE_RESPONSE_TYPE);
 }
 
diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c
index 2f109fce..e6cb8e4e 100644
--- a/src/connection-editor/nm-connection-list.c
+++ b/src/connection-editor/nm-connection-list.c
@@ -468,8 +468,7 @@ nm_connection_list_class_init (NMConnectionListClass *klass)
 					  G_OBJECT_CLASS_TYPE (object_class),
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (NMConnectionListClass, done),
-					  NULL, NULL,
-					  g_cclosure_marshal_VOID__INT,
+		              NULL, NULL, NULL,
 					  G_TYPE_NONE, 1, G_TYPE_INT);
 
 	list_signals[EDITING_DONE] =
@@ -477,8 +476,7 @@ nm_connection_list_class_init (NMConnectionListClass *klass)
 		              G_OBJECT_CLASS_TYPE (object_class),
 		              G_SIGNAL_RUN_FIRST,
 		              G_STRUCT_OFFSET (NMConnectionListClass, done),
-		              NULL, NULL,
-		              g_cclosure_marshal_VOID__INT,
+		              NULL, NULL, NULL,
 		              G_TYPE_NONE, 1, G_TYPE_INT);
 }
 
diff --git a/src/connection-editor/page-master.c b/src/connection-editor/page-master.c
index 1b89003d..c2c63db2 100644
--- a/src/connection-editor/page-master.c
+++ b/src/connection-editor/page-master.c
@@ -622,8 +622,7 @@ ce_page_master_class_init (CEPageMasterClass *master_class)
 		              G_OBJECT_CLASS_TYPE (object_class),
 		              G_SIGNAL_RUN_FIRST,
 		              G_STRUCT_OFFSET (CEPageMasterClass, create_connection),
-		              NULL, NULL,
-		              g_cclosure_marshal_VOID__OBJECT,
+		              NULL, NULL, NULL,
 		              G_TYPE_NONE, 1,
 		              NM_TYPE_CONNECTION);
 
@@ -632,8 +631,7 @@ ce_page_master_class_init (CEPageMasterClass *master_class)
 		              G_OBJECT_CLASS_TYPE (object_class),
 		              G_SIGNAL_RUN_FIRST,
 		              G_STRUCT_OFFSET (CEPageMasterClass, connection_added),
-		              NULL, NULL,
-		              g_cclosure_marshal_VOID__OBJECT,
+		              NULL, NULL, NULL,
 		              G_TYPE_NONE, 1,
 		              NM_TYPE_CONNECTION);
 
@@ -642,8 +640,7 @@ ce_page_master_class_init (CEPageMasterClass *master_class)
 		              G_OBJECT_CLASS_TYPE (object_class),
 		              G_SIGNAL_RUN_FIRST,
 		              G_STRUCT_OFFSET (CEPageMasterClass, connection_removed),
-		              NULL, NULL,
-		              g_cclosure_marshal_VOID__OBJECT,
+		              NULL, NULL, NULL,
 		              G_TYPE_NONE, 1,
 		              NM_TYPE_CONNECTION);
 }
diff --git a/src/gnome-bluetooth/Makefile.am b/src/gnome-bluetooth/Makefile.am
index 1e3ec5e6..cdca2104 100644
--- a/src/gnome-bluetooth/Makefile.am
+++ b/src/gnome-bluetooth/Makefile.am
@@ -3,7 +3,6 @@ AM_CPPFLAGS = \
 	-DICONDIR=\"$(icondir)\" \
 	-DLOCALEDIR="\"$(datadir)/locale\""	\
 	-I$(top_builddir) \
-	-I${top_builddir}/src/marshallers \
 	-I${top_srcdir}/src/utils \
 	-I${top_srcdir}/src/libnm-gtk \
 	$(GNOME_BLUETOOTH_CFLAGS) \
@@ -27,7 +26,6 @@ libnma_la_CPPFLAGS = $(AM_CPPFLAGS) $(MM_GLIB_CFLAGS)
 libnma_la_LDFLAGS = -module -avoid-version
 
 libnma_la_LIBADD = \
-	$(top_builddir)/src/marshallers/libmarshallers.la \
 	$(top_builddir)/src/utils/libutils.la \
 	$(top_builddir)/src/libnm-gtk/libnm-gtk.la \
 	$(GNOME_BLUETOOTH_LIBS) \
diff --git a/src/gnome-bluetooth/nma-bt-device.c b/src/gnome-bluetooth/nma-bt-device.c
index 7af6c494..853a6622 100644
--- a/src/gnome-bluetooth/nma-bt-device.c
+++ b/src/gnome-bluetooth/nma-bt-device.c
@@ -38,7 +38,6 @@
 #include <nm-remote-connection.h>
 
 #include "nma-bt-device.h"
-#include "nma-marshal.h"
 #include "nm-mobile-wizard.h"
 #include "nm-utils.h"
 #include "utils.h"
@@ -689,7 +688,7 @@ dun_start (NmaBtDevice *self)
 	g_message ("%s: calling Connect...", __func__);
 
 	/* Watch for BT device property changes */
-	dbus_g_object_register_marshaller (_nma_marshal_VOID__STRING_BOXED,
+	dbus_g_object_register_marshaller (g_cclosure_marshal_generic,
 	                                   G_TYPE_NONE,
 	                                   G_TYPE_STRING, G_TYPE_VALUE,
 	                                   G_TYPE_INVALID);
diff --git a/src/libnm-gtk/Makefile.am b/src/libnm-gtk/Makefile.am
index 54cb0ac9..1d21b6a9 100644
--- a/src/libnm-gtk/Makefile.am
+++ b/src/libnm-gtk/Makefile.am
@@ -39,7 +39,6 @@ libnm_gtk_la_CFLAGS = \
 	-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\" \
 	-DNMALOCALEDIR=\"$(datadir)/locale\" \
 	$(DISABLE_DEPRECATED) \
-	-I${top_builddir}/src/marshallers \
 	-I${top_srcdir}/src/utils \
 	-I${top_srcdir}/src/wireless-security
 
@@ -47,7 +46,6 @@ libnm_gtk_la_LIBADD = \
 	$(GTK_LIBS) \
 	$(NMA_LIBS) \
 	$(GUDEV_LIBS) \
-	$(top_builddir)/src/marshallers/libmarshallers.la \
 	$(top_builddir)/src/wireless-security/libwireless-security.la
 
 libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \
diff --git a/src/marshallers/Makefile.am b/src/marshallers/Makefile.am
deleted file mode 100644
index ee2edf20..00000000
--- a/src/marshallers/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-include $(GLIB_MAKEFILE)
-
-noinst_LTLIBRARIES = libmarshallers.la
-
-GLIB_GENERATED = \
-	nma-marshal.h \
-	nma-marshal.c
-
-BUILT_SOURCES = $(GLIB_GENERATED)
-
-nma_marshal_sources = \
-	$(top_srcdir)/src/*.c \
-	$(top_srcdir)/src/gnome-bluetooth/*.c \
-	$(top_srcdir)/src/connection-editor/*.c
-
-libmarshallers_la_SOURCES = \
-	nma-marshal.h \
-	nma-marshal.c
-
-libmarshallers_la_CPPFLAGS = \
-	$(GOBJECT_CFLAGS) \
-	-DG_DISABLE_DEPRECATED
-
-
-libmarshallers_la_LIBADD = $(GOBJECT_LIBS)
-