add support for cyclic garbage collection to eTimer and eSocketNotifier

class, add simpler method to set a timer callback.. or remove.. instead of
timer.timeout.get().append(func).. or .remove(func)... now it is possible to
do timer.callback.append(func)... timer.callback.remove(func) (the old
method still works..but is now deprecated)

11 files changed, 13 insertions, 13 deletions

diff --git a/lib/python/Components/Clock.py b/lib/python/Components/Clock.py
index ddd6ffb1..338101ef 100644
--- a/lib/python/Components/Clock.py
+++ b/lib/python/Components/Clock.py
@@ -14,7 +14,7 @@ class Clock(VariableText, HTMLComponent, GUIComponent):
 		self.doClock()
 		
 		self.clockTimer = eTimer()
-		self.clockTimer.timeout.get().append(self.doClock)
+		self.clockTimer.callback.append(self.doClock)
 
 	def onShow(self):
 		self.doClock()
diff --git a/lib/python/Components/ConditionalWidget.py b/lib/python/Components/ConditionalWidget.py
index f4b99837..192813f5 100644
--- a/lib/python/Components/ConditionalWidget.py
+++ b/lib/python/Components/ConditionalWidget.py
@@ -9,7 +9,7 @@ class ConditionalWidget(GUIComponent):
 		
 		if (withTimer):
 			self.conditionCheckTimer = eTimer()
-			self.conditionCheckTimer.timeout.get().append(self.update)
+			self.conditionCheckTimer.callback.append(self.update)
 			self.conditionCheckTimer.start(1000)
 
 	def postWidgetCreate(self, instance):
@@ -38,7 +38,7 @@ class BlinkingWidget(GUIComponent):
 		self.blinking = False
 		self.setBlinkTime(500)
 		self.timer = eTimer()
-		self.timer.timeout.get().append(self.blink)
+		self.timer.callback.append(self.blink)
 	
 	def setBlinkTime(self, time):
 		self.blinktime = time
diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py
index f42d6a96..d1b295ba 100644
--- a/lib/python/Components/ConfigList.py
+++ b/lib/python/Components/ConfigList.py
@@ -19,7 +19,7 @@ class ConfigList(HTMLComponent, GUIComponent, object):
 	def execBegin(self):
 		rcinput = eRCInput.getInstance()
 		rcinput.setKeyboardMode(rcinput.kmAscii)
-		self.timer.timeout.get().append(self.timeout)
+		self.timer.callback.append(self.timeout)
 
 	def execEnd(self):
 		rcinput = eRCInput.getInstance()
diff --git a/lib/python/Components/Converter/ConditionalShowHide.py b/lib/python/Components/Converter/ConditionalShowHide.py
index 50e8b1a8..f5ec7039 100644
--- a/lib/python/Components/Converter/ConditionalShowHide.py
+++ b/lib/python/Components/Converter/ConditionalShowHide.py
@@ -10,8 +10,8 @@ class ConditionalShowHide(Converter, object):
 		if self.blink:
 			self.blinktime = 500
 			self.timer = eTimer()
-			self.timer.timeout.get().append(self.blinkFunc)
-		else:
+			self.timer.callback.append(self.blinkFunc)
+		else
 			self.timer = None
 
 	def blinkFunc(self):
diff --git a/lib/python/Components/Converter/Poll.py b/lib/python/Components/Converter/Poll.py
index f41765d4..33b9f305 100644
--- a/lib/python/Components/Converter/Poll.py
+++ b/lib/python/Components/Converter/Poll.py
@@ -3,7 +3,7 @@ from enigma import eTimer
 class Poll(object):
 	def __init__(self):
 		self.__poll_timer = eTimer()
-		self.__poll_timer.timeout.get().append(self.poll)
+		self.__poll_timer.callback.append(self.poll)
 		self.__interval = 1000
 		self.__enabled = False
 
diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
index 6e02cce9..2d0a71e7 100644
--- a/lib/python/Components/PerServiceDisplay.py
+++ b/lib/python/Components/PerServiceDisplay.py
@@ -11,7 +11,7 @@ class PerServiceBase(object):
 		self.navcore = navcore
 		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
diff --git a/lib/python/Components/Pixmap.py b/lib/python/Components/Pixmap.py
index 3cc8c661..f6ecaf0c 100644
--- a/lib/python/Components/Pixmap.py
+++ b/lib/python/Components/Pixmap.py
@@ -24,7 +24,7 @@ class MovingPixmap(Pixmap):
 		self.clearPath()
 		
 		self.moveTimer = eTimer()
-		self.moveTimer.timeout.get().append(self.doMove)
+		self.moveTimer.callback.append(self.doMove)
 		
 	def clearPath(self, repeated = False):
 		if (self.moving):
diff --git a/lib/python/Components/ServicePosition.py b/lib/python/Components/ServicePosition.py
index 6f7082d5..985f8841 100644
--- a/lib/python/Components/ServicePosition.py
+++ b/lib/python/Components/ServicePosition.py
@@ -12,7 +12,7 @@ class ServicePosition(PerServiceDisplay, object):
 	def __init__(self, navcore, type):
 		object.__init__(self)
 		self.updateTimer = eTimer()
-		self.updateTimer.timeout.get().append(self.update)
+		self.updateTimer.callback.append(self.update)
 		PerServiceDisplay.__init__(self, navcore,
 			{
 				iPlayableService.evStart: self.newService,
diff --git a/lib/python/Components/Sources/Boolean.py b/lib/python/Components/Sources/Boolean.py
index 21c2c2b9..97b92bc6 100644
--- a/lib/python/Components/Sources/Boolean.py
+++ b/lib/python/Components/Sources/Boolean.py
@@ -16,7 +16,7 @@ class Boolean(Source, object):
 		self.fixed = fixed
 		if poll > 0:
 			self.poll_timer = eTimer()
-			self.poll_timer.timeout.get().append(self.poll)
+			self.poll_timer.callback.append(self.poll)
 			self.poll_timer.start(poll)
 		else:
 			self.poll_timer = None
diff --git a/lib/python/Components/Sources/Clock.py b/lib/python/Components/Sources/Clock.py
index b59a20d5..60fa7ac2 100644
--- a/lib/python/Components/Sources/Clock.py
+++ b/lib/python/Components/Sources/Clock.py
@@ -8,7 +8,7 @@ class Clock(Source):
 	def __init__(self):
 		Source.__init__(self)
 		self.clock_timer = eTimer()
-		self.clock_timer.timeout.get().append(self.poll)
+		self.clock_timer.callback.append(self.poll)
 		self.clock_timer.start(1000)
 
 	@cached
diff --git a/lib/python/Components/Sources/FrontendStatus.py b/lib/python/Components/Sources/FrontendStatus.py
index 4d38f754..141bd8a4 100644
--- a/lib/python/Components/Sources/FrontendStatus.py
+++ b/lib/python/Components/Sources/FrontendStatus.py
@@ -9,7 +9,7 @@ class FrontendStatus(Source):
 		self.frontend_source = frontend_source
 		self.invalidate()
 		self.poll_timer = eTimer()
-		self.poll_timer.timeout.get().append(self.updateFrontendStatus)
+		self.poll_timer.callback.append(self.updateFrontendStatus)
 		self.poll_timer.start(update_interval)
 
 	def invalidate(self):