Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index 2457763ae1bd1047c53c6cb08449ef32aee5ac6c..71893f95ef1dc58fa5d65194fadc52397909a4a1 100644 (file)
--- a/lib/dvb/scan.cpp
+++ b/lib/dvb/scan.cpp
@@ -758,7 +758,7 @@ void eDVBScan::channelDone()
                        SCAN_eDebug("name '%s', provider_name '%s'", sname, pname);
                        service->m_service_name = convertDVBUTF8(sname);
                        service->genSortName();
-                       service->m_provider_name = pname;
+                       service->m_provider_name = convertDVBUTF8(pname);
                }
 
                if (!(m_flags & scanOnlyFree) || !m_pmt_in_progress->second.scrambled) {

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 17297e67f4f40c08a404b5ef847c6167cfaaa5a5..7060168e0b025626244e6ba84834b68c2a6325fe 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -58,14 +58,6 @@ class SecConfigure:
                sec.setRepeats(0)
                sec.setFastDiSEqC(fastDiSEqC)
                sec.setSeqRepeat(0)
-
-               if setVoltageTone:
-                       sec.setVoltageMode(switchParam.HV)
-                       sec.setToneMode(switchParam.HILO)
-               else:
-                       sec.setVoltageMode(switchParam._14V)
-                       sec.setToneMode(switchParam.OFF)
-
                sec.setCommandOrder(0)
 
                #user values
@@ -77,6 +69,12 @@ class SecConfigure:
 
                if 0 <= diseqcmode < 3:
                        self.addSatellite(sec, orbpos)
+                       if setVoltageTone:
+                               sec.setVoltageMode(switchParam.HV)
+                               sec.setToneMode(switchParam.HILO)
+                       else:
+                               sec.setVoltageMode(switchParam._14V)
+                               sec.setToneMode(switchParam.OFF)
                elif (diseqcmode == 3): # diseqc 1.2
                        if self.satposdepends.has_key(slotid):
                                for slot in self.satposdepends[slotid]:
@@ -747,12 +745,16 @@ class NimManager:
                        if configMode == "simple":
                                dm = nim.diseqcMode.value
                                if dm in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
-                                       list.append(self.satList[nim.diseqcA.index])
+                                       if nim.diseqcA.orbital_position != 3601:
+                                               list.append(self.satList[nim.diseqcA.index-1])
                                if dm in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
-                                       list.append(self.satList[nim.diseqcB.index])
+                                       if nim.diseqcB.orbital_position != 3601:
+                                               list.append(self.satList[nim.diseqcB.index-1])
                                if dm == "diseqc_a_b_c_d":
-                                       list.append(self.satList[nim.diseqcC.index])
-                                       list.append(self.satList[nim.diseqcD.index])
+                                       if nim.diseqcC.orbital_position != 3601:
+                                               list.append(self.satList[nim.diseqcC.index-1])
+                                       if nim.diseqcD.orbital_position != 3601:
+                                               list.append(self.satList[nim.diseqcD.index-1])
                                if dm == "positioner":
                                        for x in self.satList:
                                                list.append(x)

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 4ddcabec3dfd3421a7d10d508d7b042c0d066c01..4d57bbb9a1edf6966d6ffc582fd4bb5db7945293 100755 (executable)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -782,12 +782,12 @@ class ConfigText(ConfigElement, NumericalTextInput):
 
        def getValue(self):
                return self.text.encode("utf-8")
-               
+
        def setValue(self, val):
                try:
                        self.text = val.decode("utf-8")
                except UnicodeDecodeError:
-                       self.text = val
+                       self.text = val.decode("utf-8", "ignore")
                        print "Broken UTF8!"
 
        value = property(getValue, setValue)

diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index 6bfe54ad6406c7103c273c09ac3d130ff38c1cc1..588a46ff12077aa3af49c8c7cc40a4780ef4cf02 100755 (executable)
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -219,6 +219,10 @@ class NameserverSetup(Screen, ConfigListScreen, HelpableScreen):
                        "yellow": (self.remove, _("remove a nameserver entry")),
                        })
                
+               self["actions"] = NumberActionMap(["SetupActions"],
+               {
+                       "ok": self.ok,
+               }, -2)          
                
                self.list = []
                ConfigListScreen.__init__(self, self.list)