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

[vuplus_dvbapp] / lib / python / Plugins / SystemPlugins / Satfinder / plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index 1a52077..eb20b46 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -1,5 +1,5 @@
-from enigma import eTimer, eDVBSatelliteEquipmentControl, eDVBResourceManager,\
-       eDVBDiseqcCommand, eDVBFrontendParametersSatellite, eDVBFrontendParameters
+from enigma import eTimer, eDVBResourceManager,\
+       eDVBFrontendParametersSatellite, eDVBFrontendParameters

 
 from Screens.Screen import Screen
 from Screens.ScanSetup import ScanSetup
 
 from Screens.Screen import Screen
 from Screens.ScanSetup import ScanSetup


@@ -7,12 +7,11 @@ from Screens.MessageBox import MessageBox
 from Plugins.Plugin import PluginDescriptor
 
 from Components.Label import Label
 from Plugins.Plugin import PluginDescriptor
 
 from Components.Label import Label

-from Components.ConfigList import ConfigList

 from Components.TunerInfo import TunerInfo
 from Components.ActionMap import ActionMap
 from Components.NimManager import nimmanager, getConfigSatlist
 from Components.MenuList import MenuList
 from Components.TunerInfo import TunerInfo
 from Components.ActionMap import ActionMap
 from Components.NimManager import nimmanager, getConfigSatlist
 from Components.MenuList import MenuList

-from Components.config import ConfigSelection, ConfigSatlist, getConfigListEntry
+from Components.config import ConfigSelection, getConfigListEntry

 
 class Tuner:
        def __init__(self, frontend):
 
 class Tuner:
        def __init__(self, frontend):


@@ -278,11 +277,14 @@ def SatfinderMain(session, **kwargs):
                        else:
                                session.open(NimSelection)
 
                        else:
                                session.open(NimSelection)
 

-def SatfinderStart(menuid):
+def SatfinderStart(menuid, **kwargs):

        if menuid == "scan":
                return [(_("Satfinder"), SatfinderMain)]
        else:
                return []
 
 def Plugins(**kwargs):
        if menuid == "scan":
                return [(_("Satfinder"), SatfinderMain)]
        else:
                return []
 
 def Plugins(**kwargs):

-       return PluginDescriptor(name=_("Satfinder"), description="Helps setting up your dish", where = PluginDescriptor.WHERE_SETUP, fnc=SatfinderStart)
+       if (nimmanager.hasNimType("DVB-S")):
+               return PluginDescriptor(name=_("Satfinder"), description="Helps setting up your dish", where = PluginDescriptor.WHERE_SETUP, fnc=SatfinderStart)
+       else:
+               return []