[meego-commits] 24711: Changes to MeeGo:1.2.0:oss:Update:Testing/mutter

[lionel]

Hi,
I have made the following changes to mutter in project MeeGo:1.2.0:oss:Update:Testing. Please review and accept ASAP.

Thank You,
lionel

[This message was auto-generated]

---

Request #24711:

  submit:   home:lionel:branches:MeeGo:1.2.0:oss:Update:Testing/mutter(r8)(cleanup) -> MeeGo:1.2.0:oss:Update:Testing/mutter


Message:
    * Thu Jan 5 2012 Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com> - 2.31.5_1.1
- Fix rendering issue at the compositor startup (BMC#24297)

State:   new          2012-01-05T07:59:17 lionel
Comment: None



changes files:
--------------
--- mutter.changes
+++ mutter.changes
@@ -0,0 +1,3 @@
+* Thu Jan 5 2012 Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com> - 2.31.5_1.1
+- Fix rendering issue at the compositor startup (BMC#24297)
+

new:
----
  do-not-use-clutter_stage_get_default.patch

spec files:
-----------
--- mutter.spec
+++ mutter.spec
@@ -16,6 +16,7 @@
 Source100:  mutter.yaml
 Patch0:     Don-t-lose-application-redraws.patch
 Patch1:     compositor-do-not-resize-the-compositing-window-usin.patch
+Patch2:     do-not-use-clutter_stage_get_default.patch
 Requires:   startup-notification
 Requires:   GConf2
 Requires:   dbus-x11
@@ -73,6 +74,8 @@
 %patch0 -p1
 # compositor-do-not-resize-the-compositing-window-usin.patch
 %patch1 -p1
+# do-not-use-clutter_stage_get_default.patch
+%patch2 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ do-not-use-clutter_stage_get_default.patch (new)
--- do-not-use-clutter_stage_get_default.patch
+++ do-not-use-clutter_stage_get_default.patch
+From c99a9a73eef8028711115adf7f62a64ed8951ce9 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <llandwerlin at gmail.com>
+Date: Thu, 5 Jan 2012 15:29:11 +0000
+Subject: [PATCH] do not use clutter_stage_get_default()
+
+---
+ src/compositor/compositor.c |   10 ++++------
+ 1 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
+index f7e078e..966c147 100644
+--- a/src/compositor/compositor.c
++++ b/src/compositor/compositor.c
+@@ -452,16 +452,14 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
+ 
+   meta_screen_set_cm_selection (screen);
+ 
+-  info->stage = clutter_stage_get_default ();
++  info->stage = clutter_stage_new ();
+ 
+   meta_screen_get_size (screen, &width, &height);
+ 
+-  xwin = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage));
++  clutter_actor_set_size (info->stage, width, height);
++  clutter_actor_realize (info->stage);
+ 
+-  XResizeWindow (xdisplay,
+-                 xwin,
+-                 width,
+-                 height);
++  xwin = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage));
+ 
+   event_mask = FocusChangeMask |
+                ExposureMask |
+-- 
+1.7.8.2
+

++++++ mutter.yaml
--- mutter.yaml
+++ mutter.yaml
@@ -12,6 +12,7 @@
 Patches:
     - Don-t-lose-application-redraws.patch
     - compositor-do-not-resize-the-compositing-window-usin.patch
+    - do-not-use-clutter_stage_get_default.patch
 
 Requires:
     - startup-notification