Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / data / keymap.xml

diff --git a/data/keymap.xml b/data/keymap.xml
index 6b8b583dfca65cba73c357832301ab75c93e4624..0865e4169933ae9d20faf11f3e66c4a69e32e14b 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -77,7 +77,7 @@
        </map>
 
        <map context="InfobarEPGActions">
-               <key id="KEY_INFO" mapto="showEventView" flags="b" />
+               <key id="KEY_INFO" mapto="showEventInfo" flags="b" />
                <key id="KEY_INFO" mapto="showEventInfoPlugin" flags="l" />
        </map>
        
@@ -398,9 +398,6 @@
                        <key id="KEY_PREVIOUS" mapto="jumpPreviousMark" flags="m" />
                        <key id="KEY_0" mapto="toggleMark" flags="m" />
                        <key id="KEY_NEXT" mapto="jumpNextMark" flags="m" />
-                       <key id="KEY_RED" mapto="jumpPreviousMark" flags="m" />
-                       <key id="KEY_YELLOW" mapto="toggleMark" flags="m" />
-                       <key id="KEY_BLUE" mapto="jumpNextMark" flags="m" />
                </device>
                <device name="dreambox ir keyboard">
                        <key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="m" />
@@ -478,6 +475,8 @@
                <key id="KEY_MENU" mapto="input_date_time" flags="m" />
                <key id="KEY_CHANNELUP" mapto="nextBouquet" flags="m" />
                <key id="KEY_CHANNELDOWN" mapto="prevBouquet" flags="m" />
+               <key id="KEY_NEXT" mapto="nextService" flags="m" />
+               <key id="KEY_PREVIOUS" mapto="prevService" flags="m" />
        </map>
 
        <map context="EventViewActions">