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

[script] Fix the default deserialization

Browse Source 
Properties parsed from ClutterScript should now use G_TYPE_INT64
and automatically convert between G_TYPE_INT and G_TYPE_INT64.
This commit is contained in:
Emmanuele Bassi 2009-08-12 16:01:25 +01:00
parent 4d52245637
commit cfbbacb807
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
clutter/clutter-script.c
View File

@ -965,7 +965,7 @@ clutter_script_parse_node (ClutterScript *script,
switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (value))) switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (value)))
{ {
/* fundamental JSON types */ /* fundamental JSON types */
case G_TYPE_INT: case G_TYPE_INT64:
case G_TYPE_DOUBLE: case G_TYPE_DOUBLE:
case G_TYPE_STRING: case G_TYPE_STRING:
case G_TYPE_BOOLEAN: case G_TYPE_BOOLEAN:
@ -973,25 +973,30 @@ clutter_script_parse_node (ClutterScript *script,
retval = TRUE; retval = TRUE;
break; break;
case G_TYPE_INT:
g_value_set_int (value, g_value_get_int64 (&node_value));
retval = TRUE;
break;
case G_TYPE_UINT: case G_TYPE_UINT:
g_value_set_uint (value, (guint) g_value_get_int (&node_value)); g_value_set_uint (value, (guint) g_value_get_int64 (&node_value));
retval = TRUE; retval = TRUE;
break; break;
case G_TYPE_ULONG: case G_TYPE_ULONG:
g_value_set_ulong (value, (gulong) g_value_get_int (&node_value)); g_value_set_ulong (value, (gulong) g_value_get_int64 (&node_value));
retval = TRUE; retval = TRUE;
break; break;
case G_TYPE_UCHAR: case G_TYPE_UCHAR:
g_value_set_uchar (value, (guchar) g_value_get_int (&node_value)); g_value_set_uchar (value, (guchar) g_value_get_int64 (&node_value));
retval = TRUE; retval = TRUE;
break; break;
case G_TYPE_ENUM: case G_TYPE_ENUM:
if (G_VALUE_HOLDS (&node_value, G_TYPE_INT)) if (G_VALUE_HOLDS (&node_value, G_TYPE_INT64))
{ {
g_value_set_enum (value, g_value_get_int (&node_value)); g_value_set_enum (value, g_value_get_int64 (&node_value));
retval = TRUE; retval = TRUE;
} }
else if (G_VALUE_HOLDS (&node_value, G_TYPE_STRING)) else if (G_VALUE_HOLDS (&node_value, G_TYPE_STRING))
@ -1007,9 +1012,9 @@ clutter_script_parse_node (ClutterScript *script,
break; break;
case G_TYPE_FLAGS: case G_TYPE_FLAGS:
if (G_VALUE_HOLDS (&node_value, G_TYPE_INT)) if (G_VALUE_HOLDS (&node_value, G_TYPE_INT64))
{ {
g_value_set_flags (value, g_value_get_int (&node_value)); g_value_set_flags (value, g_value_get_int64 (&node_value));
retval = TRUE; retval = TRUE;
} }
else if (G_VALUE_HOLDS (&node_value, G_TYPE_STRING)) else if (G_VALUE_HOLDS (&node_value, G_TYPE_STRING))