diff options
| -rw-r--r-- | json-glib/Makefile.am | 2 | ||||
| -rw-r--r-- | json-glib/json-parser.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/json-glib/Makefile.am b/json-glib/Makefile.am index 28638b2..85fb818 100644 --- a/json-glib/Makefile.am +++ b/json-glib/Makefile.am @@ -61,7 +61,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.enums # glib-genmarshal rules glib_marshal_list = json-marshal.list -glib_marshal_prefix = _json_marshal +glib_marshal_prefix = json_marshal include $(top_srcdir)/build/autotools/Makefile.am.marshal lib_LTLIBRARIES += libjson-glib-1.0.la diff --git a/json-glib/json-parser.c b/json-glib/json-parser.c index e2343b6..08049ca 100644 --- a/json-glib/json-parser.c +++ b/json-glib/json-parser.c @@ -168,7 +168,7 @@ json_parser_class_init (JsonParserClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, parse_start), NULL, NULL, - _json_marshal_VOID__VOID, + json_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * JsonParser::parse-end: @@ -183,7 +183,7 @@ json_parser_class_init (JsonParserClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, parse_end), NULL, NULL, - _json_marshal_VOID__VOID, + json_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * JsonParser::object-start: @@ -198,7 +198,7 @@ json_parser_class_init (JsonParserClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, object_start), NULL, NULL, - _json_marshal_VOID__VOID, + json_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * JsonParser::object-member: @@ -216,7 +216,7 @@ json_parser_class_init (JsonParserClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, object_member), NULL, NULL, - _json_marshal_VOID__BOXED_STRING, + json_marshal_VOID__BOXED_STRING, G_TYPE_NONE, 2, JSON_TYPE_OBJECT, G_TYPE_STRING); @@ -234,7 +234,7 @@ json_parser_class_init (JsonParserClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, object_end), NULL, NULL, - _json_marshal_VOID__BOXED, + json_marshal_VOID__BOXED, G_TYPE_NONE, 1, JSON_TYPE_OBJECT); /** @@ -250,7 +250,7 @@ json_parser_class_init (JsonParserClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, array_start), NULL, NULL, - _json_marshal_VOID__VOID, + json_marshal_VOID__VOID, G_TYPE_NONE, 0); /** * JsonParser::array-element: @@ -268,7 +268,7 @@ json_parser_class_init (JsonParserClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, array_element), NULL, NULL, - _json_marshal_VOID__BOXED_INT, + json_marshal_VOID__BOXED_INT, G_TYPE_NONE, 2, JSON_TYPE_ARRAY, G_TYPE_INT); @@ -286,7 +286,7 @@ json_parser_class_init (JsonParserClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, array_end), NULL, NULL, - _json_marshal_VOID__BOXED, + json_marshal_VOID__BOXED, G_TYPE_NONE, 1, JSON_TYPE_ARRAY); /** @@ -303,7 +303,7 @@ json_parser_class_init (JsonParserClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (JsonParserClass, error), NULL, NULL, - _json_marshal_VOID__POINTER, + json_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); } |