[clutter/deprecate-default-stage: 9/14] script: Do not use clutter_stage_get_default()
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/deprecate-default-stage: 9/14] script: Do not use clutter_stage_get_default()
- Date: Thu, 10 Nov 2011 15:52:51 +0000 (UTC)
commit 2288d708e2f6ad9f8348f738a44cc7d29cf95530
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Wed Nov 9 17:09:37 2011 +0000
script: Do not use clutter_stage_get_default()
It's about to go away, so we should use the StageManager API instead.
clutter/clutter-script-parser.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/clutter/clutter-script-parser.c b/clutter/clutter-script-parser.c
index dd36ac9..625f204 100644
--- a/clutter/clutter-script-parser.c
+++ b/clutter/clutter-script-parser.c
@@ -43,6 +43,8 @@
#include "clutter-script-private.h"
#include "clutter-scriptable.h"
+#include "clutter-stage-manager.h"
+
#include "clutter-private.h"
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)
{
+ ClutterStageManager *manager = clutter_stage_manager_get_default ();
GList *properties = oinfo->properties;
+ ClutterStage *default_stage;
/* the default stage is a complex beast: we cannot create it using
* g_object_newv() but we need clutter_script_construct_parameters()
@@ -1981,7 +1985,8 @@ _clutter_script_construct_object (ClutterScript *script,
properties,
¶ms);
- 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++)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]