From ce804e4009e25cdb1226c006c41b7edfaab56e06 Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Fri, 8 Oct 2010 13:42:52 +0200
Subject: fixes bug #592 don't activate the parental control setup protection
 if no pin is set

---
 data/startwizard.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/startwizard.xml b/data/startwizard.xml
index 70a6e0dc..47d39e1e 100644
--- 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()
-- 
cgit v1.2.3


From 8e5d9f980781cf53d82f11f774a6987e8012e6d8 Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Fri, 8 Oct 2010 13:57:08 +0200
Subject: refs bug #592 "pin" => "PIN"

---
 data/startwizard.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/startwizard.xml b/data/startwizard.xml
index 47d39e1e..a6b773e1 100644
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -142,7 +142,7 @@ config.ParentalControl.configured.save()
 			</code>
 		</step>
 		<step id="parentalsetup">
-			<text value="You need to set a pin code and hide it from your children.\n\nDo you want to set the pin now?" />
+			<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="warnpin" />
@@ -154,7 +154,7 @@ if self["list"].index == 0:
 			</code>
 		</step>
 		<step id="warnpin">
-			<text value="Please be aware, that anyone can disable the parental control, if you have not set a pin." />
+			<text value="Please be aware, that anyone can disable the parental control, if you have not set a PIN." />
 		</step>
 		<step id="finishparentalsetup">
 			<code>
-- 
cgit v1.2.3