use service compare strings instead of eServiceReferences in parental control

diff --git a/lib/python/Components/ParentalControl.py b/lib/python/Components/ParentalControl.py
index 97e9fad55d94a8d50bdf4c38fccf388e3eda669e..ac786fcd946d41c2d1518f196666964f6e3d27f3 100644 (file)
--- a/lib/python/Components/ParentalControl.py
+++ b/lib/python/Components/ParentalControl.py
@@ -92,16 +92,15 @@ class ParentalControl:
                print "unprotect"
                print "config.ParentalControl.type.value:", config.ParentalControl.type.value
                if config.ParentalControl.type.value == "whitelist":
-                       if service.toCompareString() not in self.whitelist:
+                       if service not in self.whitelist:
                                self.addWhitelistService(service)
                else: # blacklist
-                       if service.toCompareString() in self.blacklist:
+                       if service in self.blacklist:
                                self.deleteBlacklistService(service)
                print "whitelist:", self.whitelist
                print "blacklist:", self.blacklist
 
-       def getProtectionLevel(self, serviceref):
-               service = serviceref.toCompareString()
+       def getProtectionLevel(self, service):
                if (config.ParentalControl.type.value == "whitelist" and service not in self.whitelist) or (config.ParentalControl.type.value == "blacklist" and service in self.blacklist):
                        if self.serviceLevel.has_key(service):
                                return self.serviceLevel[service]

diff --git a/lib/python/Screens/ParentalControlSetup.py b/lib/python/Screens/ParentalControlSetup.py
index 77d592d88cd6f099f24f2355cfa86a70b37a2b1c..a8fdcc5fb5f67282d6fdc9d2db7af2c51fa6bd1f 100644 (file)
--- a/lib/python/Screens/ParentalControlSetup.py
+++ b/lib/python/Screens/ParentalControlSetup.py
@@ -170,9 +170,9 @@ class ParentalControlEditor(Screen):
                
                list = serviceHandler.list(self.root)
                if list is not None:
-                       services = list.getContent("CRN", True) #(servicecomparestring, eServiceRef, name)
+                       services = list.getContent("CN", True) #(servicecomparestring, name)
                        for s in services:
-                               key = s[2].lower()[0]
+                               key = s[1].lower()[0]
                                if key < 'a' or key > 'z':
                                        key = '&'
                                #key = str(key)
@@ -201,7 +201,7 @@ class ParentalControlEditor(Screen):
                        self.currentLetter = result[1]
                        self.list = []
                        for x in self.servicesList[result[1]]:
-                               self.list.append(ParentalControlEntryComponent(x[1], x[2], parentalControl.getProtectionLevel(x[1]) != -1))
+                               self.list.append(ParentalControlEntryComponent(x[0], x[1], parentalControl.getProtectionLevel(x[0]) != -1))
                        self.servicelist.setList(self.list)                     
 
 class ParentalControlChangePin(Screen, ConfigListScreen, ProtectedScreen):