brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-12-21 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* Makefile.am: Move tests build before docs, to cut down the
	distcheck failure discovery

	* clutter.symbols: Add clutter_texture_set_area_from_rgb_data()

	* clutter/clutter-actor.c:
	* clutter/clutter-script.c:
	* clutter/clutter-texture.c:
	* clutter/json/json-generator.c:
	* clutter/json/json-parser.c: Compilation fixes for passing distcheck

	* tests/test-grab.c:
	* tests/test-score.c:
	* tests/test-script.c:
	* tests/test-shader.c:
	* tests/test-unproject.c: Ditto as above
This commit is contained in:
Emmanuele Bassi
2007-12-21 15:25:00 +00:00
parent f7b3b47c29
commit ee4bcf6465
13 changed files with 73 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
clutter/json/json-generator.c
View File

@ -354,8 +354,8 @@ dump_object (JsonGenerator *generator,
for (l = members; l != NULL; l = l->next)
{
const gchar *name = l->data;
JsonNode *cur = json_object_get_member (object, name);
const gchar *member_name = l->data;
JsonNode *cur = json_object_get_member (object, member_name);
guint sub_level = level + 1;
gint j;
gchar *value;
@ -368,21 +368,21 @@ dump_object (JsonGenerator *generator,
for (j = 0; j < (sub_level * indent); j++)
g_string_append_c (buffer, ' ');
}
g_string_append_printf (buffer, "\"%s\" : null", name);
g_string_append_printf (buffer, "\"%s\" : null", member_name);
break;
case JSON_NODE_VALUE:
value = dump_value (generator, sub_level, name, cur);
value = dump_value (generator, sub_level, member_name, cur);
g_string_append (buffer, value);
break;
case JSON_NODE_ARRAY:
value = dump_array (generator, sub_level, name, json_node_get_array (cur), NULL);
value = dump_array (generator, sub_level, member_name, json_node_get_array (cur), NULL);
g_string_append (buffer, value);
break;
case JSON_NODE_OBJECT:
value = dump_object (generator, sub_level, name, json_node_get_object (cur), NULL);
value = dump_object (generator, sub_level, member_name, json_node_get_object (cur), NULL);
g_string_append (buffer, value);
break;
}