From 1bec88f45ed45f69f693c88ce3b819e89c521b28 Mon Sep 17 00:00:00 2001
From: Eitan Isaacson <eitan@monotonous.org>
Date: Tue, 8 Mar 2011 17:36:47 -0500
Subject: Read keyboard files from prefix correctly

---
 bin/caribou.in             | 3 +++
 caribou/common/settings.py | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/bin/caribou.in b/bin/caribou.in
index 35ef584..824c68d 100644
--- a/bin/caribou.in
+++ b/bin/caribou.in
@@ -45,6 +45,9 @@ if os.path.dirname(__file__) != "@prefix@/bin":
     sys.path.insert(1, srcdir)
     import caribou.common
     import caribou.ui
+    caribou.data_path = os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                                     "@top_srcdir@",
+                                                     "data"))
 else:
     import caribou.common
     import caribou.ui
diff --git a/caribou/common/settings.py b/caribou/common/settings.py
index 09a23a9..3f13b17 100644
--- a/caribou/common/settings.py
+++ b/caribou/common/settings.py
@@ -13,10 +13,6 @@ else:
     HAS_JSON = True
 
 def fetch_keyboards():
-    if True:
-        const.KEYBOARDS_DIR = os.path.abspath(
-            os.path.join(os.path.dirname(__file__), '../../data/keyboards'))
-
     try:
         files = os.listdir(const.KEYBOARDS_DIR)
     except:
-- 
cgit v1.2.1