From 393627abd5c44cc092d178b70d7fb09c676a3dee Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 5 Jun 2005 12:19:50 +0200
Subject: [PATCH] EPG events without a title now display "No title" instead of
 "(null)"

---
 CONTRIBUTORS |  1 +
 HISTORY      |  4 +++-
 epg.c        |  9 +++++++--
 i18n.c       | 23 ++++++++++++++++++++++-
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 11aa8de1..1416c473 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -881,6 +881,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for translating OSD texts to the Finnish language
  for fixing internationalization of the text for "Setup/DVB/Audio language(s)"
  for making pressing the Power button not stop Transfer Mode or replay immediately
+ for making EPG events without a title display "No title" instead of "(null)"
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index 61deccdf..76d2fef1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3578,7 +3578,7 @@ Video Disk Recorder Revision History
 - Added cThread::SetPriority() and using it in cSectionHandler::Action() to
   reduce the priority of the section handler threads (as suggested by Georg Acher).
 
-2005-06-04: Version 1.3.26
+2005-06-05: Version 1.3.26
 
 - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
@@ -3587,3 +3587,5 @@ Video Disk Recorder Revision History
 - Improved resetting CAM connections (thanks to Marco Schlüßler).
 - Implemented cVideoRepacker in remux.c to make sure every PES packet contains
   only data from one frame (thanks to Reinhard Nissl).
+- EPG events without a title now display "No title" instead of "(null)" (thanks
+  to Rolf Ahrenberg).
diff --git a/epg.c b/epg.c
index 29e2b825..05c6d742 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.34 2005/05/29 10:26:54 kls Exp $
+ * $Id: epg.c 1.35 2005/06/05 12:17:15 kls Exp $
  */
 
 #include "epg.h"
@@ -323,7 +323,7 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule)
   return false;
 }
 
-#define MAXEPGBUGFIXSTATS 12
+#define MAXEPGBUGFIXSTATS 13
 #define MAXEPGBUGFIXCHANS 100
 struct tEpgBugFixStats {
   int hits;
@@ -638,6 +638,11 @@ void cEvent::FixEpgBugs(void)
             }
         }
      }
+  else {
+     // we don't want any "(null)" titles
+     title = strcpyrealloc(title, tr("No title"));
+     EpgBugFixStat(12, ChannelID());
+     }
 }
 
 // --- cSchedule -------------------------------------------------------------
diff --git a/i18n.c b/i18n.c
index 2b8ccd86..e5358d24 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.193 2005/06/03 12:41:41 kls Exp $
+ * $Id: i18n.c 1.194 2005/06/05 11:59:09 kls Exp $
  *
  * Translations provided by:
  *
@@ -5346,6 +5346,27 @@ const tI18nPhrase Phrases[] = {
     "ST:TNG konsool",
     "ST:TNG konsol",
   },
+  { "No title",
+    "Kein Titel",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "Ei esitystä",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { NULL }
   };