Merge branch 'bug_592_dont_allow_default_parental_control_pin' into experimental

diff --git a/data/startwizard.xml b/data/startwizard.xml
index 70a6e0d..47d39e1 100644 (file)
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -145,7 +145,7 @@ config.ParentalControl.configured.save()
                        <text value="You need to set a pin code and hide it from your children.\n\nDo you want to set the pin now?" />
                        <list>
                                <listentry caption="Yes" step="finishparentalsetup" />
-                               <listentry caption="No" step="finishparentalsetup" />
+                               <listentry caption="No" step="warnpin" />
                        </list>
                        <code pos="after">
 from ParentalControlSetup import ParentalControlChangePin
@@ -153,9 +153,15 @@ if self["list"].index == 0:
        self.session.open(ParentalControlChangePin, config.ParentalControl.servicepin[0], _("parental control pin"))
                        </code>
                </step>
+               <step id="warnpin">
+                       <text value="Please be aware, that anyone can disable the parental control, if you have not set a pin." />
+               </step>
                <step id="finishparentalsetup">
                        <code>
-config.ParentalControl.setuppinactive.value = True
+if config.ParentalControl.setuppin.value == "aaaa":
+       config.ParentalControl.setuppinactive.value = False
+else:
+       config.ParentalControl.setuppinactive.value = True
 config.ParentalControl.setuppinactive.save()
 config.ParentalControl.servicepinactive.value = True
 config.ParentalControl.servicepinactive.save()

diff --git a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
index 37d0988..d3a2edf 100755 (executable)
--- a/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
+++ b/lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
@@ -7,7 +7,7 @@
                     <author>Dream Multimedia</author>
                     <name>GraphMultiEPG</name>
                     <packagename>enigma2-plugin-extensions-graphmultiepg</packagename>
-                    <shortdescription>GraphMultiEPG shows a graphical timeline EPG</shortdescription>
+                   <shortdescription>GraphMultiEPG shows a graphical timeline EPG</shortdescription>
                     <description>GraphMultiEPG shows a graphical timeline EPG.\nShows a nice overview of all running und upcoming tv shows.</description>
                     <screenshot src="http://www.dreamboxupdate.com/preview/plugin_graphmultiepg_en.jpg" />
           </info>