fix *required* kwargs. plugins not having **kwargs will probably not run with newer...

[enigma2.git] / lib / python / Plugins / Extensions / PicturePlayer / plugin.py

diff --git a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
index 23c250efcdb931788ae180668b8ff9cc123c1b28..4462df139b9fc7008cd8b1c5844536a837540540 100644 (file)
--- a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
@@ -9,7 +9,7 @@ from Components.ConfigList import ConfigList
 from Components.config import *
 
 from Tools.Directories import resolveFilename, pathExists, createDir, SCOPE_MEDIA
-from Components.FileList import FileEntryComponent, FileList
+from Components.FileList import FileList
 from Components.AVSwitch import AVSwitch
 
 from Plugins.Plugin import PluginDescriptor
@@ -452,7 +452,7 @@ class picmain(Screen):
                if not pathExists(currDir):
                        currDir = "/"
 
-               self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(jpeg|jpg|png|bmp)")
+               self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(jpeg|jpg|jpe|png|bmp)")
                self["filelist"] = self.filelist
                self["thumbnail"] = Pixmap()
                
@@ -533,7 +533,7 @@ def main(session, **kwargs):
 def filescan_open(list, session, **kwargs):
        session.open(picmain) # list
 
-def filescan():
+def filescan(**kwargs):
        # we expect not to be called if the MediaScanner plugin is not available,
        # thus we don't catch an ImportError exception here
        from Plugins.Extensions.MediaScanner.plugin import Scanner, ScanPath