From c3de9649b913ab5ffe831989f22bf2f397431474 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Wed, 19 Jul 2006 20:58:29 +0200
Subject: [PATCH] Use the new -kbdconfig option in matchbox

---
 shell/Session.py         | 10 +++++++++-
 shell/data/Makefile.am   |  2 +-
 sugar/__uninstalled__.py |  4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/shell/Session.py b/shell/Session.py
index 845aaecd..87ea3dbd 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 34a0a9b4..244b09e9 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
diff --git a/sugar/__uninstalled__.py b/sugar/__uninstalled__.py
index 6b2e1dd6..0734b31a 100644
--- a/sugar/__uninstalled__.py
+++ b/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')