diff options
author | Tomeu Vizoso <tomeu@zviratko.(none)> | 2009-07-09 18:43:44 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu@zviratko.(none)> | 2009-07-09 18:43:44 (GMT) |
commit | 1f10112d8ac2bb7609c23882bac6462a0f50af62 (patch) | |
tree | 0d804a790b4c71199bdf8f57c5c3b8cdaf252b18 /bin | |
parent | bffb54971fc31644baa1e3f98f9769b5158929b5 (diff) |
Switch to metacity as the window manager. #602
Diffstat (limited to 'bin')
-rw-r--r-- | bin/sugar-emulator | 9 | ||||
-rw-r--r-- | bin/sugar.in | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/bin/sugar-emulator b/bin/sugar-emulator index acd5976..7f06609 100644 --- a/bin/sugar-emulator +++ b/bin/sugar-emulator @@ -88,11 +88,10 @@ def _start_xephyr(dpi, dimensions, fullscreen): tries -= 1 time.sleep(0.1) -def _start_matchbox(): - cmd = ['matchbox-window-manager'] +def _start_window_manager(): + cmd = ['metacity'] - cmd.extend(['-use_titlebar', 'no']) - cmd.extend(['-theme', 'sugar']) + cmd.extend(['--no-force-fullscreen']) gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH) @@ -157,7 +156,7 @@ def main(): if not args: command.append('sugar') else: - _start_matchbox() + _start_window_manager() if args[0].endswith('.py'): command.append('python') diff --git a/bin/sugar.in b/bin/sugar.in index 3c9b9b6..7b5ca25 100644 --- a/bin/sugar.in +++ b/bin/sugar.in @@ -16,7 +16,6 @@ if [ -f ~/.sugar/debug ]; then . ~/.sugar/debug fi -matchbox-window-manager -use_titlebar no -theme sugar \ - -kbdconfig @prefix@/share/sugar/data/kbdconfig & +metacity --no-force-fullscreen & exec sugar-session |