[clutter/clutter-1.10] text: Chain up in the ScriptableIface implementation
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.10] text: Chain up in the ScriptableIface implementation
- Date: Tue, 19 Jun 2012 08:37:06 +0000 (UTC)
commit fb2ce6bd6da4de59b15354340b6d3303f7731374
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 | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c
index 9917214..b0525b4 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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]