brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text: Chain up in the ScriptableIface implementation

Browse Source 
We need ClutterActor's implementation to run as well.
This commit is contained in:
Emmanuele Bassi 2012-06-08 14:13:36 +01:00
parent c6e1d02fed
commit 189a93677f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clutter/clutter-text.c
View File

@ -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 const ClutterColor default_selected_text_color = { 0, 0, 0, 255 };
static ClutterAnimatableIface *parent_animatable_iface = NULL; static ClutterAnimatableIface *parent_animatable_iface = NULL;
static ClutterScriptableIface *parent_scriptable_iface = NULL;
static void clutter_scriptable_iface_init (ClutterScriptableIface *iface); static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
static void clutter_animatable_iface_init (ClutterAnimatableIface *iface); static void clutter_animatable_iface_init (ClutterAnimatableIface *iface);
@ -2980,7 +2981,10 @@ clutter_text_parse_custom_node (ClutterScriptable *scriptable,
return TRUE; return TRUE;
} }
return FALSE; return parent_scriptable_iface->parse_custom_node (scriptable, script,
value,
name,
node);
} }
static void static void
@ -3146,12 +3150,16 @@ clutter_text_set_custom_property (ClutterScriptable *scriptable,
g_value_get_string (value)); g_value_get_string (value));
} }
else else
g_object_set_property (G_OBJECT (scriptable), name, value); parent_scriptable_iface->set_custom_property (scriptable, script,
name,
value);
} }
static void static void
clutter_scriptable_iface_init (ClutterScriptableIface *iface) 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->parse_custom_node = clutter_text_parse_custom_node;
iface->set_custom_property = clutter_text_set_custom_property; iface->set_custom_property = clutter_text_set_custom_property;
} }