Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpgritti@gmail.com>2008-10-03 00:26:16 (GMT)
committer Marco Pesenti Gritti <mpgritti@gmail.com>2008-10-03 00:26:16 (GMT)
commit944643ee56b335a6f1f1cd0841230db6b068ec5a (patch)
treeff6385dee989327e9cd1f7a4eba93ab343c7827a /bin
parent61826eaf202df49747a7766a06fb8efdb3754148 (diff)
Launch the wm from the sugar script.
Diffstat (limited to 'bin')
-rw-r--r--bin/sugar-shell10
-rw-r--r--bin/sugar.in3
2 files changed, 3 insertions, 10 deletions
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