Remove env.get_shell_dir(), use config

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)

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'

shell/kbdconfig

@@ -1,3 +0,0 @@
-# This is the sugar keyboard configuration for matchbox
-
-<Alt>return=fullscreen

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)