brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

script: Do not use clutter_stage_get_default()

Browse Source 
It's about to go away, so we should use the StageManager API instead.
This commit is contained in:
Emmanuele Bassi 2011-11-09 17:09:37 +00:00
parent b1ccd262b1
commit 2288d708e2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clutter/clutter-script-parser.c
View File

@ -43,6 +43,8 @@
#include "clutter-script-private.h" #include "clutter-script-private.h"
#include "clutter-scriptable.h" #include "clutter-scriptable.h"
#include "clutter-stage-manager.h"
#include "clutter-private.h" #include "clutter-private.h"
static void clutter_script_parser_object_end (JsonParser *parser, static void clutter_script_parser_object_end (JsonParser *parser,
@ -1966,7 +1968,9 @@ _clutter_script_construct_object (ClutterScript *script,
if (oinfo->is_stage && oinfo->is_stage_default) if (oinfo->is_stage && oinfo->is_stage_default)
{ {
ClutterStageManager *manager = clutter_stage_manager_get_default ();
GList *properties = oinfo->properties; GList *properties = oinfo->properties;
ClutterStage *default_stage;
/* the default stage is a complex beast: we cannot create it using /* the default stage is a complex beast: we cannot create it using
* g_object_newv() but we need clutter_script_construct_parameters() * g_object_newv() but we need clutter_script_construct_parameters()
@ -1981,7 +1985,8 @@ _clutter_script_construct_object (ClutterScript *script,
properties, properties,
&params); &params);
oinfo->object = G_OBJECT (clutter_stage_get_default ()); default_stage = clutter_stage_manager_get_default_stage (manager);
oinfo->object = G_OBJECT (default_stage);
for (i = 0; i < params->len; i++) for (i = 0; i < params->len; i++)
{ {