Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2008-02-04 22:29:08 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2008-02-04 22:29:08 (GMT)
commit652df4bf518976132eda1e9fc6b3b06f6ec4ff04 (patch)
tree3fb93f377591796254177c4d9ca71cd31e3128c0 /shell
parentdbe42ac6d9c0be6be47d2c7545b4997070b4621f (diff)
Remove env.get_shell_dir(), use config
Diffstat (limited to 'shell')
-rw-r--r--shell/Makefile.am3
-rw-r--r--shell/config.py.in2
-rw-r--r--shell/kbdconfig3
-rw-r--r--shell/main.py2
4 files changed, 2 insertions, 8 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
index c1b7f78..7b45960 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -7,7 +7,4 @@ sugar_PYTHON = \
main.py \
shellservice.py
-confdir = $(pkgdatadir)/shell
-conf_DATA = kbdconfig
-
EXTRA_DIST = $(bin_SCRIPTS) $(conf_DATA)
diff --git a/shell/config.py.in b/shell/config.py.in
index ae243de..c1a7a4a 100644
--- a/shell/config.py.in
+++ b/shell/config.py.in
@@ -17,4 +17,4 @@
prefix = '@prefix@'
bin_path = '@prefix@/bin'
-data_path = '@prefix@/share/sugar'
+data_path = '@prefix@/share/sugar/data'
diff --git a/shell/kbdconfig b/shell/kbdconfig
deleted file mode 100644
index 03c288a..0000000
--- a/shell/kbdconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is the sugar keyboard configuration for matchbox
-
-<Alt>return=fullscreen
diff --git a/shell/main.py b/shell/main.py
index 350ce46..f2f1a51 100644
--- a/shell/main.py
+++ b/shell/main.py
@@ -45,7 +45,7 @@ def _start_matchbox():
cmd.extend(['-use_titlebar', 'no'])
cmd.extend(['-theme', 'sugar'])
- cmd.extend(['-kbdconfig', env.get_shell_path('kbdconfig')])
+ cmd.extend(['-kbdconfig', os.path.join(config.data_path, 'kbdconfig')])
gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)