From 656a061d12a3d257d569804dd10275783bfcc733 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Wed, 04 Mar 2009 15:43:23 +0000
Subject: Adapt Config.py to aslo installation

---
diff --git a/common/Config.py b/common/Config.py
index d381370..76ba7eb 100644
--- a/common/Config.py
+++ b/common/Config.py
@@ -8,7 +8,7 @@ import logging
 
 FEATURES_OGG         = None
 FEATURES_MIC         = None
-FEATURES_LAB         = True
+FEATURES_LAB         = None
 FEATURES_NEWSOUNDS   = None
 FEATURES_GRAB_MOUSE  = None
 
@@ -31,18 +31,11 @@ TMP_DIR      = os.path.join(get_activity_root(), 'tmp')
 
 logging.debug('INFO: loaded TAMTAM_ROOT=%s' % TAM_TAM_ROOT)
 
-if os.path.exists('/ofw'): # XO
-    DATA_DIR        = os.path.join(get_activity_root(), 'data')
-    SNDS_INFO_DIR   = os.path.join(get_activity_root(), 'data', 'snds_info')
-    FILES_DIR       = os.path.join(TAM_TAM_ROOT, "..", "TamTamEdit.activity", "common", "Resources")
-    SOUNDS_DIR      = os.path.join(FILES_DIR, "Sounds", "")
-    IMAGE_ROOT      = os.path.join(FILES_DIR, "Images", "")
-else:
-    DATA_DIR        = os.path.join(os.getenv('HOME'), '.tamtam')
-    SNDS_INFO_DIR   = os.path.join(os.getenv('HOME'), '.tamtam', 'snds_info')
-    FILES_DIR       = "/usr/share/tamtam/"
-    SOUNDS_DIR      = "/usr/share/tamtam/Sounds/"
-    IMAGE_ROOT      = '/usr/share/tamtam/Images/'
+DATA_DIR        = os.path.join(get_activity_root(), 'data')
+SNDS_INFO_DIR   = os.path.join(get_activity_root(), 'data', 'snds_info')
+FILES_DIR       = os.path.join(TAM_TAM_ROOT, "..", "TamTamEdit.activity", "common", "Resources")
+SOUNDS_DIR      = os.path.join(FILES_DIR, "Sounds", "")
+IMAGE_ROOT      = os.path.join(FILES_DIR, "Images", "")
 
 for i in (INSTANCE_DIR, DATA_DIR, SNDS_INFO_DIR, TMP_DIR):
     if not os.path.isdir(i): os.makedirs(i)
--
cgit v0.9.1