follow recent timer changes

diff --git a/autotimer/src/AutoPoller.py b/autotimer/src/AutoPoller.py
index 7b4dcf6..6401754 100644 (file)
--- a/autotimer/src/AutoPoller.py
+++ b/autotimer/src/AutoPoller.py
@@ -10,16 +10,18 @@ class AutoPoller:
        def __init__(self):
                # Init Timer
                self.timer = eTimer()
-               self.timer.timeout.get().append(self.query)
 
        def start(self, initial = True):
                if initial:
                        delay = 2
                else:
                        delay = config.plugins.autotimer.interval.value*3600
+
+               self.timer.callback.append(self.query)
                self.timer.startLongTimer(delay)
 
        def stop(self):
+               self.timer.callback.remove(self.query)
                self.timer.stop()
 
        def query(self):

diff --git a/simplerss/src/RSSPoller.py b/simplerss/src/RSSPoller.py
index 5cba64a..1e36a8b 100644 (file)
--- a/simplerss/src/RSSPoller.py
+++ b/simplerss/src/RSSPoller.py
@@ -13,7 +13,7 @@ class RSSPoller:
        def __init__(self, session, poll = True):
                # Timer
                self.poll_timer = eTimer()
-               self.poll_timer.timeout.get().append(self.poll)
+               self.poll_timer.callback.append(self.poll)
                if poll:
                        self.poll_timer.start(0, 1)
 
@@ -162,7 +162,7 @@ class RSSPoller:
                self.poll_timer.start(1000, 1)
 
        def shutdown(self):
-               self.poll_timer.timeout.get().remove(self.poll)
+               self.poll_timer.callback.remove(self.poll)
                self.poll_timer = None
 
        def triggerReload(self):

diff --git a/simplerss/src/RSSScreens.py b/simplerss/src/RSSScreens.py
index 3720191..8038388 100644 (file)
--- a/simplerss/src/RSSScreens.py
+++ b/simplerss/src/RSSScreens.py
@@ -215,7 +215,7 @@ class RSSFeedView(RSSBaseView):
                        })
 
                        self.timer = eTimer()
-                       self.timer.timeout.get().append(self.timerTick)
+                       self.timer.callback.append(self.timerTick)
                        self.onExecBegin.append(self.startTimer)
 
                self["content"].connectSelChanged(self.updateInfo)
@@ -225,6 +225,9 @@ class RSSFeedView(RSSBaseView):
                self.timer.startLongTimer(5)
 
        def timerTick(self):
+               self.timer.callback.remove(self.timerTick)
+               self.timer = None
+
                self.close()
 
        def __show(self):
@@ -232,7 +235,7 @@ class RSSFeedView(RSSBaseView):
 
        def __close(self):
                if self.timer is not None:
-                       self.timer.timeout.get().remove(self.timerTick)
+                       self.timer.callback.remove(self.timerTick)
                        self.timer = None
                self.rssPoller.removeCallback(self.pollCallback)
 

diff --git a/werbezapper/src/WerbeZapper.py b/werbezapper/src/WerbeZapper.py
index 9bc6059..bbad67e 100644 (file)
--- a/werbezapper/src/WerbeZapper.py
+++ b/werbezapper/src/WerbeZapper.py
@@ -20,7 +20,7 @@ class WerbeZapper:
 
                # Create Timer
                self.zap_timer = eTimer()
-               self.zap_timer.timeout.get().append(self.zap)
+               self.zap_timer.callback.append(self.zap)
 
                # Initialize services
                self.zap_service = None
@@ -129,3 +129,6 @@ class WerbeZapper:
                if self.cleanupfnc:
                        self.cleanupfnc()
 
+       def shutdown(self):
+               self.zap_timer.callback.remove(self.zap)
+               self.zap_timer = None

diff --git a/werbezapper/src/plugin.py b/werbezapper/src/plugin.py
index 6418cd3..c6a9eb0 100644 (file)
--- a/werbezapper/src/plugin.py
+++ b/werbezapper/src/plugin.py
@@ -14,7 +14,9 @@ def main(session, servicelist, **kwargs):
 
 def cleanup():
        global zapperInstance
-       zapperInstance = None
+       if zapperInstance is not None:
+               zapperInstance.shutdown()
+               zapperInstance = None
 
 def Plugins(**kwargs):
        return [