From 075ad90b31e50c2b737acc6bc0b20ae6764ceffb Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Mon, 30 Oct 2006 16:11:05 +0000 Subject: [PATCH 1/1] revert local change (just for testing) --- lib/python/Screens/ChannelSelection.py | 4 ++-- lib/python/Screens/ScanSetup.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 5b8299cd..ff2928ec 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -753,8 +753,8 @@ class ChannelSelectionBase(Screen): 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")) diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index f6ef01cf..1e164d43 100644 --- 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]) - if sat[2] & 1: - flags |= eComponentScan.scanNetworkSearch + flags |= eComponentScan.scanNetworkSearch tmp = self.scan_clearallservices.value if tmp == "yes": flags |= eComponentScan.scanRemoveServices -- 2.30.2