[clutter] text: Chain up in the ScriptableIface implementation
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] text: Chain up in the ScriptableIface implementation
- Date: Fri, 8 Jun 2012 15:09:05 +0000 (UTC)
commit 189a93677f0d0c710b3692fe88258a2675fd6f5c
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Fri Jun 8 14:13:36 2012 +0100
text: Chain up in the ScriptableIface implementation
We need ClutterActor's implementation to run as well.
clutter/clutter-text.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c
index 1d2da46..5215bda 100644
--- a/clutter/clutter-text.c
+++ b/clutter/clutter-text.c
@@ -89,6 +89,7 @@ static const ClutterColor default_text_color = { 0, 0, 0, 255 };
static const ClutterColor default_selected_text_color = { 0, 0, 0, 255 };
static ClutterAnimatableIface *parent_animatable_iface = NULL;
+static ClutterScriptableIface *parent_scriptable_iface = NULL;
static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
static void clutter_animatable_iface_init (ClutterAnimatableIface *iface);
@@ -2980,7 +2981,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
@@ -3146,12 +3150,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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]