aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components/PerServiceDisplay.py
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2008-06-27 14:43:24 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2008-06-27 14:43:24 +0000
commitbcbd5801c2be23b2ee1a22e7b088fc2fb654f1c9 (patch)
tree14a12d4baa5d72542cf2e8ffbef249634dc8b89f /lib/python/Components/PerServiceDisplay.py
parent8b921858d57c9d4cd5ff0ec40a484a4231762974 (diff)
downloadenigma2-bcbd5801c2be23b2ee1a22e7b088fc2fb654f1c9.tar.gz
enigma2-bcbd5801c2be23b2ee1a22e7b088fc2fb654f1c9.zip
some cleanups,
add missing destroy calls, fix incomplete destroy calls, small speedup
Diffstat (limited to 'lib/python/Components/PerServiceDisplay.py')
-rw-r--r--lib/python/Components/PerServiceDisplay.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
index 2d0a71e7..cb86bd84 100644
--- a/lib/python/Components/PerServiceDisplay.py
+++ b/lib/python/Components/PerServiceDisplay.py
@@ -22,12 +22,13 @@ class PerServiceBase(object):
def event_callback(self, ev):
# loop up if we need to handle this event
- if self.eventmap.has_key(ev):
+ func = self.eventmap.get(ev)
+ if func:
# call handler
if self.with_event:
- self.eventmap[ev](ev)
+ func(ev)
else:
- self.eventmap[ev]()
+ func()
def enablePolling(self, interval=60000):
if interval:
@@ -48,6 +49,10 @@ class PerServiceDisplay(PerServiceBase, VariableText, GUIComponent):
VariableText.__init__(self)
PerServiceBase.__init__(self, navcore, eventmap)
+ def destroy(self):
+ PerServiceBase.destroy(self)
+ GUIComponent.destroy(self)
+
GUI_WIDGET = eLabel
class PerServiceDisplayProgress(PerServiceBase, VariableValue, GUIComponent):
@@ -63,3 +68,7 @@ class PerServiceDisplayProgress(PerServiceBase, VariableValue, GUIComponent):
self.event(iPlayableService.evEnd)
GUI_WIDGET = eSlider
+
+ def destroy(self):
+ PerServiceBase.destroy(self)
+ GUIComponent.destroy(self)