diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-30 16:24:44 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-10-30 16:24:44 +0200 |
| commit | ce04d0a5ab2368187fa4e74179de4c3361011988 (patch) | |
| tree | 20a18998f11b548f2a9eaec45ac544f63ac4fd16 /lib/python/Components | |
| parent | ad51c4ff74ebc0e5c58d7d96676f0b641e6a0799 (diff) | |
| parent | bc87ed9e2cbfa1a5667ac583bdace946ffff9ae0 (diff) | |
| download | enigma2-ce04d0a5ab2368187fa4e74179de4c3361011988.tar.gz enigma2-ce04d0a5ab2368187fa4e74179de4c3361011988.zip | |
Merge branch 'bug_607_parental_control_fix' into experimental
Diffstat (limited to 'lib/python/Components')
| -rw-r--r-- | lib/python/Components/ParentalControl.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/python/Components/ParentalControl.py b/lib/python/Components/ParentalControl.py index 63b5ccfb..d320c9cd 100644 --- a/lib/python/Components/ParentalControl.py +++ b/lib/python/Components/ParentalControl.py @@ -20,7 +20,11 @@ IMG_WHITEBOUQUET = LIST_WHITELIST + "-" + TYPE_BOUQUET IMG_BLACKSERVICE = LIST_BLACKLIST + "-" + TYPE_SERVICE IMG_BLACKBOUQUET = LIST_BLACKLIST + "-" + TYPE_BOUQUET +parentalControl = None + def InitParentalControl(): + global parentalControl + parentalControl = ParentalControl() config.ParentalControl = ConfigSubsection() config.ParentalControl.configured = ConfigYesNo(default = False) config.ParentalControl.mode = ConfigSelection(default = "simple", choices = [("simple", _("simple")), ("complex", _("complex"))]) @@ -320,4 +324,3 @@ class ParentalControl: self.openListFromFile(LIST_BLACKLIST) self.openListFromFile(LIST_WHITELIST) -parentalControl = ParentalControl() |