diff options
| author | Emmanuele Bassi <ebassi@openedhand.com> | 2008-05-09 13:58:04 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@openedhand.com> | 2008-05-09 13:58:04 +0000 |
| commit | d7a8fa8b531da2e0e7af78501d93c25765c41511 (patch) | |
| tree | f624167b6262b53b60b51bc03d018746fd568fb6 /clutter/clutter-script-private.h | |
| parent | 4f9738d3a3be803e6b991c98d94984d30eab74c8 (diff) | |
| download | clutter-d7a8fa8b531da2e0e7af78501d93c25765c41511.tar.gz | |
2008-05-09 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-script-private.h: Add a flag for the
default stage.
* clutter/clutter-script.c:
(json_object_end): If the "type" member is "ClutterStage"
and we have a "is-default" member set to true then this
is the default stage.
(clutter_script_construct_object): Special case the default
stage instead of each ClutterStage.
(object_info_free): Ditto as above.
* tests/test-script.json: Test the creation of a non-default
stage and the ::destroy handler to quit.
Diffstat (limited to 'clutter/clutter-script-private.h')
| -rw-r--r-- | clutter/clutter-script-private.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/clutter/clutter-script-private.h b/clutter/clutter-script-private.h index 2d17d95ac..92d8c277f 100644 --- a/clutter/clutter-script-private.h +++ b/clutter/clutter-script-private.h @@ -50,9 +50,10 @@ typedef struct { guint merge_id; - guint is_toplevel : 1; - guint has_unresolved : 1; - guint is_unmerged : 1; + guint is_stage_default : 1; + guint is_toplevel : 1; + guint has_unresolved : 1; + guint is_unmerged : 1; } ObjectInfo; void object_info_free (gpointer data); |