isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 08:30:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Commit ChangeLog for the previous revision

Browse Source
This commit is contained in:
Emmanuele Bassi 2008-05-28 12:19:24 +00:00
parent c74dfa96ca
commit 1b9ce112c4
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
2008-05-28 Emmanuele Bassi <ebassi@openedhand.com>
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 <neil@o-hand.com> 2008-05-28 Neil Roberts <neil@o-hand.com>
* clutter/cogl/gles/cogl-gles2-wrapper.c (cogl_wrap_glGetFixedv): * clutter/cogl/gles/cogl-gles2-wrapper.c (cogl_wrap_glGetFixedv):