Emmanuele Bassi
c74dfa96ca
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 12:09:41 +00:00
2008-05-28 11:29:58 +00:00
2008-05-15 14:31:43 +00:00
2008-05-27 17:42:50 +00:00
2008-05-13 16:09:42 +00:00
2008-05-19 14:21:24 +00:00
2008-04-09 14:18:42 +00:00
2008-04-25 13:37:36 +00:00
2008-05-07 16:12:54 +00:00
2008-05-13 10:37:17 +00:00
2008-05-16 09:47:37 +00:00
2008-05-26 20:55:53 +00:00
2008-05-23 09:42:32 +00:00
2008-04-23 12:53:25 +00:00
2008-04-18 15:03:30 +00:00
2008-04-18 15:03:30 +00:00
2008-05-13 10:37:17 +00:00
2008-04-04 15:02:11 +00:00
2007-11-19 16:35:46 +00:00
2007-11-13 14:12:51 +00:00
2008-01-21 16:07:28 +00:00
2008-01-21 16:07:28 +00:00
2007-12-17 17:16:49 +00:00
2007-11-27 12:34:28 +00:00
2008-01-18 11:02:34 +00:00
2008-01-18 11:02:34 +00:00
2008-02-08 15:39:41 +00:00
2007-08-07 14:03:58 +00:00
2007-12-17 17:16:49 +00:00
2007-11-13 13:21:56 +00:00
2008-02-11 20:31:16 +00:00
2008-01-30 12:13:26 +00:00
2008-05-01 09:28:41 +00:00
2007-08-07 14:03:58 +00:00
2008-04-25 13:37:36 +00:00
2006-12-12 20:20:04 +00:00
2007-12-24 14:52:41 +00:00
2007-08-07 14:03:58 +00:00
2008-04-11 15:40:08 +00:00
2007-11-05 17:12:11 +00:00
2008-03-28 22:50:55 +00:00
2008-05-09 10:58:26 +00:00
2008-04-30 16:27:18 +00:00
2008-01-30 12:13:26 +00:00
2008-03-06 12:39:24 +00:00
2008-03-06 12:39:24 +00:00
2007-12-25 11:41:10 +00:00
2007-08-20 20:16:15 +00:00
2008-03-28 22:50:55 +00:00
2008-05-15 14:31:43 +00:00
2008-04-25 13:37:36 +00:00
2008-05-15 14:31:43 +00:00
2008-05-15 14:31:43 +00:00
2008-04-17 11:09:27 +00:00
2008-05-09 16:27:06 +00:00
2008-05-09 16:27:06 +00:00
2008-05-23 09:42:32 +00:00
2008-03-28 22:50:55 +00:00
2008-03-09 19:07:17 +00:00
2008-03-07 17:34:40 +00:00
2008-04-23 13:58:58 +00:00
2007-03-22 18:21:59 +00:00
2006-05-29 08:59:36 +00:00
2008-02-20 10:59:47 +00:00
2007-11-19 21:14:16 +00:00
2008-03-19 18:33:33 +00:00
2008-01-09 14:40:31 +00:00
2008-05-13 23:02:45 +00:00
2008-04-17 16:50:23 +00:00
2008-04-18 15:03:30 +00:00
2008-02-15 15:18:02 +00:00
2006-11-15 23:37:53 +00:00
2008-01-09 14:18:53 +00:00
2008-03-19 18:33:33 +00:00
2008-05-15 14:31:43 +00:00
2008-05-13 23:02:45 +00:00
2008-05-28 08:58:44 +00:00
2006-11-20 22:20:48 +00:00
2008-03-19 11:46:57 +00:00
2008-03-19 11:46:57 +00:00
2008-04-25 13:37:36 +00:00
2008-05-09 13:58:04 +00:00
2008-05-28 12:09:41 +00:00
2008-01-18 11:25:47 +00:00
2007-11-14 11:32:24 +00:00
2007-11-23 13:11:10 +00:00
2008-04-29 16:10:37 +00:00
2008-04-11 12:00:50 +00:00
2008-04-04 15:02:11 +00:00
2008-03-28 22:50:55 +00:00
2008-04-04 15:02:11 +00:00
2008-04-25 13:37:36 +00:00
2008-05-12 15:26:37 +00:00
2008-04-25 13:37:36 +00:00
2008-05-07 16:12:54 +00:00
2008-04-25 13:37:36 +00:00
2008-05-12 15:18:38 +00:00
2008-03-18 22:07:17 +00:00
2008-04-17 16:50:23 +00:00
2007-06-09 13:20:06 +00:00
2008-03-28 22:50:55 +00:00
2008-05-09 10:58:26 +00:00
2008-04-17 11:09:27 +00:00
2008-02-12 17:17:52 +00:00
2007-01-23 20:29:11 +00:00
2008-03-31 17:15:02 +00:00
2008-01-09 14:40:31 +00:00
2008-05-09 16:27:06 +00:00
c74dfa96ca