X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a12f0f98d99109a64942abf1bb1f6e429c2fc7f5..b3faf74faa0d7539fb0b61e2ab35512c7286d23e:/skin.py

diff --git a/skin.py b/skin.py
index 3c4b9e1f..fc0360c5 100644
--- a/skin.py
+++ b/skin.py
@@ -14,9 +14,6 @@ from Tools.XMLTools import elementsWithTag, mergeText
 
 colorNames = dict()
 
-def queryColor(colorName):
-	return colorNames.get(colorName)
-
 def dump(x, i=0):
 	print " " * i + str(x)
 	try:
@@ -289,12 +286,14 @@ def lookupScreen(name):
 				return x, path
 	return None, None
 
-def readSkin(screen, skin, name, desktop):
-	if not isinstance(name, list):
-		name = [name]
+def readSkin(screen, skin, names, desktop):
+	if not isinstance(names, list):
+		names = [names]
+
+	name = "<embedded-in-'%s'>" % screen.__class__.__name__
 
 	# try all skins, first existing one have priority
-	for n in name:
+	for n in names:
 		myscreen, path = lookupScreen(n)
 		if myscreen is not None:
 			# use this name for debug output
@@ -308,7 +307,7 @@ def readSkin(screen, skin, name, desktop):
 	if myscreen is None and getattr(screen, "skin", None):
 		myscreen = screen.parsedSkin = xml.dom.minidom.parseString(screen.skin).childNodes[0]
 
-	assert myscreen is not None, "no skin for screen '" + repr(name) + "' found!"
+	assert myscreen is not None, "no skin for screen '" + repr(names) + "' found!"
 
 	screen.skinAttributes = [ ]