From bcbd5801c2be23b2ee1a22e7b088fc2fb654f1c9 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Fri, 27 Jun 2008 14:43:24 +0000 Subject: some cleanups, add missing destroy calls, fix incomplete destroy calls, small speedup --- lib/python/Components/PerServiceDisplay.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'lib/python/Components/PerServiceDisplay.py') 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) -- cgit v1.2.3