X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0cbfa65b2c9e28aa8b065f578f132844c4c4c32d..8f80c7c5867d6eddde43a612b25e67b6435e44b4:/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
index 594aea4b..9040539a 100644
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
@@ -7,7 +7,7 @@ from Components.HTMLComponent import HTMLComponent
 from Components.GUIComponent import GUIComponent
 from Components.EpgList import Rect
 from Components.Sources.Event import Event
-from Components.Sources.Clock import Clock
+from Components.Sources.Source import ObsoleteSource
 from Screens.Screen import Screen
 from Screens.EventView import EventViewSimple
 from Screens.TimeDateInput import TimeDateInput
@@ -49,19 +49,20 @@ class EPGList(HTMLComponent, GUIComponent):
 		self.backColorSelected = 0x808080
 
 	def applySkin(self, desktop):
-		attribs = [ ]
-		for (attrib, value) in self.skinAttributes:
-			if attrib == "EntryForegroundColor":
-				self.foreColor = parseColor(value).argb()
-			elif attrib == "EntryBorderColor":
-				self.borderColor = parseColor(value).argb()
-			elif attrib == "EntryBackgroundColor":
-				self.backColor = parseColor(value).argb()
-			elif attrib == "EntryBackgroundColorSelected":
-				self.backColorSelected = parseColor(value).argb()
-			else:
-				attribs.append((attrib,value))
-		self.skinAttributes = attribs
+		if self.skinAttributes is not None:
+			attribs = [ ]
+			for (attrib, value) in self.skinAttributes:
+				if attrib == "EntryForegroundColor":
+					self.foreColor = parseColor(value).argb()
+				elif attrib == "EntryBorderColor":
+					self.borderColor = parseColor(value).argb()
+				elif attrib == "EntryBackgroundColor":
+					self.backColor = parseColor(value).argb()
+				elif attrib == "EntryBackgroundColorSelected":
+					self.backColorSelected = parseColor(value).argb()
+				else:
+					attribs.append((attrib,value))
+			self.skinAttributes = attribs
 		return GUIComponent.applySkin(self, desktop)
 
 	def isSelectable(self, service, sname, event_list):
@@ -327,7 +328,7 @@ class GraphMultiEPG(Screen):
 		self["key_green"] = Button(_("Add timer"))
 		self["timeline_text"] = TimelineText()
 		self["Event"] = Event()
-		self["Clock"] = Clock()
+		self["Clock"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
 		self.time_lines = [ ]
 		for x in (0,1,2,3,4,5):
 			pm = Pixmap()