From e54f7eaf8ac1d9d57be2d8e07e47f02a05745e00 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Tue, 14 Jan 2020 14:41:08 +0000
Subject: [PATCH] malcontent-control: Ignore a harmless error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a backport of
https://github.com/endlessm/gnome-control-center/pull/205 from Endless’
gnome-control-center fork, applied there after the code was copied over
here.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
 malcontent-control/user-controls.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/malcontent-control/user-controls.c b/malcontent-control/user-controls.c
index 3fd235d..8ac0c9f 100644
--- a/malcontent-control/user-controls.c
+++ b/malcontent-control/user-controls.c
@@ -329,9 +329,26 @@ update_app_filter (MctUserControls *self)
 
   if (error)
     {
-      g_warning ("Error retrieving app filter for user '%s': %s",
-                  act_user_get_user_name (self->user),
-                  error->message);
+      /* It's expected that a non-admin user can't read another user's parental
+       * controls info unless the panel has been unlocked; ignore such an
+       * error.
+       */
+      if (act_user_get_uid (self->user) != getuid () &&
+          self->permission != NULL &&
+          !g_permission_get_allowed (self->permission) &&
+          g_error_matches (error, MCT_APP_FILTER_ERROR, MCT_APP_FILTER_ERROR_PERMISSION_DENIED))
+        {
+          g_clear_error (&error);
+          g_debug ("Not enough permissions to retrieve app filter for user '%s'",
+                   act_user_get_user_name (self->user));
+        }
+      else
+        {
+          g_warning ("Error retrieving app filter for user '%s': %s",
+                     act_user_get_user_name (self->user),
+                     error->message);
+        }
+
       return;
     }