fix service type

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

diff --git a/lib/python/Plugins/Extensions/SimpleRSS/plugin.py b/lib/python/Plugins/Extensions/SimpleRSS/plugin.py
index 49da5e632ae86a898d7684273d797389cdc1554b..8cc050f1d0762bbb31110470bc41972d242d3e7b 100644 (file)
--- a/lib/python/Plugins/Extensions/SimpleRSS/plugin.py
+++ b/lib/python/Plugins/Extensions/SimpleRSS/plugin.py
@@ -5,13 +5,10 @@ from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Components.ActionMap import ActionMap
 from Components.GUIComponent import GUIComponent
-from Components.Label import Label
 from Components.MultiContent import MultiContentEntryText
 from Plugins.Plugin import PluginDescriptor
-from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation, RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_WRAP
+from enigma import eListboxPythonMultiContent, eListbox, gFont, RT_HALIGN_LEFT, RT_WRAP
 
-from twisted.web import server
-from twisted.web.resource import Resource
 from twisted.web.client import getPage
 import xml.dom.minidom
 
@@ -22,10 +19,11 @@ from sets import Set
 
 my_global_session = None
 
-urls = ["http://www.heise.de/newsticker/heise.rdf", "http://rss.slashdot.org/Slashdot/slashdot/to"]
+#urls = ["http://www.heise.de/newsticker/heise.rdf", "http://rss.slashdot.org/Slashdot/slashdot/to"]
+urls = ["http://mastermaq.podcastspot.com/episodes/rss/mpg1"]
 
 from Components.config import config, ConfigSubsection, ConfigSelection, getConfigListEntry
-from Components.ConfigList import ConfigList, ConfigListScreen
+from Components.ConfigList import ConfigListScreen
 config.simpleRSS = ConfigSubsection()
 config.simpleRSS.hostname = ConfigSelection(choices = urls)
 
@@ -36,8 +34,6 @@ class SimpleRSS(ConfigListScreen, Screen):
                </screen>"""
 
        def __init__(self, session, args = None):
-               from Tools.BoundFunction import boundFunction
-               
                print "screen init"
                Screen.__init__(self, session)
                self.skin = SimpleRSS.skin
@@ -143,7 +139,7 @@ class RSSPoller:
 
        def __init__(self):
                self.poll_timer = eTimer()
-               self.poll_timer.timeout.get().append(self.poll)
+               self.poll_timer.callback.append(self.poll)
                self.poll_timer.start(0, 1)
                self.last_links = Set()
                self.dialog = None
@@ -235,10 +231,10 @@ class RSSPoller:
                        self.d = getPage(config.simpleRSS.hostname.value).addCallback(self._gotPage).addErrback(self.error)
 
        def shutdown(self):
-               self.poll_timer.timeout.get().remove(self.poll)
+               self.poll_timer.callback.remove(self.poll)
                self.poll_timer = None
 
-def main(session):
+def main(session, **kwargs):
        print "session.open"
        session.open(SimpleRSS)
        print "done"
@@ -273,4 +269,4 @@ def showCurrent(session, **kwargs):
 def Plugins(**kwargs):
        return [ PluginDescriptor(name="RSS Reader", description="A (really) simple RSS reader", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main),
                PluginDescriptor(where = [PluginDescriptor.WHERE_SESSIONSTART, PluginDescriptor.WHERE_AUTOSTART], fnc = autostart),
-               PluginDescriptor(name="View RSS", description="Let's you view current RSS entries", where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc=showCurrent) ]
+               PluginDescriptor(name="View RSS", description="Lets you view current RSS entries", where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc=showCurrent) ]