Merge branch 'papercuts' into 'master'

Fix papercuts when editing parental controls of current user

See merge request pwithnall/malcontent!46
This commit is contained in:
Philip Withnall 2020-03-18 10:00:41 +00:00
commit a617365bba
2 changed files with 2 additions and 2 deletions

View File

@ -78,7 +78,7 @@
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <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> <property name="wrap">True</property>
<child internal-child="accessible"> <child internal-child="accessible">
<object class="AtkObject"> <object class="AtkObject">

View File

@ -13,6 +13,6 @@
<allow_inactive>no</allow_inactive> <allow_inactive>no</allow_inactive>
<allow_active>auth_admin_keep</allow_active> <allow_active>auth_admin_keep</allow_active>
</defaults> </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> </action>
</policyconfig> </policyconfig>