diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-02 20:57:22 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-02 20:57:22 +0100 |
| commit | 00d4f213c39e0ddffa2d0353af8cf65e77f8f709 (patch) | |
| tree | 10046b9b6abb7fa5f5d6e63097fa1b6ffb7bced1 /lib/python | |
| parent | 6ffeb78ed56b36199450bc8dc585c98f7234e600 (diff) | |
| parent | 3c14624fb6631feb91ac28c102027fb9bbc79b7a (diff) | |
| download | enigma2-00d4f213c39e0ddffa2d0353af8cf65e77f8f709.tar.gz enigma2-00d4f213c39e0ddffa2d0353af8cf65e77f8f709.zip | |
Merge branch 'bug_607_parental_control_fix' into experimental
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Screens/ChannelSelection.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index c872bce9..34316f01 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -76,7 +76,7 @@ def append_when_current_valid(current, menu, args, level = 0, key = ""): class ChannelContextMenu(Screen): def __init__(self, session, csel): - from Components.ParentalControl import parentalControl + Screen.__init__(self, session) #raise Exception("we need a better summary screen here") self.csel = csel @@ -106,6 +106,7 @@ class ChannelContextMenu(Screen): isPlayable = not (current_sel_flags & (eServiceReference.isMarker|eServiceReference.isDirectory)) if isPlayable: if config.ParentalControl.configured.value: + from Components.ParentalControl import parentalControl if parentalControl.getProtectionLevel(csel.getCurrentSelection().toCompareString()) == -1: append_when_current_valid(current, menu, (_("add to parental protection"), boundFunction(self.addParentalProtection, csel.getCurrentSelection())), level = 0) else: @@ -191,6 +192,7 @@ class ChannelContextMenu(Screen): self.close() def addParentalProtection(self, service): + from Components.ParentalControl import parentalControl parentalControl.protectService(service.toCompareString()) self.close() @@ -199,6 +201,7 @@ class ChannelContextMenu(Screen): def pinEntered(self, service, result): if result: + from Components.ParentalControl import parentalControl parentalControl.unProtectService(service) self.close() else: |