diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-19 18:58:29 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-19 18:58:29 (GMT) |
| commit | c3de9649b913ab5ffe831989f22bf2f397431474 (patch) | |
| tree | a06b86ba05bcb109b925e23c3bcae426dd6641dc /shell | |
| parent | 5daa5aa69b0cd80de78e280eca8fd0620340e420 (diff) | |
Use the new -kbdconfig option in matchbox
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Session.py | 10 | ||||
| -rw-r--r-- | shell/data/Makefile.am | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/shell/Session.py b/shell/Session.py index 845aaec..87ea3db 100644 --- a/shell/Session.py +++ b/shell/Session.py @@ -5,6 +5,7 @@ import gobject from Shell import Shell from Process import Process import sugar.theme +import sugar.env class ActivityProcess(Process): def __init__(self, module): @@ -31,7 +32,14 @@ class DbusProcess(Process): class MatchboxProcess(Process): def __init__(self): - Process.__init__(self, 'matchbox-window-manager -use_titlebar no') + options = '-use_titlebar no' + + kbd_config = os.path.join(sugar.env.get_data_dir(), 'kbdconfig') + options += ' -kbdconfig %s' % kbd_config + + command = 'matchbox-window-manager %s' % options + print command + Process.__init__(self, command) def get_name(self): return 'Matchbox' diff --git a/shell/data/Makefile.am b/shell/data/Makefile.am index 34a0a9b..244b09e 100644 --- a/shell/data/Makefile.am +++ b/shell/data/Makefile.am @@ -1,4 +1,4 @@ -confdir = $(sysconfdir)/matchbox +confdir = $(datadir) conf_DATA = kbdconfig EXTRA_DIST = kbdconfig |