Stop providing our own marshaller and use the generic one

https://bugzilla.gnome.org/show_bug.cgi?id=773603

4 files changed, 11 insertions, 31 deletions

diff --git a/json-glib/Makefile.am b/json-glib/Makefile.am
index 2079bb8..f44c388 100644
--- a/json-glib/Makefile.am
+++ b/json-glib/Makefile.am
@@ -61,11 +61,6 @@ glib_enum_c = json-enum-types.c
 glib_enum_headers = $(source_h)
 include $(top_srcdir)/build/autotools/Makefile.am.enums
 
-# glib-genmarshal rules
-glib_marshal_list = json-marshal.list
-glib_marshal_prefix = json_marshal
-include $(top_srcdir)/build/autotools/Makefile.am.marshal
-
 lib_LTLIBRARIES += libjson-glib-1.0.la
 
 libjson_glib_1_0_la_CPPFLAGS = \
diff --git a/json-glib/json-generator.c b/json-glib/json-generator.c
index c47e7fe..42681f6 100644
--- a/json-glib/json-generator.c
+++ b/json-glib/json-generator.c
@@ -1,5 +1,5 @@
 /* json-generator.c - JSON streams generator
- * 
+ *
  * This file is part of JSON-GLib
  * Copyright (C) 2007  OpenedHand Ltd.
  * Copyright (C) 2009  Intel Corp.
@@ -36,7 +36,6 @@
 
 #include "json-types-private.h"
 
-#include "json-marshal.h"
 #include "json-generator.h"
 
 struct _JsonGeneratorPrivate
diff --git a/json-glib/json-marshal.list b/json-glib/json-marshal.list
deleted file mode 100644
index 6eaa904..0000000
--- a/json-glib/json-marshal.list
+++ /dev/null
@@ -1,5 +0,0 @@
-VOID:VOID
-VOID:BOXED
-VOID:BOXED,STRING
-VOID:BOXED,INT
-VOID:POINTER
diff --git a/json-glib/json-parser.c b/json-glib/json-parser.c
index 6312cf8..dda3eeb 100644
--- a/json-glib/json-parser.c
+++ b/json-glib/json-parser.c
@@ -41,7 +41,6 @@
 #include "json-types-private.h"
 
 #include "json-debug.h"
-#include "json-marshal.h"
 #include "json-parser.h"
 #include "json-scanner.h"
 
@@ -238,7 +237,7 @@ json_parser_class_init (JsonParserClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (JsonParserClass, parse_start),
                   NULL, NULL,
-                  json_marshal_VOID__VOID,
+                  NULL,
                   G_TYPE_NONE, 0);
   /**
    * JsonParser::parse-end:
@@ -252,13 +251,12 @@ json_parser_class_init (JsonParserClass *klass)
                   G_OBJECT_CLASS_TYPE (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (JsonParserClass, parse_end),
-                  NULL, NULL,
-                  json_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
   /**
    * JsonParser::object-start:
    * @parser: the #JsonParser that received the signal
-   * 
+   *
    * The ::object-start signal is emitted each time the #JsonParser
    * starts parsing a #JsonObject.
    */
@@ -267,8 +265,7 @@ json_parser_class_init (JsonParserClass *klass)
                   G_OBJECT_CLASS_TYPE (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (JsonParserClass, object_start),
-                  NULL, NULL,
-                  json_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
   /**
    * JsonParser::object-member:
@@ -285,8 +282,7 @@ json_parser_class_init (JsonParserClass *klass)
                   G_OBJECT_CLASS_TYPE (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (JsonParserClass, object_member),
-                  NULL, NULL,
-                  json_marshal_VOID__BOXED_STRING,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 2,
                   JSON_TYPE_OBJECT,
                   G_TYPE_STRING);
@@ -303,8 +299,7 @@ json_parser_class_init (JsonParserClass *klass)
                   G_OBJECT_CLASS_TYPE (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (JsonParserClass, object_end),
-                  NULL, NULL,
-                  json_marshal_VOID__BOXED,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1,
                   JSON_TYPE_OBJECT);
   /**
@@ -319,8 +314,7 @@ json_parser_class_init (JsonParserClass *klass)
                   G_OBJECT_CLASS_TYPE (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (JsonParserClass, array_start),
-                  NULL, NULL,
-                  json_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
   /**
    * JsonParser::array-element:
@@ -337,8 +331,7 @@ json_parser_class_init (JsonParserClass *klass)
                   G_OBJECT_CLASS_TYPE (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (JsonParserClass, array_element),
-                  NULL, NULL,
-                  json_marshal_VOID__BOXED_INT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 2,
                   JSON_TYPE_ARRAY,
                   G_TYPE_INT);
@@ -355,8 +348,7 @@ json_parser_class_init (JsonParserClass *klass)
                   G_OBJECT_CLASS_TYPE (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (JsonParserClass, array_end),
-                  NULL, NULL,
-                  json_marshal_VOID__BOXED,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1,
                   JSON_TYPE_ARRAY);
   /**
@@ -372,8 +364,7 @@ json_parser_class_init (JsonParserClass *klass)
                   G_OBJECT_CLASS_TYPE (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (JsonParserClass, error),
-                  NULL, NULL,
-                  json_marshal_VOID__POINTER,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1,
                   G_TYPE_POINTER);
 }