Merge branch 'master' of git.opendreambox.org:/git/enigma2

diff --git a/lib/python/Components/Converter/TemplatedMultiContent.py b/lib/python/Components/Converter/TemplatedMultiContent.py
index cc00455c23beff4518a8bc937b12fd21dae40480..5f1d4f249085f1e1edd86b2be7da5633acf73250 100644 (file)
--- a/lib/python/Components/Converter/TemplatedMultiContent.py
+++ b/lib/python/Components/Converter/TemplatedMultiContent.py
@@ -5,7 +5,7 @@ class TemplatedMultiContent(StringList):
        def __init__(self, args):
                StringList.__init__(self, args)
                from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT, RT_HALIGN_CENTER, RT_HALIGN_RIGHT, RT_VALIGN_TOP, RT_VALIGN_CENTER, RT_VALIGN_BOTTOM
-               from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmap, MultiContentEntryPixmapAlphaTest
+               from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmap, MultiContentEntryPixmapAlphaTest, MultiContentTemplateColor
                l = locals()
                del l["self"] # cleanup locals a bit
                del l["args"]

diff --git a/skin.py b/skin.py
index 03fe96bb58168f401a1fcc948e193238b3b84dc3..011110a293300b6f2c20d20d43b392fedb19c651 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -31,7 +31,7 @@ class SkinError(Exception):
                self.message = message
 
        def __str__(self):
-               return self.message
+               return "{%s}: %s" % (config.skin.primary_skin, self.message)
 
 dom_skins = [ ]