From 944643ee56b335a6f1f1cd0841230db6b068ec5a Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpgritti@gmail.com>
Date: Fri, 03 Oct 2008 00:26:16 +0000
Subject: Launch the wm from the sugar script.

---
(limited to 'bin')

diff --git a/bin/sugar-shell b/bin/sugar-shell
index 6a8d112..0cdda2f 100644
--- a/bin/sugar-shell
+++ b/bin/sugar-shell
@@ -37,15 +37,6 @@ from jarabe.session import get_session_manager
 from jarabe import logsmanager
 from jarabe import config
 
-def _start_matchbox():
-    cmd = ['matchbox-window-manager']
-
-    cmd.extend(['-use_titlebar', 'no'])
-    cmd.extend(['-theme', 'sugar'])
-    cmd.extend(['-kbdconfig', os.path.join(config.data_path, 'kbdconfig')])
-
-    gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
-
 def _setup_translations():
     locale_path = os.path.join(config.prefix, 'share', 'locale')
     domain = 'sugar'
@@ -87,7 +78,6 @@ def main():
 
     logger.start('shell')
 
-    _start_matchbox()
     _setup_translations()
 
     hw_manager = hardwaremanager.get_manager()
diff --git a/bin/sugar.in b/bin/sugar.in
index 26f7cba..6efe345 100644
--- a/bin/sugar.in
+++ b/bin/sugar.in
@@ -11,4 +11,7 @@ if ! test -f "$GTK2_RC_FILES"; then
     exit 1
 fi
 
+matchbox-window-manager -use_titlebar no -theme sugar \
+                        -kbdconfig @prefix@/share/sugar/data/kbdconfig &
+
 sugar-shell
--
cgit v0.9.1