2007-10-18 Emmanuele Bassi <ebassi@openedhand.com>
authorEmmanuele Bassi <ebassi@openedhand.com>
Thu, 18 Oct 2007 12:31:07 +0000 (12:31 +0000)
committerEmmanuele Bassi <ebassi@openedhand.com>
Thu, 18 Oct 2007 12:31:07 +0000 (12:31 +0000)
commitf1105807fb55f5131e248e10b1cd000ab916f324
tree2885ed3612bdd00d5dea578063431bcd8f9fa042
parent1ccbe04505a61dd71339add671c28e72f0070916
2007-10-18  Emmanuele Bassi  <ebassi@openedhand.com>

* clutter/clutter-script-private.h:
* clutter/clutter-script.h:
* clutter/clutter-script.c: Allow id-less objects: as long
as they have a "type" member, a unique id will be provided.

(json_object_end): Add merge id to the object information
structure.

(apply_behaviours), (add_children): Keep the unresolved
objects around.

(construct_stage), (clutter_script_construct_object): If an
object has unresolved children or behaviours try resolving
them when we ask for it.

(json_parse_end), (clutter_script_ensure_objects): Ensure
that the objects are fully constructed as best as we can when
finished parsing.

(object_info_free), (remove_by_merge_id):
(clutter_script_unmerge_objects): Remove objects under the
same merge id returned by the loading functions. (Fixes
bug #558)
ChangeLog
clutter/clutter-script-private.h
clutter/clutter-script.c
clutter/clutter-script.h
doc/reference/ChangeLog
doc/reference/clutter-sections.txt
tests/test-script.c
tests/test-script.json