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)

8 files changed, 12 insertions, 12 deletions

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
index 4f31fa46..80a07df4 100644
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
@@ -380,7 +380,7 @@ class GraphMultiEPG(Screen):
 			},-1)
 
 		self.updateTimelineTimer = eTimer()
-		self.updateTimelineTimer.timeout.get().append(self.moveTimeLines)
+		self.updateTimelineTimer.callback.append(self.moveTimeLines)
 		self.updateTimelineTimer.start(60*1000)
 		self.onLayoutFinish.append(self.onCreate)
 
diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index 63e2b302..03d76173 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -159,11 +159,11 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup
 
 		self.righttimer = False
 		self.rightKeyTimer = eTimer()
-		self.rightKeyTimer.timeout.get().append(self.rightTimerFire)
+		self.rightKeyTimer.callback.append(self.rightTimerFire)
 
 		self.lefttimer = False
 		self.leftKeyTimer = eTimer()
-		self.leftKeyTimer.timeout.get().append(self.leftTimerFire)
+		self.leftKeyTimer.callback.append(self.leftTimerFire)
 
 		self.currList = "filelist"
 
diff --git a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
index b305b653..6d41305e 100644
--- a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
@@ -94,7 +94,7 @@ class ThumbView(Screen):
 			self["label0"].setText(_("no Picture found"))
 		
 		self.ThumbTimer = eTimer()
-		self.ThumbTimer.timeout.get().append(self.showThumb)
+		self.ThumbTimer.callback.append(self.showThumb)
 
 		self.fillPage()
 		
@@ -244,11 +244,11 @@ class PicView(Screen):
 		self["pause"] = Pixmap()
 		
 		self.decodeTimer = eTimer()
-		self.decodeTimer.timeout.get().append(self.decodePic)
+		self.decodeTimer.callback.append(self.decodePic)
 		self.decodeTimer.start(300, True)
 
 		self.slideTimer = eTimer()
-		self.slideTimer.timeout.get().append(self.slidePic)
+		self.slideTimer.callback.append(self.slidePic)
 		
 		
 	def Pause(self):
@@ -457,7 +457,7 @@ class picmain(Screen):
 		self["thumbnail"] = Pixmap()
 		
 		self.ThumbTimer = eTimer()
-		self.ThumbTimer.timeout.get().append(self.showThumb)
+		self.ThumbTimer.callback.append(self.showThumb)
 		self.ThumbTimer.start(500, True)
 		
 	def up(self):
diff --git a/lib/python/Plugins/Extensions/SimpleRSS/plugin.py b/lib/python/Plugins/Extensions/SimpleRSS/plugin.py
index b5218358..3c96dd44 100644
--- a/lib/python/Plugins/Extensions/SimpleRSS/plugin.py
+++ b/lib/python/Plugins/Extensions/SimpleRSS/plugin.py
@@ -139,7 +139,7 @@ class RSSPoller:
 
 	def __init__(self):
 		self.poll_timer = eTimer()
-		self.poll_timer.timeout.get().append(self.poll)
+		self.poll_timer.callback.append(self.poll)
 		self.poll_timer.start(0, 1)
 		self.last_links = Set()
 		self.dialog = None
diff --git a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
index 17abb0ff..c7216382 100644
--- a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
@@ -30,7 +30,7 @@ class Upgrade(Screen):
 		
 		self.update = True
 		self.delayTimer = eTimer()
-		self.delayTimer.timeout.get().append(self.doUpdateDelay)
+		self.delayTimer.callback.append(self.doUpdateDelay)
 		
 	def go(self):
 		if self.update:
diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index e394db4b..1f222046 100644
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -123,7 +123,7 @@ class PositionerSetup(Screen):
 		self.updateColors("tune")
 		
 		self.statusTimer = eTimer()
-		self.statusTimer.timeout.get().append(self.updateStatus)
+		self.statusTimer.callback.append(self.updateStatus)
 		self.statusTimer.start(50, False)
 
 	def restartPrevService(self, yesno):
diff --git a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
index c0fbe740..8127514c 100644
--- a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
@@ -268,7 +268,7 @@ class UpdatePlugin(Screen):
 		
 		self.activity = 0
 		self.activityTimer = eTimer()
-		self.activityTimer.timeout.get().append(self.doActivityTimer)
+		self.activityTimer.callback.append(self.doActivityTimer)
 		self.activityTimer.start(100, False)
 				
 		self.ipkg = IpkgComponent()
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
index c6d6b864..9defb9eb 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
@@ -66,7 +66,7 @@ class VideoHardware:
 
 		# until we have the hotplug poll socket
 #		self.timer = eTimer()
-#		self.timer.timeout.get().append(self.readPreferredModes)
+#		self.timer.callback.append(self.readPreferredModes)
 #		self.timer.start(1000)
 
 	def readAvailableModes(self):