aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components/UsageConfig.py
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2010-11-17 17:20:04 +0100
committerAndreas Oberritter <obi@opendreambox.org>2010-11-17 17:20:04 +0100
commit2b49c99dcd77e5c65d9563b38ed25e3153144818 (patch)
tree5cefbc8c84b91fbeef21e6b86c42c0e70f3fc121 /lib/python/Components/UsageConfig.py
parenta369ff24e35fce27bfc9fccf7b284b03533bb4c3 (diff)
parenta8682faafcab6004621a4848d7855c70b55f0bce (diff)
downloadenigma2-2b49c99dcd77e5c65d9563b38ed25e3153144818.tar.gz
enigma2-2b49c99dcd77e5c65d9563b38ed25e3153144818.zip
Merge branch 'obi/master' into experimental
Diffstat (limited to 'lib/python/Components/UsageConfig.py')
-rw-r--r--lib/python/Components/UsageConfig.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index b86c1a13..8ea9aa6a 100644
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -1,7 +1,7 @@
from Components.Harddisk import harddiskmanager
from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection, ConfigText, ConfigNumber, ConfigSet, ConfigLocations
from Tools.Directories import resolveFilename, SCOPE_HDD
-from enigma import Misc_Options, setTunerTypePriorityOrder;
+from enigma import Misc_Options, setTunerTypePriorityOrder, eEnv;
from SystemInfo import SystemInfo
import os
@@ -94,7 +94,7 @@ def InitUsageConfig():
SystemInfo["12V_Output"] = Misc_Options.getInstance().detected_12V_output()
- config.usage.keymap = ConfigText(default = "/usr/share/enigma2/keymap.xml")
+ config.usage.keymap = ConfigText(default = eEnv.resolve("${datadir}/enigma2/keymap.xml"))
config.seek = ConfigSubsection()
config.seek.selfdefined_13 = ConfigNumber(default=15)