From 50aec3c540d6609d9980fab6a26ba14869982c8b Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 21 Oct 2009 15:17:50 +0100 Subject: [PATCH] script: Always allow setting object properties by id reference The block that allows setting a GObject property holding an object instance is conditionally depending on the USE_PIXBUF define. This makes it impossible to reference an object inside ClutterScript on platforms not using GdkPixbuf. --- clutter/clutter-script.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c index 752e0cba6..a549cd282 100644 --- a/clutter/clutter-script.c +++ b/clutter/clutter-script.c @@ -1103,21 +1103,25 @@ clutter_script_parse_node (ClutterScript *script, g_free (path); } } - else +#endif + + if (G_VALUE_HOLDS (&node_value, G_TYPE_STRING)) { - if (G_VALUE_HOLDS (&node_value, G_TYPE_STRING)) + const gchar *str = g_value_get_string (&node_value); + GObject *object = clutter_script_get_object (script, str); + if (object) { - const gchar *str = g_value_get_string (&node_value); - GObject *object = clutter_script_get_object (script, str); - if (object) - { - g_value_set_object (value, object); - retval = TRUE; - } + CLUTTER_NOTE (SCRIPT, + "Assigning '%s' (%s) to property '%s'", + str, + G_OBJECT_TYPE_NAME (object), + name); + + g_value_set_object (value, object); + retval = TRUE; } } break; -#endif default: retval = FALSE; @@ -1179,6 +1183,7 @@ clutter_script_translate_parameters (ClutterScript *script, if (!res) { + CLUTTER_NOTE (SCRIPT, "Property '%s' ignored", pinfo->name); unparsed = g_list_prepend (unparsed, pinfo); continue; }