use _ as separator instead of : for picon filenames

[enigma2.git] / lib / python / Components / Renderer / Picon.py

diff --git a/lib/python/Components/Renderer/Picon.py b/lib/python/Components/Renderer/Picon.py
index 060337af158e3ce64cc9c4b576037fc6447d69ce..a9c36f2b124ae3730d0dcbc90d8b54f22ac6e288 100644 (file)
--- a/lib/python/Components/Renderer/Picon.py
+++ b/lib/python/Components/Renderer/Picon.py
@@ -8,7 +8,7 @@ from Tools.Directories import pathExists, fileExists, SCOPE_SKIN_IMAGE, resolveF
 class Picon(Renderer):
        pngname = ""
        nameCache = { }
-       searchPaths = ['/etc/picon/',
+       searchPaths = ['/usr/share/enigma2/picon/',
                                '/media/cf/picon/',
                                '/media/usb/picon/',
                                '/media/hdd/picon/']
@@ -26,17 +26,16 @@ class Picon(Renderer):
                                # strip all after last :
                                pos = sname.rfind(':')
                                if pos != -1:
-                                       sname = sname[:pos].rstrip(':')
+                                       sname = sname[:pos].rstrip(':').replace(':','_')
                                pngname = self.nameCache.get(sname, "")
                                if pngname == "":
-                                       pngname = self.findPicon(self.source.text)
+                                       pngname = self.findPicon(sname)
                                        if pngname != "":
                                                self.nameCache[sname] = pngname
                        if pngname == "": # no picon for service found
                                pngname = self.nameCache.get("default", "")
                                if pngname == "": # no default yet in cache..
                                        pngname = self.findPicon("picon_default")
-                                       self.nameCache[sname] = pngname
                                        if pngname == "": # Fallback to enigma2 logo
                                                pngname = resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/enigma2.png")
                                        self.nameCache["default"] = pngname