diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-10-13 11:30:52 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-10-13 11:30:52 +0000 |
| commit | 10222309ef422bc121db5fa25edeac16dccd12f2 (patch) | |
| tree | 00a76bd1d89abefe075d702e14b6ea3529e4a458 /lib/python | |
| parent | af55c6eade1569161bcb04cdbec7586dbedbcd14 (diff) | |
| download | enigma2-10222309ef422bc121db5fa25edeac16dccd12f2.tar.gz enigma2-10222309ef422bc121db5fa25edeac16dccd12f2.zip | |
remove currently unimplemented feature from parental control menu (remembering pin... coming soon)
fix bluescreen when removing a service from parental control protection in the channel selection screen context menu
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Screens/ChannelSelection.py | 6 | ||||
| -rw-r--r-- | lib/python/Screens/ParentalControlSetup.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 756bd836..ff2928ec 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -79,7 +79,7 @@ class ChannelContextMenu(Screen): 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()))) @@ -143,10 +143,10 @@ class ChannelContextMenu(Screen): 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): - if result[0]: + if result: parentalControl.unProtectService(service) self.close() else: diff --git a/lib/python/Screens/ParentalControlSetup.py b/lib/python/Screens/ParentalControlSetup.py index d4911953..db1a0be3 100644 --- a/lib/python/Screens/ParentalControlSetup.py +++ b/lib/python/Screens/ParentalControlSetup.py @@ -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) - 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) |