isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

2007-12-21 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* Makefile.am: Move tests build before docs, to cut down the
	distcheck failure discovery

	* clutter.symbols: Add clutter_texture_set_area_from_rgb_data()

	* clutter/clutter-actor.c:
	* clutter/clutter-script.c:
	* clutter/clutter-texture.c:
	* clutter/json/json-generator.c:
	* clutter/json/json-parser.c: Compilation fixes for passing distcheck

	* tests/test-grab.c:
	* tests/test-score.c:
	* tests/test-script.c:
	* tests/test-shader.c:
	* tests/test-unproject.c: Ditto as above
This commit is contained in:
Emmanuele Bassi
2007-12-21 15:25:00 +00:00
parent f7b3b47c29
commit ee4bcf6465
13 changed files with 73 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
clutter/clutter-script.c
View File

@ -1094,11 +1094,11 @@ apply_behaviours (ClutterScript *script,
object = clutter_script_get_object (script, name);
if (!object)
{
ObjectInfo *oinfo;
ObjectInfo *behaviour_info;
oinfo = g_hash_table_lookup (script->priv->objects, name);
if (oinfo)
object = clutter_script_construct_object (script, oinfo);
behaviour_info = g_hash_table_lookup (script->priv->objects, name);
if (behaviour_info)
object = clutter_script_construct_object (script, behaviour_info);
}
if (!object)
@ -1136,11 +1136,11 @@ add_children (ClutterScript *script,
object = clutter_script_get_object (script, name);
if (!object)
{
ObjectInfo *oinfo;
ObjectInfo *child_info;
oinfo = g_hash_table_lookup (script->priv->objects, name);
if (oinfo)
object = clutter_script_construct_object (script, oinfo);
child_info = g_hash_table_lookup (script->priv->objects, name);
if (child_info)
object = clutter_script_construct_object (script, child_info);
}
if (!object)