properly handle tags combined with other prerequisites

[enigma2.git] / lib / python / Components / PerServiceDisplay.py

diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
index 6de7e8887600941d3566bc8f558d550bf4f8b7d7..2d0a71e7270b9529c0a212c742d7308394698822 100644 (file)
--- a/lib/python/Components/PerServiceDisplay.py
+++ b/lib/python/Components/PerServiceDisplay.py
@@ -1,6 +1,6 @@
-from GUIComponent import *
-from VariableText import *
-from VariableValue import *
+from GUIComponent import GUIComponent
+from VariableText import VariableText
+from VariableValue import VariableValue
 
 from enigma import iPlayableService
 from enigma import eLabel, eSlider, eTimer
@@ -9,18 +9,18 @@ class PerServiceBase(object):
        def __init__(self, navcore, eventmap, with_event=False):
                self.eventmap = eventmap
                self.navcore = navcore
-               self.navcore.event.append(self.event)
+               self.navcore.event.append(self.event_callback)
                self.poll_timer = eTimer()
-               self.poll_timer.timeout.get().append(self.poll)
+               self.poll_timer.callback.append(self.poll)
                self.with_event = with_event
                
                # start with stopped state, so simulate that
-               self.event(iPlayableService.evEnd)
+               self.event_callback(iPlayableService.evEnd)
 
        def destroy(self):
-               self.navcore.event.remove(self.event)
+               self.navcore.event.remove(self.event_callback)
 
-       def event(self, ev):
+       def event_callback(self, ev):
                # loop up if we need to handle this event
                if self.eventmap.has_key(ev):
                        # call handler