0.9.24.beta22, %timer.modreason%, no mail when only eventid has changed

34 files changed, 230 insertions, 119 deletions

diff --git a/HISTORY b/HISTORY
index 8fc8879..3a3d016 100644
--- a/HISTORY
+++ b/HISTORY
@@ -10,8 +10,8 @@ new:
   option 'unmute sound' which unmutes audio at the event, if it was off, suggested 
   by Michael Brückner
 - speedup in searching and search timer updates (about 25%)
-- new patch against VDR (vdr-1.5.11-progressbar-support-0.0.1.diff) that adds support 
-  for graphical progressbars in skins classic and st:tng
+- new patch against VDR (vdr-1.5.17-progressbar-support-0.0.1.diff) that adds support 
+  for graphical progressbars in skins classic and st:tng, thanks to zulu@vdrportal
 - speedup in EPG menues, thanks to patch authors from http://www.open7x0.org
 - '0' in the menu of done recordings now toggles the display of the episode name only
 - update of finnish translation, thanks to Rolf Ahrenberg
@@ -28,6 +28,9 @@ new:
 - update of 'undoneepgsearch.sh', a script to remove recordings from the done file via 
   reccmds.conf, thanks to Viking@vdrportal.
 - menu of recordings done now sorts the date top down
+- the timer update notification mails supports now an additional variable 
+  %timer.modreason%, that holds the reason for a timer update in plain text (see
+  epgsearchupdmail(-html).templ for a sample)
 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 4a52907..ce1f391 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -12,9 +12,9 @@ neu:
   Option 'Ton anschalten', wodurch der Ton beim Umschalten aktiviert wird, falls 
   er aus war, vorgeschlagen von Michael Brückner
 - Die Suche und damit das Suchtimer-Update sind nun etwa 25% schneller
-- Neuer Patch für VDR (vdr-1.5.11-progressbar-support-0.0.1.diff), der die Unter-
+- Neuer Patch für VDR (vdr-1.5.17-progressbar-support-0.0.1.diff), der die Unter-
   stützung eines grafischen Fortschrittsbalkens in den Skins classic und st:tng
-  einbaut.
+  einbaut, Danke an zulu@vdrportal.
 - Schnellere EPG-Menüs, danke an die Patch-Authoren von http://www.open7x0.org
 - '0' im Menü der erledigten Aufnahmen schaltet nun die Anzeige zwischen
   '~Episode' und 'Titel~Episode' um.
@@ -33,6 +33,9 @@ neu:
 - Update von 'undoneepgsearch.sh', einem Skript zum Entfernen einer Aufnahme aus dem
   done-File über die reccmds.conf, Danke an Viking@vdrportal.
 - Im Menü "erledigte Aufnahmen" wird nun beim Datum absteigend sortiert.
+- Die Timer-Benachrichtigungsmail unterstützt nun eine weitere Variable 
+  %timer.modreason%, in der im Klartext der Grund einer Timeränderung steht (s.
+  epgsearchupdmail(-html).templ für ein Beispiel)
 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/conf/epgsearchupdmail-html.templ b/conf/epgsearchupdmail-html.templ
index 15accd0..65ac3f9 100644
--- a/conf/epgsearchupdmail-html.templ
+++ b/conf/epgsearchupdmail-html.templ
@@ -151,6 +151,7 @@ a.rightspace {
 <tr class="timer"><td>Channel:</td><td>%timer.chlng% (%timer.chnr%)</td></tr>
 <tr class="timer"><td>File:</td><td>%timer.file%</td></tr>
 <tr class="timer"><td>Search:</td><td>%timer.search% (%timer.searchid%)</td></tr>
+<tr class="timer"><td>Modification:</td><td>%timer.modreason%</td></tr>
 <tr class="timer"><td valign="top">Summary:</td><td>%htmlsummary%</td></tr>
 </table>
 <p class="smallspace"></p>
diff --git a/conf/epgsearchupdmail.templ b/conf/epgsearchupdmail.templ
index b79e98b..8d186fc 100644
--- a/conf/epgsearchupdmail.templ
+++ b/conf/epgsearchupdmail.templ
@@ -55,11 +55,12 @@ Have fun!</mailbody>
 # defined' variables from epgsearchuservars.conf.
 ##############################################################################
 <timer>
-    Title: %title% ~ %subtitle%
-Start/End: %time_w% %date% %time%-%timeend% (Timer: %timer.start%-%timer.stop%)
-  Channel: %timer.chlng% (%timer.chnr%)
-     File: %timer.file%
-   Search: %timer.search% (%timer.searchid%)
+       Title: %title% ~ %subtitle% 
+   Start/End: %time_w% %date% %time%-%timeend% (Timer: %timer.start%-%timer.stop%)
+     Channel: %timer.chlng% (%timer.chnr%)
+        File: %timer.file%     
+Modification: %timer.modreason%
+      Search: %timer.search% (%timer.searchid%)
 
 
 Summary:
diff --git a/doc-src/en/epgsearch.4.txt b/doc-src/en/epgsearch.4.txt
index 58fa4c5..68eef72 100644
--- a/doc-src/en/epgsearch.4.txt
+++ b/doc-src/en/epgsearch.4.txt
@@ -801,6 +801,7 @@ The following variables can be used in the section <timer>:
   - %timer.chlng%           - channel name
   - %timer.search%          - name of the search timer, that created the timer
   - %timer.searchid%        - id of the search timer, that created the timer
+  - %timer.modreason%       - the reason for a timer modification in plain text
   - any event variable (as in '10. Customizing the EPG menus')
   - any extended EPG variable as defined in epgsearchcats.conf
   - any user variable (as in '12. User defined variables')
diff --git a/epgsearch.c b/epgsearch.c
index 4548b0a..ba8b46e 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -65,7 +65,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.beta21";
+static const char VERSION[]        = "0.9.24.beta22";
 static const char DESCRIPTION[]    =  trNOOP("search the EPG for repeats and more");
 
 // globals
diff --git a/epgsearchtools.h b/epgsearchtools.h
index 89d6853..9110810 100644
--- a/epgsearchtools.h
+++ b/epgsearchtools.h
@@ -189,4 +189,8 @@ struct ignorecase_traits : public std::char_traits<char> {
 // define a special type for such strings
 typedef std::basic_string<char,ignorecase_traits> icstring;
 
+
+// --- eTimerMod -------------------------------------------------------------
+enum eTimerMod { tmNoChange=0, tmStartStop=1, tmFile=2, tmAuxEventID=4 };
+
 #endif
diff --git a/mail.c b/mail.c
index c5285e9..130238a 100644
--- a/mail.c
+++ b/mail.c
@@ -52,6 +52,12 @@ string cMailTimerNotification::Format(const string& templ) const
     cVarExpr varExprTimer(result);
     result =  varExprTimer.Evaluate(pTimer);
     
+    if (timerMod == tmStartStop)
+      result = ReplaceAll(result, "%timer.modreason%", tr("Start/Stop time has changed"));
+    if (timerMod == tmFile)
+      result = ReplaceAll(result, "%timer.modreason%", tr("Title/episode has changed"));
+    else
+      result = ReplaceAll(result, "%timer.modreason%", "");
     return result;
 }
 
@@ -279,10 +285,12 @@ void cMailUpdateNotifier::AddNewTimerNotification(tEventID EventID, tChannelID C
     newTimers.insert(N);
 }
 
-void cMailUpdateNotifier::AddModTimerNotification(tEventID EventID, tChannelID ChannelID)
+void cMailUpdateNotifier::AddModTimerNotification(tEventID EventID, tChannelID ChannelID, uint timerMod)
 {
-    cMailTimerNotification N(EventID, ChannelID);
-    modTimers.insert(N);
+  if (timerMod == tmNoChange || timerMod == tmAuxEventID) // if anything but the eventID has changed
+    return;
+  cMailTimerNotification N(EventID, ChannelID, timerMod);
+  modTimers.insert(N);
 }
 
 void cMailUpdateNotifier::AddRemoveTimerNotification(cTimer* t, const cEvent* e)
diff --git a/mail.h b/mail.h
index 80b5ae1..087c1fa 100644
--- a/mail.h
+++ b/mail.h
@@ -61,12 +61,13 @@ class cMailTimerNotification
 {
     tEventID eventID;
     tChannelID channelID;
+    uint timerMod;
 
     const cEvent* GetEvent() const;
 
  public:
-    cMailTimerNotification(tEventID EventID, tChannelID ChannelID) 
-	: eventID(EventID), channelID(ChannelID) {}
+ cMailTimerNotification(tEventID EventID, tChannelID ChannelID, uint TimerMod = tmNoChange) 
+   : eventID(EventID), channelID(ChannelID), timerMod(TimerMod) {}
     bool operator< (const cMailTimerNotification &N) const;
     string Format(const string& templ) const;
 };
@@ -92,7 +93,7 @@ class cMailUpdateNotifier : public cMailNotifier
  public:
     cMailUpdateNotifier();
     void AddNewTimerNotification(tEventID EventID, tChannelID ChannelID);
-    void AddModTimerNotification(tEventID EventID, tChannelID ChannelID);
+    void AddModTimerNotification(tEventID EventID, tChannelID ChannelID, uint timerMod = tmNoChange);
     void AddRemoveTimerNotification(cTimer* t, const cEvent* e = NULL);
     void SendUpdateNotifications();
 };
diff --git a/menu_conflictcheck.c b/menu_conflictcheck.c
index 73ca7f5..b6442f6 100644
--- a/menu_conflictcheck.c
+++ b/menu_conflictcheck.c
@@ -280,7 +280,7 @@ eOSState cMenuConflictCheckDetails::DeleteTimer(cConflictCheckTimerObj* TimerObj
     if (timer) {
 	if (Interface->Confirm(trVDR("Delete timer?"))) {
 	    if (timer->Recording()) {
-		if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
+		if (Interface->Confirm(trVDR("Timer still recording - really delete?"))) {
 		    timer->Skip();
 		    cRecordControls::Process(time(NULL));
 		}
diff --git a/menu_myedittimer.c b/menu_myedittimer.c
index d4080cc..1ee3c7f 100644
--- a/menu_myedittimer.c
+++ b/menu_myedittimer.c
@@ -231,7 +231,7 @@ eOSState cMenuMyEditTimer::DeleteTimer()
     if (timer) {
 	if (Interface->Confirm(trVDR("Delete timer?"))) {
 	    if (timer->Recording()) {
-		if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
+		if (Interface->Confirm(trVDR("Timer still recording - really delete?"))) {
 		    timer->Skip();
 		    cRecordControls::Process(time(NULL));
 		}
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 7ab2932..93b47e5 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -521,6 +521,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -729,9 +735,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index b287213..b4d9985 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -519,6 +519,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -727,9 +733,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 7c26977..5bde02e 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -519,6 +519,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -727,9 +733,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index c0989de..ffb04ce 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:35+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -555,6 +555,12 @@ msgstr "Test"
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " aäbcdefghijklmnoöpqrsßtuüvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
+msgid "Start/Stop time has changed"
+msgstr "Start/Stop-Zeit hat sich geändert"
+
+msgid "Title/episode has changed"
+msgstr "Titel/Episode hat sich geändert"
+
 msgid "No new timers were added."
 msgstr "Es wurden keine neuen Timer angelegt."
 
@@ -763,9 +769,6 @@ msgstr "K"
 msgid "Button$Repeats"
 msgstr "Wiederh."
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr "ohne Überwachung"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index ef92ecc..8ba836e 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -519,6 +519,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -727,9 +733,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index a145a33..da65c34 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-11-18 20:09+0200\n"
 "Last-Translator: bittor from open7x0.org <bittor7x0 _at_ gmail.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -555,6 +555,12 @@ msgstr "Probar"
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " aábcdeéfghiíjklmnñoópqrstuúvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr "No se añadieron nuevas programaciones."
 
@@ -763,9 +769,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr "Repeticiones"
 
-msgid "Timer still recording - really delete?"
-msgstr "Todavía está grabando - ¿borrar realmente?"
-
 msgid "no check"
 msgstr "sin comprobación"
 
@@ -1194,3 +1197,5 @@ msgstr "en %02ldh"
 msgid "in %02ldm"
 msgstr "en %02ldm"
 
+#~ msgid "Timer still recording - really delete?"
+#~ msgstr "Todavía está grabando - ¿borrar realmente?"
diff --git a/po/et_EE.po b/po/et_EE.po
index 7818b86..d4dff0d 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -519,6 +519,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -727,9 +733,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index ec6418d..21c22c6 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -559,6 +559,12 @@ msgstr "Testaa"
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abcdefghijklmnopqrstuvwxyzåäö0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr "Yhtään uutta ajastinta ei lisätty."
 
@@ -767,9 +773,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr "Toistuvat"
 
-msgid "Timer still recording - really delete?"
-msgstr "Ajastettu tallennus käynnissä - poistetaanko silti?"
-
 msgid "no check"
 msgstr "ei valvontaa"
 
@@ -1198,3 +1201,5 @@ msgstr "%02ldh"
 msgid "in %02ldm"
 msgstr "%02ldm"
 
+#~ msgid "Timer still recording - really delete?"
+#~ msgstr "Ajastettu tallennus käynnissä - poistetaanko silti?"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 3966fb6..a988e24 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -554,6 +554,12 @@ msgstr "Test"
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " aàbcçdeéèêfghiîjklmnoôpqrstuùûvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr "Il n'y a pas eu de nouvelle programmation."
 
@@ -762,9 +768,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr "Répétitions"
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr "sans surveillance"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index b1693fd..604c8e3 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -520,6 +520,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -728,9 +734,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 7270705..683b1ea 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -519,6 +519,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " aábcdeéfghiíjklmnoóöõpqrstuúüûvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -727,9 +733,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 8b40695..2344d97 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-12-30 04:09+0100\n"
 "Last-Translator: Gringo <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -557,6 +557,12 @@ msgstr "Prova"
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " aàbcdeéèfghiîìjklmnoòpqrstuùvwxyz0123456789-.#~\\^$[]|()*+?{}/:%"
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr "Nessun nuovo timer aggiunto."
 
@@ -765,9 +771,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr "Repliche"
 
-msgid "Timer still recording - really delete?"
-msgstr "Timer in registrazione - sicuro di cancellarlo?"
-
 msgid "no check"
 msgstr "nessuna verifica"
 
@@ -1196,3 +1199,5 @@ msgstr "in %02ldh"
 msgid "in %02ldm"
 msgstr "in %02ldm"
 
+#~ msgid "Timer still recording - really delete?"
+#~ msgstr "Timer in registrazione - sicuro di cancellarlo?"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index deb9519..760658f 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -552,6 +552,12 @@ msgstr "Test"
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr "Geen nieuwe timers aangemaakt"
 
@@ -760,9 +766,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr "Herhalingen"
 
-msgid "Timer still recording - really delete?"
-msgstr "Timer neemt nog op - werkelijk verwijderen?"
-
 msgid "no check"
 msgstr "geen controle"
 
@@ -1188,3 +1191,6 @@ msgstr "in %02ldh"
 #, c-format
 msgid "in %02ldm"
 msgstr "in %02ldm"
+
+#~ msgid "Timer still recording - really delete?"
+#~ msgstr "Timer neemt nog op - werkelijk verwijderen?"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index bbe1fa6..b5b1355 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -519,6 +519,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -727,9 +733,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 0209067..d6eb2d6 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -518,6 +518,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -726,9 +732,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 77e8fee..ad9553e 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -518,6 +518,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -726,9 +732,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 99a137c..7fd1de2 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -519,6 +519,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -727,9 +733,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 3bce87c..d1d3af8 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -518,6 +518,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -726,9 +732,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 1f9e5d5..184e367 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -519,6 +519,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr " abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -727,9 +733,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 83d227b..72d289f 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -519,6 +519,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -727,9 +733,6 @@ msgstr "C"
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index aad759e..7c0a183 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-01-17 13:36+0100\n"
+"POT-Creation-Date: 2008-03-05 20:06+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -518,6 +518,12 @@ msgstr ""
 msgid "$ abcdefghijklmnopqrstuvwxyz0123456789-.,#~\\^$[]|()*+?{}/:%@&"
 msgstr ""
 
+msgid "Start/Stop time has changed"
+msgstr ""
+
+msgid "Title/episode has changed"
+msgstr ""
+
 msgid "No new timers were added."
 msgstr ""
 
@@ -726,9 +732,6 @@ msgstr ""
 msgid "Button$Repeats"
 msgstr ""
 
-msgid "Timer still recording - really delete?"
-msgstr ""
-
 msgid "no check"
 msgstr ""
 
diff --git a/searchtimer_thread.c b/searchtimer_thread.c
index e33e3cb..7cc02ba 100644
--- a/searchtimer_thread.c
+++ b/searchtimer_thread.c
@@ -40,6 +40,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include "timerdone.h"
 #include "menu_deftimercheckmethod.h"
 #include "timerstatus.h"
+#include "epgsearch.h"
 
 // priority for background thread
 #define SEARCHTIMER_NICE 19
@@ -273,6 +274,8 @@ void cSearchTimerThread::Action(void)
                cTimer *t = GetTimer(searchExt, pEvent, bTimesMatchExactly);
 
                char* Summary = NULL;
+	       uint timerMod = tmNoChange;
+
                if (t) 
                { // already exists
                   pOutdatedTimers->DelTimer(t);
@@ -331,18 +334,30 @@ void cSearchTimerThread::Action(void)
                   }
                   else
                   {
-                     if (LogFile.Level() >= 3) // output reasons for a timer modification 
-                     { 
-                        if (!bTimesMatchExactly)
-                           LogFile.Log(3,"timer for '%s~%s' (%s - %s, channel %d) : start/stop has changed", pEvent->Title()?pEvent->Title():"no title", pEvent->ShortText()?pEvent->ShortText():"no subtitle", GETDATESTRING(pEvent), GETTIMESTRING(pEvent), ChannelNrFromEvent(pEvent));
-                        if (strcmp(pFile, timer->File()) != 0)
-                           LogFile.Log(3,"timer for '%s~%s' (%s - %s, channel %d) : title and/or episdode has changed", pEvent->Title()?pEvent->Title():"no title", pEvent->ShortText()?pEvent->ShortText():"no subtitle", GETDATESTRING(pEvent), GETTIMESTRING(pEvent), ChannelNrFromEvent(pEvent));
-                        if (t->Aux() != NULL && strcmp(t->Aux(), Summary) != 0)
-                           LogFile.Log(3,"timer for '%s~%s' (%s - %s, channel %d) : aux info has changed", pEvent->Title()?pEvent->Title():"no title", pEvent->ShortText()?pEvent->ShortText():"no subtitle", GETDATESTRING(pEvent), GETTIMESTRING(pEvent), ChannelNrFromEvent(pEvent));
-                     }
-                     index = t->Index()+1;
-                     Priority = t->Priority();
-                     Lifetime = t->Lifetime();
+		    if (!bTimesMatchExactly) timerMod = (uint)timerMod | tmStartStop;
+		    if (strcmp(pFile, timer->File()) != 0) timerMod |= tmFile;
+		    if (t->Aux() != NULL && strcmp(t->Aux(), Summary) != 0)
+		      {
+			char* oldEventID = GetAuxValue(t, "eventid");
+			char* newEventID = GetAuxValue(Summary, "eventid");
+			if (oldEventID && newEventID && strcmp(oldEventID, newEventID) != 0)
+			  timerMod |= tmAuxEventID;
+			free(oldEventID);
+			free(newEventID);
+		      }
+
+		    if (LogFile.Level() >= 3) // output reasons for a timer modification 
+		      { 
+                        if (timerMod & tmStartStop)
+			  LogFile.Log(3,"timer for '%s~%s' (%s - %s, channel %d) : start/stop has changed", pEvent->Title()?pEvent->Title():"no title", pEvent->ShortText()?pEvent->ShortText():"no subtitle", GETDATESTRING(pEvent), GETTIMESTRING(pEvent), ChannelNrFromEvent(pEvent));
+                        if (timerMod & tmFile)
+			  LogFile.Log(3,"timer for '%s~%s' (%s - %s, channel %d) : title and/or episdode has changed", pEvent->Title()?pEvent->Title():"no title", pEvent->ShortText()?pEvent->ShortText():"no subtitle", GETDATESTRING(pEvent), GETTIMESTRING(pEvent), ChannelNrFromEvent(pEvent));
+                        if (timerMod & tmAuxEventID)
+			  LogFile.Log(3,"timer for '%s~%s' (%s - %s, channel %d) : aux info for event id has changed", pEvent->Title()?pEvent->Title():"no title", pEvent->ShortText()?pEvent->ShortText():"no subtitle", GETDATESTRING(pEvent), GETTIMESTRING(pEvent), ChannelNrFromEvent(pEvent));
+		      }
+		    index = t->Index()+1;
+		    Priority = t->Priority();
+		    Lifetime = t->Lifetime();
                   }
                   free(pFile);
 
@@ -400,7 +415,7 @@ void cSearchTimerThread::Action(void)
                   continue;
                }
 			
-               if (AddModTimer(timer, index, searchExt, pEvent, Priority, Lifetime, Summary))
+               if (AddModTimer(timer, index, searchExt, pEvent, Priority, Lifetime, Summary, timerMod))
                {
                   if (index == 0)
                      LogFile.Log(1,"added timer for '%s~%s' (%s - %s); search timer: '%s'", pEvent->Title(), pEvent->ShortText()?pEvent->ShortText():"", GETDATESTRING(pEvent), GETTIMESTRING(pEvent), searchExt->search);
@@ -565,7 +580,7 @@ char* cSearchTimerThread::SummaryExtended(cSearchExt* searchExt, cTimer* Timer,
    return tmpSummary;
 }
 
-bool cSearchTimerThread::AddModTimer(cTimer* Timer, int index, cSearchExt* searchExt, const cEvent* pEvent, int Prio, int Lifetime, char* Summary) 
+bool cSearchTimerThread::AddModTimer(cTimer* Timer, int index, cSearchExt* searchExt, const cEvent* pEvent, int Prio, int Lifetime, char* Summary, uint timerMod) 
 {
    char *cmdbuf = NULL;
 
@@ -651,7 +666,7 @@ bool cSearchTimerThread::AddModTimer(cTimer* Timer, int index, cSearchExt* searc
       if (index==0) // new
          mailNotifier.AddNewTimerNotification(pEvent->EventID(), pEvent->ChannelID()); 
       else
-         mailNotifier.AddModTimerNotification(pEvent->EventID(), pEvent->ChannelID()); 
+	mailNotifier.AddModTimerNotification(pEvent->EventID(), pEvent->ChannelID(), timerMod); 
    }
    free(cmdbuf);
    if (tmpSummary) free(tmpSummary);
diff --git a/searchtimer_thread.h b/searchtimer_thread.h
index 3527a67..4cbf477 100644
--- a/searchtimer_thread.h
+++ b/searchtimer_thread.h
@@ -26,9 +26,11 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 
 #include <vdr/thread.h>
 #include "epgsearchext.h"
-#include "epgsearch.h"
+#include "epgsearchtools.h"
 #include "mail.h"
 
+class cPluginEpgsearch;
+
 // --- cRecordingObj --------------------------------------------------------
 class cRecordingObj : public cListObject {
 public:
@@ -49,7 +51,7 @@ class cSearchTimerThread: public cThread {
 
  protected:
     virtual void Action(void);
-    bool AddModTimer(cTimer* Timer, int, cSearchExt*, const cEvent*, int Prio, int Lifetime, char* Summary = NULL);
+    bool AddModTimer(cTimer* Timer, int, cSearchExt*, const cEvent*, int Prio, int Lifetime, char* Summary = NULL, uint timerMod = tmNoChange);
     void RemoveTimer(cTimer* Timer, const cEvent* Event = NULL);
     void Stop(void);
     bool NeedUpdate();