test: stop generating marshallers

They haven't been needed since GLib 2.30. Until now, we were also
incorrectly distributing the generated marshallers in tarball releases.

5 files changed, 13 insertions, 40 deletions

diff --git a/test/core/Makefile.am b/test/core/Makefile.am
index 27f8c39..869ca11 100644
--- a/test/core/Makefile.am
+++ b/test/core/Makefile.am
@@ -46,7 +46,12 @@ check-valgrind: all
 	$(MAKE) check-TESTS \
 	DEBUG="env $(VALGRIND_ENV) $(VALGRIND) $(VALGRIND_ARGS)"
 
-EXTRA_DIST=run-test.sh run-peer-test.sh test-service-glib.xml my-object-marshal.list test-service-glib-subclass.xml
+EXTRA_DIST = \
+	run-peer-test.sh \
+	run-test.sh \
+	test-service-glib-subclass.xml \
+	test-service-glib.xml \
+	$(NULL)
 
 if DBUS_BUILD_TESTS
 
@@ -87,14 +92,12 @@ test_30574_SOURCES = \
 test_private_SOURCES = \
 	my-object.c \
 	my-object.h \
-	my-object-marshal.c \
 	private.c
 
 test_proxy_noc_SOURCES = \
 	proxy-noc.c
 
 test_proxy_peer_SOURCES = \
-	my-object-marshal.c \
 	my-object.c \
 	my-object.h \
 	proxy-peer.c
@@ -104,13 +107,11 @@ test_registrations_SOURCES = \
 	my-object.h \
 	my-object-subclass.c \
 	my-object-subclass.h \
-	my-object-marshal.c \
 	registrations.c
 
 test_dbus_glib_SOURCES=				\
 	my-object.c \
 	my-object.h \
-	my-object-marshal.c \
 	test-dbus-glib.c
 
 test_dbus_glib_LDADD= $(tool_ldadd)
@@ -118,21 +119,23 @@ test_dbus_glib_LDADD= $(tool_ldadd)
 test_error_mapping_SOURCES = \
 	my-object.c \
 	my-object.h \
-	my-object-marshal.c \
 	error-mapping.c
 
 test_variant_recursion_SOURCES=test-variant-recursion.c
 
 test_variant_recursion_LDADD= $(tool_ldadd)
 
-BUILT_SOURCES = test-service-glib-glue.h test-service-glib-subclass-glue.h test-service-glib-bindings.h my-object-marshal.c my-object-marshal.h 
+BUILT_SOURCES = \
+	test-service-glib-bindings.h \
+	test-service-glib-glue.h \
+	test-service-glib-subclass-glue.h \
+	$(NULL)
 
 test_service_glib_SOURCES=				\
 	my-object.c                             \
 	my-object.h                             \
 	my-object-subclass.c                    \
 	my-object-subclass.h                    \
-	my-object-marshal.c                             \
 	test-service-glib.c 
 
 test-service-glib-glue.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
@@ -144,21 +147,11 @@ test-service-glib-subclass-glue.h: test-service-glib-subclass.xml $(top_builddir
 test-service-glib-bindings.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml
 
-my-object-marshal.c: Makefile my-object-marshal.list
-	echo "#include <config.h>" > $@.tmp
-	@GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header --body >> $@.tmp
-	mv $@.tmp $@
-
-my-object-marshal.h: Makefile my-object-marshal.list
-	@GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header > my-object-marshal.h
-
-
 peer_server_SOURCES = \
 	my-object.c                             \
 	my-object.h                             \
 	my-object-subclass.c                    \
 	my-object-subclass.h                    \
-	my-object-marshal.c                             \
 	peer-server.c
 
 peer_client_SOURCES = \
diff --git a/test/core/my-object.c b/test/core/my-object.c
index e31dca3..4a0002e 100644
--- a/test/core/my-object.c
+++ b/test/core/my-object.c
@@ -3,20 +3,9 @@
 #include <glib/gi18n.h>
 #include <glib-object.h>
 #include "my-object.h"
-#include "my-object-marshal.h"
 
 #include "test-service-glib-glue.h"
 
-void
-my_object_register_marshallers (void)
-{
-  dbus_g_object_register_marshaller (my_object_marshal_VOID__STRING_INT_STRING,
-      G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INVALID);
-
-  dbus_g_object_register_marshaller (my_object_marshal_VOID__STRING_BOXED,
-      G_TYPE_NONE, G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
-}
-
 /* Properties */
 enum
 {
@@ -135,8 +124,6 @@ my_object_class_init (MyObjectClass *mobject_class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (mobject_class);
 
-  my_object_register_marshallers ();
-
   dbus_g_object_type_install_info (MY_TYPE_OBJECT,
 				   &dbus_glib_my_object_object_info);
 
@@ -198,8 +185,7 @@ my_object_class_init (MyObjectClass *mobject_class)
 		  G_OBJECT_CLASS_TYPE (mobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  my_object_marshal_VOID__STRING_INT_STRING,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING);
 
   signals[SIG1] =
@@ -207,8 +193,7 @@ my_object_class_init (MyObjectClass *mobject_class)
 		  G_OBJECT_CLASS_TYPE (mobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   0,
-                  NULL, NULL,
-                  my_object_marshal_VOID__STRING_BOXED,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_VALUE);
 
   signals[SIG2] =
diff --git a/test/core/my-object.h b/test/core/my-object.h
index 779efac..416610e 100644
--- a/test/core/my-object.h
+++ b/test/core/my-object.h
@@ -7,7 +7,6 @@
 typedef struct MyObject MyObject;
 typedef struct MyObjectClass MyObjectClass;
 
-void my_object_register_marshallers (void);
 GType my_object_get_type (void);
 
 struct MyObject
diff --git a/test/core/test-dbus-glib.c b/test/core/test-dbus-glib.c
index acab197..e549ba8 100644
--- a/test/core/test-dbus-glib.c
+++ b/test/core/test-dbus-glib.c
@@ -1707,8 +1707,6 @@ main (int argc, char **argv)
   if (proxy == NULL)
     lose_gerror ("Failed to create proxy for name owner", error);
 
-  my_object_register_marshallers ();
-
   dbus_g_proxy_add_signal (proxy, "Sig0", G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INVALID);
   dbus_g_proxy_add_signal (proxy, "Sig1", G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
   dbus_g_proxy_add_signal (proxy, "Sig2", DBUS_TYPE_G_STRING_STRING_HASHTABLE, G_TYPE_INVALID);
diff --git a/test/manual/Makefile.am b/test/manual/Makefile.am
index b028b6c..51122f0 100644
--- a/test/manual/Makefile.am
+++ b/test/manual/Makefile.am
@@ -25,8 +25,6 @@ endif
 # This "test" exercises invalid usage. It is deliberately not run in
 # TESTS, because it's (by design) full of bugs.
 test_invalid_usage_SOURCES = \
-	../core/my-object-marshal.c \
-	../core/my-object-marshal.h \
 	../core/my-object.c \
 	../core/my-object.h \
 	invalid-usage.c