From cbc9b9334889eb0062cca50e3f9c8801fa4ff916 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Tue, 17 Mar 2020 17:30:49 +0000
Subject: [PATCH 1/2] malcontent-control: Tweak polkit label wording
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When malcontent-control is run as an unprivileged user (i.e. a child)
the fact that the unlock wording refers to ‘other users’ is a little
confusing, since the purpose of running malcontent-control was likely to
edit the parental controls for *this* user.

Adjust the wording to make this a little clearer.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
 malcontent-control/main.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/malcontent-control/main.ui b/malcontent-control/main.ui
index 7c6af80..ba51e2c 100644
--- a/malcontent-control/main.ui
+++ b/malcontent-control/main.ui
@@ -78,7 +78,7 @@
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Permission is required to view and change parental controls settings for other users.</property>
+                    <property name="label" translatable="yes">Permission is required to view and change user parental controls settings.</property>
                     <property name="wrap">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject">

From 4481cf12712e059c8b635d20d52e9a0891c556ee Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Tue, 17 Mar 2020 17:31:53 +0000
Subject: [PATCH 2/2] malcontent-control: Imply all app-filter polkit
 permissions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When unlocking malcontent-control while running as an unprivileged user
to edit *that* user’s parental controls, the `ChangeOwn` and `ReadOwn`
privileges should also be granted.

Otherwise a second polkit authorisation dialogue is popped up after
editing any of the parental controls, to get permission to save the
changes.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
 malcontent-control/org.freedesktop.MalcontentControl.policy.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/malcontent-control/org.freedesktop.MalcontentControl.policy.in b/malcontent-control/org.freedesktop.MalcontentControl.policy.in
index b2a93ac..c60dba5 100644
--- a/malcontent-control/org.freedesktop.MalcontentControl.policy.in
+++ b/malcontent-control/org.freedesktop.MalcontentControl.policy.in
@@ -13,6 +13,6 @@
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>
     </defaults>
-    <annotate key="org.freedesktop.policykit.imply">com.endlessm.ParentalControls.AppFilter.ReadAny com.endlessm.ParentalControls.AppFilter.ChangeAny</annotate>
+    <annotate key="org.freedesktop.policykit.imply">com.endlessm.ParentalControls.AppFilter.ReadAny com.endlessm.ParentalControls.AppFilter.ChangeAny com.endlessm.ParentalControls.AppFilter.ReadOwn com.endlessm.ParentalControls.AppFilter.ChangeOwn</annotate>
   </action>
 </policyconfig>