change ConfigDummy to ConfigNothing

[enigma2.git] / lib / python / Components / NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 783288ec5d643c271d6a6df68c07dde49adeb6b1..f9b9ff6d55956c3c8152ea54adc20dbcb43946c6 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -1,4 +1,4 @@
-from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigDummy, ConfigSubDict
+from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, ConfigNothing, ConfigSubDict
 
 from enigma import eDVBSatelliteEquipmentControl, \
        eDVBSatelliteLNBParameters as lnbParam, \
@@ -212,14 +212,13 @@ class SecConfigure:
                                        # Committed Diseqc Command
                                        cdc = currLnb.commitedDiseqcCommand.value
                                        
-                                       c = [
-                                               ("none", diseqcParam.SENDNO),
-                                               ("AA", diseqcParam.AA),
-                                               ("AB", diseqcParam.AB),
-                                               ("BA", diseqcParam.BA),
-                                               ("BB", diseqcParam.BB)]
-                                               
-                                       if cdc in c:
+                                       c = { "none": diseqcParam.SENDNO,
+                                               "AA": diseqcParam.AA,
+                                               "AB": diseqcParam.AB,
+                                               "BA": diseqcParam.BA,
+                                               "BB": diseqcParam.BB }
+
+                                       if c.has_key(cdc):
                                                sec.setCommittedCommand(c[cdc])
                                        else:
                                                sec.setCommittedCommand(long(cdc))
@@ -745,13 +744,13 @@ def InitNimManager(nimmgr):
                        csw = [("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))]
                        for y in range(0, 16):
                                csw.append((str(0xF0|y), "Input " + str(y+1)))
-
+                       
                        ucsw = [("0", _("None"))]
                        for y in range(1, 17):
                                ucsw.append((str(y), "Input " + str(y)))
-
+                       
                        nim.advanced.lnb = ConfigSubList()
-                       nim.advanced.lnb.append(ConfigDummy())
+                       nim.advanced.lnb.append(ConfigNothing())
                        for x in range(1, 33):
                                nim.advanced.lnb.append(ConfigSubsection())
                                nim.advanced.lnb[x].lof = ConfigSelection(choices={"universal_lnb": _("Universal LNB"), "c_band": _("C-Band"), "user_defined": _("User defined")}, default="universal_lnb")