From 16d6b751d84381e58d9b05d720b5dbd603ed790d Mon Sep 17 00:00:00 2001
From: Christian Wieninger <cwieninger (at) gmx (dot) de>
Date: Mon, 14 Jan 2008 18:49:17 +0100
Subject: - support for new info key behaviour in vdr-1.5.13

---
 HISTORY              | 1 +
 HISTORY.DE           | 1 +
 epgsearch.c          | 2 +-
 menu_event.c         | 3 ++-
 menu_main.c          | 3 ++-
 menu_searchedit.c    | 2 +-
 menu_searchresults.c | 1 +
 menu_whatson.c       | 5 ++++-
 8 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/HISTORY b/HISTORY
index c93440b..a92e3af 100644
--- a/HISTORY
+++ b/HISTORY
@@ -21,6 +21,7 @@ new:
 - changes for builtin graphtft-patch (when using VDR-extension-patch you need > v.37)
 - updated the timercmd-patch for vdr-1.5.12 (patches/timercmd-0.1_1.5.12.diff)
 - added patches/README.patches to describe the existing patches
+- support for new info key behaviour in vdr-1.5.13
 fixes: 
 - shifting the time display: the start time now only gets displayed in 
   'Overview - Now' instead of a progressbar, if there's not already a start time 
diff --git a/HISTORY.DE b/HISTORY.DE
index 941d8d4..b050953 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -26,6 +26,7 @@ neu:
   VDR-extension-patch ist > v.37 notwendig)
 - Update des timercmd-patches für vdr-1.5.12 (patches/timercmd-0.1_1.5.12.diff)
 - Neue Datei patches/README.patches für eine Beschreibung der vorhandenen Patches
+- Unterstützung für das neue Info-Key-Verhalten in vdr-1.5.13
 fixes:
 - Shiften der Uhrzeit: die Startzeit wird jetzt nur noch dann anstelle des 
   Fortschrittsbalken angezeigt, wenn in der Menüvorlage nicht bereits eine
diff --git a/epgsearch.c b/epgsearch.c
index fdcd0eb..07bf541 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -64,7 +64,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include "menu_quicksearch.h"
 #include "menu_announcelist.h"
 
-static const char VERSION[]        = "0.9.24.beta15";
+static const char VERSION[]        = "0.9.24.beta16";
 static const char DESCRIPTION[]    =  trNOOP("search the EPG for repeats and more");
 
 // globals
diff --git a/menu_event.c b/menu_event.c
index 0e1cb4a..28ce4e6 100644
--- a/menu_event.c
+++ b/menu_event.c
@@ -172,6 +172,7 @@ eOSState cMenuEventSearch::ProcessKey(eKeys Key)
             else
                return osContinue;
             break;
+      case kInfo: return osBack;
          default: break;
       }
    }
@@ -206,7 +207,7 @@ eOSState cMenuEventSearch::ProcessKey(eKeys Key)
             }
             state = osContinue;
          }
-         break;
+	 break;
          default: break;
       }
    }
diff --git a/menu_main.c b/menu_main.c
index 69e3370..9b38f38 100644
--- a/menu_main.c
+++ b/menu_main.c
@@ -490,7 +490,8 @@ eOSState cMenuSearchMain::ProcessKey(eKeys Key)
 	     else
 		 return ExtendedSearch();
 	     break;
-       case kOk: 
+	case kInfo:
+	case kOk: 
 	   if (Count())
 	       return ShowSummary();
 	   break;
diff --git a/menu_searchedit.c b/menu_searchedit.c
index 37d04c9..3766183 100644
--- a/menu_searchedit.c
+++ b/menu_searchedit.c
@@ -695,7 +695,7 @@ eOSState cMenuEditSearchExt::ProcessKey(eKeys Key)
 	   state = osContinue;
 	   break;
       case kYellow:
-      case kHelp:
+      case kInfo:
 	state = Help();
 	break;
       default: break;
diff --git a/menu_searchresults.c b/menu_searchresults.c
index 1e15e3e..6190a1e 100644
--- a/menu_searchresults.c
+++ b/menu_searchresults.c
@@ -380,6 +380,7 @@ eOSState cMenuSearchResults::ProcessKey(eKeys Key)
             state = OnYellow();
             break;
          case kOk:
+      case kInfo:
             if(HasSubMenu()) 
             {
                state = cOsdMenu::ProcessKey(Key);
diff --git a/menu_whatson.c b/menu_whatson.c
index 32de452..4430b67 100644
--- a/menu_whatson.c
+++ b/menu_whatson.c
@@ -787,7 +787,10 @@ eOSState cMenuWhatsOnSearch::ProcessKey(eKeys Key)
                return EPGSearchConfig.useOkForSwitch?Switch():ShowSummary();
          }
          break;
-         default:      break;
+      case kInfo:
+	return ShowSummary();
+	break;
+      default:      break;
       }
    }
    if (!HasSubMenu()) 
-- 
cgit v1.2.3