diff options
| author | Marco 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) |
| commit | 652df4bf518976132eda1e9fc6b3b06f6ec4ff04 (patch) | |
| tree | 3fb93f377591796254177c4d9ca71cd31e3128c0 | |
| parent | dbe42ac6d9c0be6be47d2c7545b4997070b4621f (diff) | |
Remove env.get_shell_dir(), use config
| -rw-r--r-- | data/Makefile.am | 1 | ||||
| -rw-r--r-- | data/kbdconfig (renamed from shell/kbdconfig) | 0 | ||||
| -rw-r--r-- | lib/sugar/env.py | 3 | ||||
| -rw-r--r-- | shell/Makefile.am | 3 | ||||
| -rw-r--r-- | shell/config.py.in | 2 | ||||
| -rw-r--r-- | shell/main.py | 2 |
6 files changed, 3 insertions, 8 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 887ed4a..dcf2087 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,6 +9,7 @@ sugar-xo.gtkrc: gtkrc.em sugardir = $(pkgdatadir)/data sugar_DATA = \ activities.defaults \ + kbdconfig \ mime.defaults \ $(GTKRC_FILES) diff --git a/shell/kbdconfig b/data/kbdconfig index 03c288a..03c288a 100644 --- a/shell/kbdconfig +++ b/data/kbdconfig diff --git a/lib/sugar/env.py b/lib/sugar/env.py index 3845a0f..229b929 100644 --- a/lib/sugar/env.py +++ b/lib/sugar/env.py @@ -80,8 +80,5 @@ def get_user_library_path(): def get_service_path(name): return _get_sugar_path('services', name) -def get_shell_path(path=None): - return _get_sugar_path('shell', path) - def get_data_path(path=None): return _get_sugar_path('data', path) 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/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) |