From 1b9ce112c499b50d2fe9a80c5486c400d5ee7eae Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 28 May 2008 12:19:24 +0000 Subject: [PATCH] Commit ChangeLog for the previous revision --- ChangeLog | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/ChangeLog b/ChangeLog index 252465d71..ad67206de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2008-05-28 Emmanuele Bassi + + Fix merging of objects with the same id. + + * clutter/clutter-script.c: + (json_object_end): If there already is an ObjectInfo under the + parsed id, merge the construction with the currently stored + state. + + (parse_children), (parse_signals), + (parse_behaviours): Append the newly parsed children, signals + and behaviours, in case the ObjectInfo already has unresolved + items. + + (clutter_script_construct_object): Fix a typo in the type check. + + (clutter_script_init): Do not copy the key inside the hash + table holding the objects - we are already holding it inside + the value. + 2008-05-28 Neil Roberts * clutter/cogl/gles/cogl-gles2-wrapper.c (cogl_wrap_glGetFixedv):