Use the new -kbdconfig option in matchbox

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'

shell/data/Makefile.am

@@ -1,4 +1,4 @@
-confdir = $(sysconfdir)/matchbox
+confdir = $(datadir)
 conf_DATA = kbdconfig
 
 EXTRA_DIST = kbdconfig

sugar/__uninstalled__.py

@@ -1,4 +1,6 @@
 import os
 
-sugar_data_dir = os.path.dirname(os.path.dirname(__file__))
+_source_dir = os.path.dirname(os.path.dirname(__file__))
+
+sugar_data_dir = os.path.join(_source_dir, 'shell/data') 
 sugar_activities_dir = os.path.join(sugar_data_dir, 'activities')