summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@linux.intel.com>2012-06-08 14:13:36 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2012-06-19 08:53:23 +0100
commitfb2ce6bd6da4de59b15354340b6d3303f7731374 (patch)
tree1bf9f42fbf76e4a5fc2fffc2b8ec6fcdb1e15bfc
parent57513d21f1925311e3e9230b4bc78e09910dc1fa (diff)
downloadclutter-fb2ce6bd6da4de59b15354340b6d3303f7731374.tar.gz
text: Chain up in the ScriptableIface implementation
We need ClutterActor's implementation to run as well.
-rw-r--r--clutter/clutter-text.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c
index 9917214d0..b0525b41d 100644
--- a/clutter/clutter-text.c
+++ b/clutter/clutter-text.c
@@ -86,6 +86,8 @@ static const ClutterColor default_selection_color = { 0, 0, 0, 255 };
static const ClutterColor default_text_color = { 0, 0, 0, 255 };
static const ClutterColor default_selected_text_color = { 0, 0, 0, 255 };
+static ClutterScriptableIface *parent_scriptable_iface = NULL;
+
static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
G_DEFINE_TYPE_WITH_CODE (ClutterText,
@@ -2901,7 +2903,10 @@ clutter_text_parse_custom_node (ClutterScriptable *scriptable,
return TRUE;
}
- return FALSE;
+ return parent_scriptable_iface->parse_custom_node (scriptable, script,
+ value,
+ name,
+ node);
}
static void
@@ -2918,12 +2923,16 @@ clutter_text_set_custom_property (ClutterScriptable *scriptable,
g_value_get_string (value));
}
else
- g_object_set_property (G_OBJECT (scriptable), name, value);
+ parent_scriptable_iface->set_custom_property (scriptable, script,
+ name,
+ value);
}
static void
clutter_scriptable_iface_init (ClutterScriptableIface *iface)
{
+ parent_scriptable_iface = g_type_interface_peek_parent (iface);
+
iface->parse_custom_node = clutter_text_parse_custom_node;
iface->set_custom_property = clutter_text_set_custom_property;
}