diff options
| author | Simon Schampijer <simon@schampijer.de> | 2011-10-18 15:49:27 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2011-10-18 15:51:58 (GMT) |
| commit | 7ca64e37d190e569b9bc356094db4b72e0241419 (patch) | |
| tree | 9f494587f1a5366c9e687a888174cf49cc35d994 | |
| parent | 6746376e9ed64503b00b7baa593288ace58acb34 (diff) | |
Make sure we use the Sugar cursor in the intro screen, OLPC #10712
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 is what the current
code has been doing. We do show the intro screen before
the window manager may be available. For a non invasive
bug fix that avoids races we just call 'xsetroot -cursor_name'
another time before the intro screen is displayed.
We have a long history of setting the Sugar cursor with many
races. To improve the situation SL #3204 is filed as a
follow up.
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Sascha Silbe <silbe@activitycentral.com>
| -rwxr-xr-x | bin/sugar-session | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/sugar-session b/bin/sugar-session index 8ea195f..40c9db7 100755 --- a/bin/sugar-session +++ b/bin/sugar-session @@ -245,6 +245,10 @@ def main(): # even when we initially get blocked on the intro screen gobject.idle_add(unfreeze_dcon_cb) + # make sure we have the correct cursor in the intro screen + # TODO #3204 + if subprocess.call('echo $DISPLAY; xsetroot -cursor_name left_ptr', shell=True): + logging.warning('Can not reset cursor') intro.check_profile() start_ui_service() |