plugin api change: Plugins() and main functions must receive (and possibly ignore) keyword arguments

4 files changed, 8 insertions, 9 deletions

diff --git a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py
index fea38424..94c81c05 100644
--- a/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py
@@ -44,7 +44,7 @@ class FPUpgrade(Screen):
 	def ok(self):
 		self.close(4)
 
-def Plugins():
+def Plugins(**kwargs):
 	from Tools.DreamboxHardware import getFPVersion
 	version = getFPVersion()
 	newversion = getUpgradeVersion() or 0
diff --git a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
index 0dc53a6c..72279c1a 100644
--- a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
@@ -166,12 +166,12 @@ class Ipkg(Screen):
 		else:
 			self.close()
 
-def UpgradeMain(session):
+def UpgradeMain(session, **kwargs):
 	session.open(Upgrade)
 
-def IpkgMain(session):
+def IpkgMain(session, **kwargs):
 	session.open(Ipkg)
 
-def Plugins():
+def Plugins(**kwargs):
 	return [PluginDescriptor(name="Old Softwareupdate", description="Updates your receiver's software", icon="update.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=UpgradeMain),
 			PluginDescriptor(name="IPKG", description="IPKG frontend", icon="update.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=IpkgMain)]
diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index cd39fecf..579f6c99 100644
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -129,9 +129,8 @@ class PositionerSetup(Screen):
 		else:
 			self.status.setText("not moving")
 		
-def PositionerMain(session):
+def PositionerMain(session, **kwargs):
 	session.open(PositionerSetup)
 
-def Plugins():
+def Plugins(**kwargs):
 	return PluginDescriptor(name="Positioner setup", description="Setup your positioner", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=PositionerMain)
-
diff --git a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
index 00f8e185..af4d8982 100644
--- a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
@@ -219,8 +219,8 @@ class Ipkg(Screen):
 		else:
 			self.close()
 
-def UpgradeMain(session):
+def UpgradeMain(session, **kwargs):
 	session.open(UpdatePluginMenu)
 
-def Plugins():
+def Plugins(**kwargs):
 	return PluginDescriptor(name="Softwareupdate", description="Updates your receiver's software", icon="update.png", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=UpgradeMain)