add support for cyclic garbage collection to eTimer and eSocketNotifier

[vuplus_dvbapp] / lib / python / Plugins / SystemPlugins / PositionerSetup / plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index 4576481..1f22204 100644 (file)
--- 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):
@@ -529,11 +529,10 @@ class NimSelection(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
 
-               nimlist = nimmanager.getNimListOfType(nimmanager.nimType["DVB-S"])
+               nimlist = nimmanager.getNimListOfType("DVB-S")
                nimMenuList = []
                for x in nimlist:
-                       n = nimmanager.nim_slots[x]
-                       nimMenuList.append((n.friendly_full_name, x))
+                       nimMenuList.append((nimmanager.nim_slots[x].friendly_full_description, x))
                
                self["nimlist"] = MenuList(nimMenuList)
 
@@ -569,7 +568,7 @@ def PositionerMain(session, **kwargs):
 
 def PositionerSetupStart(menuid, **kwargs):
        if menuid == "scan":
-               return [(_("Positioner setup"), PositionerMain, "positioner_setup")]
+               return [(_("Positioner setup"), PositionerMain, "positioner_setup", None)]
        else:
                return []