r4338 - in vdr/vdr/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2007-03-11 10:39:39 +0000 (Sun, 11 Mar 2007)
New Revision: 4338

Removed:
   vdr/vdr/trunk/debian/patches/opt-43-x_epgsearch.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/00list
   vdr/vdr/trunk/debian/patches/patchtest
Log:
* Removed 92_MainMenuHooks.dpatch

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2007-03-11 10:37:39 UTC (rev 4337)
+++ vdr/vdr/trunk/debian/changelog	2007-03-11 10:39:39 UTC (rev 4338)
@@ -4,6 +4,7 @@
   * Added opt-42-x_MainMenuHooks.dpatch
   * Upgraded opt-48_pin.dpatch
   * Updated opt-50_graphtft.dpatch
+  * Removed 92_MainMenuHooks.dpatch
 
  -- Tobias Grimm <tg at e-tobi.net>  Sat, 10 Mar 2007 20:59:30 +0100
 

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2007-03-11 10:37:39 UTC (rev 4337)
+++ vdr/vdr/trunk/debian/patches/00list	2007-03-11 10:39:39 UTC (rev 4338)
@@ -52,9 +52,6 @@
 # Patch to allow extrecmenu to replace the recordings menu with it's own version.
 # opt-42-x_extrecmenu
 
-# Patch to allow epgsearch to replace the schedule menu with it's own version.
-# opt-43-x_epgsearch
-
 # Patch needed for the rotor plugin.
 # opt-44_rotor
 

Deleted: vdr/vdr/trunk/debian/patches/opt-43-x_epgsearch.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/opt-43-x_epgsearch.dpatch	2007-03-11 10:37:39 UTC (rev 4337)
+++ vdr/vdr/trunk/debian/patches/opt-43-x_epgsearch.dpatch	2007-03-11 10:39:39 UTC (rev 4338)
@@ -1,43 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## opt-42_epgsearch.dpatch by Christian Wieninger <cwieninger at gmx.de>
-## From the vdr-epgsearch plugin: http://www.cwieninger.de.vu
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch allows the epgsearch plugin to replace the schedule
-## DP: menu with it's own version.
-
- at DPATCH@
-diff -urNad vdr-1.4.2~/menu.c vdr-1.4.2/menu.c
---- vdr-1.4.2~/menu.c	2006-08-30 19:06:47.000000000 +0200
-+++ vdr-1.4.2/menu.c	2006-08-30 19:06:47.000000000 +0200
-@@ -3130,7 +3130,11 @@
-   // Initial submenus:
- 
-   switch (State) {
--    case osSchedule:   AddSubMenu(new cMenuSchedule); break;
-+    case osSchedule:   {
-+			cPlugin *p = cPluginManager::GetPlugin("epgsearch");
-+    			(p && !p->SetupParse("IsOrgSchedule", "0")) ? AddSubMenu((cOsdMenu *)p->MainMenuAction()) : AddSubMenu(new cMenuSchedule);
-+		       }			
-+		       break;
-     case osChannels:   AddSubMenu(new cMenuChannels); break;
-     case osTimers:     AddSubMenu(new cMenuTimers); break;
-     case osRecordings: {
-@@ -3377,7 +3381,16 @@
-   HadSubMenu |= HasSubMenu();
- 
-   switch (state) {
--    case osSchedule:   return AddSubMenu(new cMenuSchedule);
-+    case osSchedule:   {
-+			cPlugin *p = cPluginManager::GetPlugin("epgsearch");
-+            		if (p && !p->SetupParse("IsOrgSchedule", "0")) {
-+			    return AddSubMenu((cOsdMenu *)p->MainMenuAction());
-+			    state = osEnd;
-+			    }
-+			else 
-+			    return AddSubMenu(new cMenuSchedule);
-+		       }			
-+		       break;
-     case osChannels:   return AddSubMenu(new cMenuChannels);
-     case osTimers:     return AddSubMenu(new cMenuTimers);
-     case osRecordings: {

Modified: vdr/vdr/trunk/debian/patches/patchtest
===================================================================
--- vdr/vdr/trunk/debian/patches/patchtest	2007-03-11 10:37:39 UTC (rev 4337)
+++ vdr/vdr/trunk/debian/patches/patchtest	2007-03-11 10:39:39 UTC (rev 4338)
@@ -28,7 +28,6 @@
     opt-41-x_timer-info \
     opt-42-x_MainMenuHooks \
     opt-42-x_extrecmenu \
-    opt-43-x_epgsearch \
     opt-44_rotor \
     opt-45_yaepg \
     opt-46_dvdarchive \