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

5 files changed, 11 insertions, 11 deletions

diff --git a/lib/python/Plugins/Extensions/CutListEditor/plugin.py b/lib/python/Plugins/Extensions/CutListEditor/plugin.py
index 25a5e742..16616cd2 100644
--- a/lib/python/Plugins/Extensions/CutListEditor/plugin.py
+++ b/lib/python/Plugins/Extensions/CutListEditor/plugin.py
@@ -338,8 +338,8 @@ Then seek to the end, press OK, select 'end cut'. That's it.
 			self.cut_list.remove(self.context_nearest_mark)
 			self.uploadCuesheet()
 
-def main(session, service):
+def main(session, service, **kwargs):
 	session.open(CutListEditor, service)
 
-def Plugins():
+def Plugins(**kwargs):
  	return PluginDescriptor(name="Cutlist Editor", description=_("Cutlist editor..."), where = PluginDescriptor.WHERE_MOVIELIST, fnc=main)
diff --git a/lib/python/Plugins/Extensions/FileManager/plugin.py b/lib/python/Plugins/Extensions/FileManager/plugin.py
index 05a19fc2..a17e631c 100644
--- a/lib/python/Plugins/Extensions/FileManager/plugin.py
+++ b/lib/python/Plugins/Extensions/FileManager/plugin.py
@@ -62,8 +62,8 @@ class FileManager(Screen):
 		print "pressed", number
 		self["text"].number(number)
 
-def main(session):
+def main(session, **kwargs):
 	session.open(FileManager)
 
-def Plugins():
+def Plugins(**kwargs):
  	return PluginDescriptor(name="File-Manager", description="Let's you view/edit files in your Dreambox", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main)
diff --git a/lib/python/Plugins/Extensions/TuxboxPlugins/plugin.py b/lib/python/Plugins/Extensions/TuxboxPlugins/plugin.py
index 7ab02da7..8d4e1581 100644
--- a/lib/python/Plugins/Extensions/TuxboxPlugins/plugin.py
+++ b/lib/python/Plugins/Extensions/TuxboxPlugins/plugin.py
@@ -38,9 +38,9 @@ def getPluginParams(file):
 
 	return params
 
-def main(session, plugin):
+def main(session, plugin, **kwargs):
 	print "Running plugin " + plugin[:-4] + ".so with config file", plugin
 	print getPluginParams(plugin)
 	
-def Plugins():
-	return getPlugins()
\ No newline at end of file
+def Plugins(**kwargs):
+	return getPlugins()
diff --git a/lib/python/Plugins/Extensions/WebInterface/plugin.py b/lib/python/Plugins/Extensions/WebInterface/plugin.py
index f0be4e45..0f7e2bbd 100644
--- a/lib/python/Plugins/Extensions/WebInterface/plugin.py
+++ b/lib/python/Plugins/Extensions/WebInterface/plugin.py
@@ -8,12 +8,12 @@ def startWebserver():
 	
 	reactor.listenTCP(80, http.HTTPFactory(site))
 
-def autostart(reason):
+def autostart(reason, **kwargs):
 	if reason == 0:
 		try:
 			startWebserver()
 		except ImportError:
 			print "twisted not available, not starting web services"
 
-def Plugins():
+def Plugins(**kwargs):
 	return PluginDescriptor(where = PluginDescriptor.WHERE_AUTOSTART, fnc = autostart)
diff --git a/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py b/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py
index dace8dd5..118f0cb6 100644
--- a/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py
+++ b/lib/python/Plugins/Extensions/ZappingAlternatives/plugin.py
@@ -294,9 +294,9 @@ def autostart(reason):
 		NavigationInstance.instance.playService = type(NavigationInstance.instance.playService)(playService, NavigationInstance, Navigation)
 		
 
-def AlternativeZappingSetup(session):
+def AlternativeZappingSetup(session, **kwargs):
 	session.open(AlternativeZapping)
 
-def Plugins():
+def Plugins(**kwargs):
  	return [PluginDescriptor(where = PluginDescriptor.WHERE_AUTOSTART, fnc = autostart),
  			PluginDescriptor(name="Alternative services setup" , description="Defines alternatives for services.", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=AlternativeZappingSetup)]