isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 19:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

script-parser: Allow initialized GValue arg in clutter_script_parse_node

Browse Source 
Allow to 'abuse' the clutter_script_parse_node function by calling it
with an initialized GValue instead of a valid GParamSpec argument to
obtain the correct typed value from the json node.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2528
This commit is contained in:
Bastian Winkler 2011-01-12 13:09:52 +01:00 committed by Emmanuele Bassi
parent 8e1c1909f8
commit 95b3a718ef
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clutter/clutter-script-parser.c
View File

@ -1069,15 +1069,21 @@ clutter_script_parse_node (ClutterScript *script,
* is a custom member that will be parsed by the Scriptable * is a custom member that will be parsed by the Scriptable
* interface implementantion * interface implementantion
*/ */
if (pspec == NULL) if (pspec == NULL && !G_IS_VALUE (value))
return FALSE; return FALSE;
else else
{ {
GType p_type = G_PARAM_SPEC_VALUE_TYPE (pspec); GType p_type;
ObjectInfo *oinfo; ObjectInfo *oinfo;
const gchar *id; const gchar *id;
g_value_init (value, p_type); if (G_IS_VALUE (value))
p_type = G_VALUE_TYPE (value);
else
{
p_type = G_PARAM_SPEC_VALUE_TYPE (pspec);
g_value_init (value, p_type);
}
if (g_type_is_a (p_type, G_TYPE_OBJECT)) if (g_type_is_a (p_type, G_TYPE_OBJECT))
{ {
@ -1160,11 +1166,12 @@ clutter_script_parse_node (ClutterScript *script,
return FALSE; return FALSE;
case JSON_NODE_ARRAY: case JSON_NODE_ARRAY:
if (!pspec) if (!pspec && !G_IS_VALUE (value))
return FALSE; return FALSE;
else else
{ {
g_value_init (value, G_PARAM_SPEC_VALUE_TYPE (pspec)); if (!G_IS_VALUE (value))
g_value_init (value, G_PARAM_SPEC_VALUE_TYPE (pspec));
if (G_VALUE_HOLDS (value, CLUTTER_TYPE_KNOT)) if (G_VALUE_HOLDS (value, CLUTTER_TYPE_KNOT))
{ {
@ -1236,10 +1243,10 @@ clutter_script_parse_node (ClutterScript *script,
case JSON_NODE_VALUE: case JSON_NODE_VALUE:
json_node_get_value (node, &node_value); json_node_get_value (node, &node_value);
if (pspec) if (!pspec && !G_IS_VALUE (value))
g_value_init (value, G_PARAM_SPEC_VALUE_TYPE (pspec));
else
g_value_init (value, G_VALUE_TYPE (&node_value)); g_value_init (value, G_VALUE_TYPE (&node_value));
else if (pspec)
g_value_init (value, G_PARAM_SPEC_VALUE_TYPE (pspec));
switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (value))) switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (value)))
{ {