[Sugar-devel] [PATCH sugar] Bring back the Sugar cursor onto the intro screen, OLPC #10712

[Simon Schampijer]

This issue has a long history outlined in detail
in [1]. As stated in the ticket Metacity sets
the cursor after it's startup, so we need to make
sure Metacity is already running before we set the
cursor. This patch does try to set the cursor before
the intro screen is displayed. In my testing this
worked fine in Jhbuild and the latest 0.94 based
OLPC build.

Signed-off-by: Simon Schampijer <simon at laptop.org>
---
 bin/sugar-session |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/sugar-session b/bin/sugar-session
index 8ea195f..ec9812a 100755
--- a/bin/sugar-session
+++ b/bin/sugar-session
@@ -182,8 +182,6 @@ def setup_window_manager():
         logging.warning('Can not disable metacity keybindings')
 
 def bootstrap():
-    setup_window_manager()
-
     from jarabe.view import launcher
     launcher.setup()
 
@@ -245,6 +243,10 @@ def main():
     # even when we initially get blocked on the intro screen
     gobject.idle_add(unfreeze_dcon_cb)
 
+    screen = wnck.screen_get_default()
+    screen.connect('window-manager-changed', __window_manager_changed_cb)
+    _check_for_window_manager(screen)
+
     intro.check_profile()
 
     start_ui_service()
@@ -261,9 +263,7 @@ def main():
     home_window = homewindow.get_instance()
     home_window.show()
 
-    screen = wnck.screen_get_default()
-    screen.connect('window-manager-changed', __window_manager_changed_cb)
-    _check_for_window_manager(screen)
+    bootstrap()
 
     try:
         gtk.main()
@@ -279,7 +279,7 @@ def _check_for_window_manager(screen):
     wm_name = screen.get_window_manager_name()
     if wm_name is not None:
         screen.disconnect_by_func(__window_manager_changed_cb)
-        bootstrap()
+        setup_window_manager()
 
 
 main()
-- 
1.7.4.4