patch by Pieter Grimmerink: use ext3 largefile option only for disks > 4G

[enigma2.git] / keymapparser.py

diff --git a/keymapparser.py b/keymapparser.py
index 5c93092d347b105ce84a46150c50d7cd881bc0dc..7131276f44a75d7626feac690157d5e3a0ef5ae2 100644 (file)
--- a/keymapparser.py
+++ b/keymapparser.py
@@ -7,8 +7,7 @@ from keyids import KEYIDS;
 # these are only informational (for help)...
 from Tools.KeyBindings import addKeyBinding
 
-def readKeymap(filename = "/usr/share/enigma2/keymap.xml"):
-
+def readKeymap(filename):
        p = enigma.eActionMap.getInstance()
        assert p
 
@@ -64,11 +63,11 @@ def readKeymap(filename = "/usr/share/enigma2/keymap.xml"):
                                p.bindKey(filename, device, keyid, flags, context, mapto)
                                addKeyBinding(filename, keyid, context, mapto, flags)
 
-               parseKeys("generic", cmap)
-
                for device in elementsWithTag(cmap.childNodes, "device"):
                        parseKeys(str(device.getAttribute("name")), device)
 
+               parseKeys("generic", cmap)
+
 def removeKeymap(filename):
        p = enigma.eActionMap.getInstance()
        p.unbindKeyDomain(filename)