diff options
| author | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2016-10-27 15:20:03 -0300 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-03-13 09:18:51 +0000 |
| commit | d77a1c81d9203811af01af580c5f3975e4f9fa24 (patch) | |
| tree | d406f1c94319264184516c56b3e5ae51b8e0f402 /json-glib/json-parser.c | |
| parent | 0cb1db37f8a1edf95f8d14c8868091804e54e4c3 (diff) | |
| download | json-glib-d77a1c81d9203811af01af580c5f3975e4f9fa24.tar.gz | |
Stop providing our own marshaller and use the generic one
https://bugzilla.gnome.org/show_bug.cgi?id=773603
Diffstat (limited to 'json-glib/json-parser.c')
| -rw-r--r-- | json-glib/json-parser.c | 29 |
1 files changed, 10 insertions, 19 deletions
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); } |