isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[json] Update the internal JSON-GLib copy

Browse Source 
There have been changes in JSON-GLib upstream to clean up the
data structures, and facilitate introspection.

We still not use the updated JsonParser with the (private) JsonScanner
code, since it's a fork of GLib's GScanner.
This commit is contained in:
Emmanuele Bassi
2009-06-09 12:42:19 +01:00
parent 91856b1bed
commit d743aeaa21
8 changed files with 1459 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/json/json-parser.c
View File

@ -31,6 +31,8 @@
#include <string.h>
#include "json-types-private.h"
#include "json-marshal.h"
#include "json-parser.h"
@ -587,7 +589,7 @@ json_parse_object (JsonParser *parser,
return token;
}
json_object_add_member (object, name, node);
json_object_set_member (object, name, node);
node->parent = priv->current_node;
g_signal_emit (parser, parser_signals[OBJECT_MEMBER], 0,
@ -623,7 +625,7 @@ json_parse_object (JsonParser *parser,
return token;
}
json_object_add_member (object, name, node);
json_object_set_member (object, name, node);
node->parent = priv->current_node;
g_signal_emit (parser, parser_signals[OBJECT_MEMBER], 0,
@ -693,7 +695,7 @@ json_parse_object (JsonParser *parser,
if (node)
{
json_object_add_member (object, name, node);
json_object_set_member (object, name, node);
node->parent = priv->current_node;
g_signal_emit (parser, parser_signals[OBJECT_MEMBER], 0,