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

script: Use JsonObject direct accessors

Browse Source 
Instead of getting the JsonNode for a member of which we mandate
the type we can use the typed accessors of JsonObject.
This commit is contained in:
Emmanuele Bassi 2009-11-03 18:29:52 +00:00
parent 0ff420fab5
commit 4ad57aa3e4
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clutter/clutter-script.c
View File

@ -724,23 +724,26 @@ json_object_end (JsonParser *parser,
return; return;
} }
val = json_object_get_member (object, "id"); id = json_object_get_string_member (object, "id");
id = json_node_get_string (val);
oinfo = g_hash_table_lookup (priv->objects, id); oinfo = g_hash_table_lookup (priv->objects, id);
if (G_LIKELY (!oinfo)) if (G_LIKELY (!oinfo))
{ {
const gchar *class_name;
oinfo = g_slice_new0 (ObjectInfo); oinfo = g_slice_new0 (ObjectInfo);
oinfo->merge_id = priv->last_merge_id; oinfo->merge_id = priv->last_merge_id;
oinfo->id = g_strdup (id); oinfo->id = g_strdup (id);
val = json_object_get_member (object, "type"); class_name = json_object_get_string_member (object, "type");
oinfo->class_name = json_node_dup_string (val); oinfo->class_name = g_strdup (class_name);
if (json_object_has_member (object, "type_func")) if (json_object_has_member (object, "type_func"))
{ {
val = json_object_get_member (object, "type_func"); const gchar *type_func;
oinfo->type_func = json_node_dup_string (val);
type_func = json_object_get_string_member (object, "type_func");
oinfo->type_func = g_strdup (type_func);
json_object_remove_member (object, "type_func"); json_object_remove_member (object, "type_func");
} }
@ -1525,6 +1528,7 @@ clutter_script_construct_object (ClutterScript *script,
g_free ((gchar *) param->name); g_free ((gchar *) param->name);
g_value_unset (&param->value); g_value_unset (&param->value);
} }
g_array_free (params, TRUE); g_array_free (params, TRUE);
for (i = 0; i < n_clutter_toplevels; i++) for (i = 0; i < n_clutter_toplevels; i++)