From 34a62eb2ef9ba0c9e5d269162772c4223bf5fa3b Mon Sep 17 00:00:00 2001
From: schmirl <schmirl>
Date: Tue, 8 Apr 2008 14:18:15 +0000
Subject: - added gettext support (thanks to Rolf Ahrenberg) - added
 vdr-1.6.0-ignore_missing_cam patch - dropped obsolete respect_ca patch -
 removed legacy code for < VDR 1.5.9 (thanks to Rolf Ahrenberg)

---
 server/menuHTTP.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'server/menuHTTP.c')

diff --git a/server/menuHTTP.c b/server/menuHTTP.c
index b5bb299..89ca070 100644
--- a/server/menuHTTP.c
+++ b/server/menuHTTP.c
@@ -364,10 +364,8 @@ std::string cHtmlChannelList::ItemText()
 
 // ******************** cM3uChannelList ******************
 cM3uChannelList::cM3uChannelList(cChannelIterator *Iterator, const char* Base)
-: cChannelList(Iterator)
-#if defined(APIVERSNUM) && APIVERSNUM >= 10503
-  , m_IConv(cCharSetConv::SystemCharacterTable(), "UTF-8")
-#endif
+: cChannelList(Iterator),
+  m_IConv(cCharSetConv::SystemCharacterTable(), "UTF-8")
 {
 	base = strdup(Base);
 	m3uState = msFirst;
@@ -398,11 +396,7 @@ std::string cM3uChannelList::Next()
 		return "";
 	}
 
-#if defined(APIVERSNUM) && APIVERSNUM >= 10503
 	std::string name = (std::string) m_IConv.Convert(channel->Name());
-#else
-	std::string name = channel->Name();
-#endif
 
 	if (channel->GroupSep())
 	{
-- 
cgit v1.2.3