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

2007-11-14 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-scriptable.[ch]: Rename ::set_name and ::get_name
	to ::set_id and ::get_id, to avoid potential confusion with the
	ClutterActor:name property.

	* clutter/clutter-script.h:
	* clutter/clutter-script.c (clutter_script_construct_object): Use
	clutter_scriptable_set_id().

	(clutter_get_script_id): Add a public function to retrieve the ID
	used in the UI definition files from an object.

	* clutter/clutter-actor.c: Do not set the name of the actor with
	the ID set in the UI definition files.

	* tests/test-script.c: Test clutter_get_script_id().

	* clutter.symbols: Update with the new symbols.
This commit is contained in:
Emmanuele Bassi
2007-11-14 11:32:24 +00:00
parent bbf57ee461
commit b0e169d73c
10 changed files with 93 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
clutter/clutter-scriptable.c
View File

@ -66,57 +66,61 @@ clutter_scriptable_get_type (void)
}
/**
* clutter_scriptable_set_name:
* clutter_scriptable_set_id:
* @scriptable: a #ClutterScriptable
* @name: the name of the object
* @id: the #ClutterScript id of the object
*
* Sets @name as the name for this instance of #ClutterScriptableIface.
* This name can be used by user interface designer applications.
* Sets @id as the unique Clutter script it for this instance of
* #ClutterScriptableIface.
*
* This name can be used by user interface designer applications to
* define a unique name for an object constructable using the UI
* definition language parsed by #ClutterScript.
*
* Since: 0.6
*/
void
clutter_scriptable_set_name (ClutterScriptable *scriptable,
const gchar *name)
clutter_scriptable_set_id (ClutterScriptable *scriptable,
const gchar *id)
{
ClutterScriptableIface *iface;
g_return_if_fail (CLUTTER_IS_SCRIPTABLE (scriptable));
g_return_if_fail (name != NULL);
g_return_if_fail (id != NULL);
iface = CLUTTER_SCRIPTABLE_GET_IFACE (scriptable);
if (iface->set_name)
iface->set_name (scriptable, name);
if (iface->set_id)
iface->set_id (scriptable, id);
else
g_object_set_data_full (G_OBJECT (scriptable),
"clutter-script-name",
g_strdup (name),
"clutter-script-id",
g_strdup (id),
g_free);
}
/**
* clutter_scriptable_get_name:
* clutter_scriptable_get_id:
* @scriptable: a #ClutterScriptable
*
* Retrieves the name of @scriptable set using clutter_scriptable_set_name().
* Retrieves the id of @scriptable set using clutter_scriptable_set_id().
*
* Return value: the name of the object. The returned string is owned by
* Return value: the id of the object. The returned string is owned by
* the scriptable object and should never be modified of freed
*
* Since: 0.6
*/
G_CONST_RETURN gchar *
clutter_scriptable_get_name (ClutterScriptable *scriptable)
clutter_scriptable_get_id (ClutterScriptable *scriptable)
{
ClutterScriptableIface *iface;
g_return_val_if_fail (CLUTTER_IS_SCRIPTABLE (scriptable), NULL);
iface = CLUTTER_SCRIPTABLE_GET_IFACE (scriptable);
if (iface->get_name)
return iface->get_name (scriptable);
if (iface->get_id)
return iface->get_id (scriptable);
else
return g_object_get_data (G_OBJECT (scriptable), "clutter-script-name");
return g_object_get_data (G_OBJECT (scriptable), "clutter-script-id");
}
/**