revert local change (just for testing)

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 5b8299cd5b6337ee3ad4af2c2a080fbf98d9ea7b..ff2928ecf14d1dab2f6df9cf69a29b2bf52ad636 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -753,8 +753,8 @@ class ChannelSelectionBase(Screen):
                                                        else:
                                                                service_name = _("Services")
                                                        try:
                                                        else:
                                                                service_name = _("Services")
                                                        try:

-                                                               service_name += str(' - %s'%(nimmanager.getSatDescription(orbpos).decode("latin-1").encode("utf-8")))
-                                                               service.setName(service_name)
+                                                               service_name += str(' - %s'%(nimmanager.getSatDescription(orbpos)))
+                                                               service.setName(service_name) # why we need this cast?

                                                        except:
                                                                if orbpos == 0xFFFF: #Cable
                                                                        n = ("%s (%s)") % (service_name, _("Cable"))
                                                        except:
                                                                if orbpos == 0xFFFF: #Cable
                                                                        n = ("%s (%s)") % (service_name, _("Cable"))

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index f6ef01cf030c009d6720456f00457ddfb6bab711..1e164d432dfb9ad944824fdf80a348aec118943a 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -483,8 +483,7 @@ class ScanSetup(ConfigListScreen, Screen):
                        elif self.scan_type.value == "single_satellite":
                                sat = self.satList[self.scan_nims.index][self.scan_satselection[self.scan_nims.index].index]
                                getInitialTransponderList(tlist, sat[0])
                        elif self.scan_type.value == "single_satellite":
                                sat = self.satList[self.scan_nims.index][self.scan_satselection[self.scan_nims.index].index]
                                getInitialTransponderList(tlist, sat[0])

-                               if sat[2] & 1:
-                                       flags |= eComponentScan.scanNetworkSearch
+                               flags |= eComponentScan.scanNetworkSearch

                                tmp = self.scan_clearallservices.value
                                if tmp == "yes":
                                        flags |= eComponentScan.scanRemoveServices
                                tmp = self.scan_clearallservices.value
                                if tmp == "yes":
                                        flags |= eComponentScan.scanRemoveServices