From 88078e7ac2ee289a0dfc321d71c7494657c4457c Mon Sep 17 00:00:00 2001
From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Wed, 11 Oct 2006 14:14:59 +0000
Subject: [PATCH] always utf8 for radiotext

---
 data/skin.xml                                |  2 +-
 data/skin_default.xml                        |  2 +-
 lib/python/Components/Converter/RadioText.py | 12 +++++-------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/data/skin.xml b/data/skin.xml
index 86e593b0..2f6027c1 100644
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -64,7 +64,7 @@
 		<screen name="InfoBar" flags="wfNoBorder" position="0,330" size="720,198" title="InfoBar" backgroundColor="transparent" >
 			
 			<widget source="RadioText" render="Label" position="50,0" size="620,50" font="LCD;25" backgroundColor="transparent">
-				<convert type="RadioText">RadioText-UTF8</convert>
+				<convert type="RadioText">RadioText</convert>
 			</widget>
 
 			<ePixmap position="0,50" zPosition="-1" size="720,148" pixmap="info-bg.png" />
diff --git a/data/skin_default.xml b/data/skin_default.xml
index 6e931389..87a1d574 100644
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -228,7 +228,7 @@
 		<widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
 		<widget name="list" position="0,45" size="560,196" scrollbarMode="showOnDemand" />
 		<widget source="RadioText" render="Label" position="0,241" size="560,66" font="LCD;25" >
-			<convert type="RadioText">RadioText-UTF8</convert>
+			<convert type="RadioText">RadioText</convert>
 		</widget>
 	</screen>
 	<screen name="RadioInfoBar" position="90,420" size="560,105" zPosition="-1">
diff --git a/lib/python/Components/Converter/RadioText.py b/lib/python/Components/Converter/RadioText.py
index c47e02fb..59885c0a 100644
--- a/lib/python/Components/Converter/RadioText.py
+++ b/lib/python/Components/Converter/RadioText.py
@@ -9,11 +9,9 @@ class RadioText(Converter, object):
 	@cached
 	def getText(self):
 		rt = self.source.radiotext
-		if rt is None:
-			return ""
-		text = rt.getRadioText()
-		if self.type == "RadioText-UTF8":
-			return text.decode("latin-1").encode("utf-8")
-		else:
-			return text
+		text = ""
+		if rt:
+			if self.type == "RadioText":
+				text = rt.getRadioText()
+		return text.decode("latin-1").encode("utf-8")
 	text = property(getText)
-- 
2.30.2