remove currently unimplemented feature from parental control menu (remembering pin...
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 13 Oct 2006 11:30:52 +0000 (11:30 +0000)
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>
Fri, 13 Oct 2006 11:30:52 +0000 (11:30 +0000)
fix bluescreen when removing a service from parental control protection in the channel selection screen context menu

lib/python/Screens/ChannelSelection.py
lib/python/Screens/ParentalControlSetup.py

index 756bd83..ff2928e 100644 (file)
@@ -79,7 +79,7 @@ class ChannelContextMenu(Screen):
                        if not inBouquetRootList:
                                if (csel.getCurrentSelection().flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory:
                                        if config.ParentalControl.configured.value:
                        if not inBouquetRootList:
                                if (csel.getCurrentSelection().flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory:
                                        if config.ParentalControl.configured.value:
-                                               if parentalControl.getProtectionLevel(csel.getCurrentSelection()) == -1:
+                                               if parentalControl.getProtectionLevel(csel.getCurrentSelection().toCompareString()) == -1:
                                                        menu.append((_("add to parental protection"), boundFunction(self.addParentalProtection, csel.getCurrentSelection())))
                                                else:
                                                        menu.append((_("remove from parental protection"), boundFunction(self.removeParentalProtection, csel.getCurrentSelection())))
                                                        menu.append((_("add to parental protection"), boundFunction(self.addParentalProtection, csel.getCurrentSelection())))
                                                else:
                                                        menu.append((_("remove from parental protection"), boundFunction(self.removeParentalProtection, csel.getCurrentSelection())))
@@ -143,10 +143,10 @@ class ChannelContextMenu(Screen):
                self.close()
 
        def removeParentalProtection(self, service):
                self.close()
 
        def removeParentalProtection(self, service):
-               self.session.openWithCallback(boundFunction(self.pinEntered, service.toCompareString()), PinInput, pinList = [config.ParentalControl.servicepin[0].value], title = _("Enter the service pin"), windowTitle = _("Change pin code"))
+               self.session.openWithCallback(boundFunction(self.pinEntered, service.toCompareString()), PinInput, pinList = [config.ParentalControl.servicepin[0].value], triesEntry = config.ParentalControl.retries.servicepin, title = _("Enter the service pin"), windowTitle = _("Change pin code"))
 
        def pinEntered(self, service, result):
 
        def pinEntered(self, service, result):
-               if result[0]:
+               if result:
                        parentalControl.unProtectService(service)
                        self.close()
                else:
                        parentalControl.unProtectService(service)
                        self.close()
                else:
index d491195..db1a0be 100644 (file)
@@ -78,7 +78,7 @@ class ParentalControlSetup(Screen, ConfigListScreen, ProtectedScreen):
                                elif config.ParentalControl.mode.value == "simple":     
                                        self.changePin = getConfigListEntry(_("Change service pin"), NoSave(ConfigNothing()))
                                        self.list.append(self.changePin)
                                elif config.ParentalControl.mode.value == "simple":     
                                        self.changePin = getConfigListEntry(_("Change service pin"), NoSave(ConfigNothing()))
                                        self.list.append(self.changePin)
-                               self.list.append(getConfigListEntry(_("Remember service pin"), config.ParentalControl.storeservicepin)) 
+                               #self.list.append(getConfigListEntry(_("Remember service pin"), config.ParentalControl.storeservicepin))        
                                self.editListEntry = getConfigListEntry(_("Edit services list"), NoSave(ConfigNothing()))
                                self.list.append(self.editListEntry)
                                
                                self.editListEntry = getConfigListEntry(_("Edit services list"), NoSave(ConfigNothing()))
                                self.list.append(self.editListEntry)