From 72812d27094e3593973cc292bddfcdb143840aab Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Wed, 31 Oct 2018 11:04:40 +0000
Subject: [PATCH] eos-parental-controls-client: Use synchronous methods

This should not introduce any functional changes, but does simplify the
code.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://phabricator.endlessm.com/T24024
---
 .../eos-parental-controls-client.py           | 46 ++-----------------
 1 file changed, 4 insertions(+), 42 deletions(-)

diff --git a/eos-parental-controls-client/eos-parental-controls-client.py b/eos-parental-controls-client/eos-parental-controls-client.py
index cbc6af2..e876276 100644
--- a/eos-parental-controls-client/eos-parental-controls-client.py
+++ b/eos-parental-controls-client/eos-parental-controls-client.py
@@ -37,28 +37,9 @@ def __get_app_filter(user_id, interactive):
 
     If `interactive` is `True`, interactive polkit authorisation dialogues will
     be allowed. An exception will be raised on failure."""
-    app_filter = None
-    exception = None
-
-    def __get_cb(obj, result, user_data):
-        nonlocal app_filter, exception
-        try:
-            app_filter = EosParentalControls.get_app_filter_finish(result)
-        except Exception as e:
-            exception = e
-
-    EosParentalControls.get_app_filter_async(
+    return EosParentalControls.get_app_filter(
         connection=None, user_id=user_id,
-        allow_interactive_authorization=interactive, cancellable=None,
-        callback=__get_cb, user_data=None)
-
-    context = GLib.MainContext.default()
-    while not app_filter and not exception:
-        context.iteration(True)
-
-    if exception:
-        raise exception
-    return app_filter
+        allow_interactive_authorization=interactive, cancellable=None)
 
 
 def __get_app_filter_or_error(user_id, interactive):
@@ -77,28 +58,9 @@ def __set_app_filter(user_id, app_filter, interactive):
 
     If `interactive` is `True`, interactive polkit authorisation dialogues will
     be allowed. An exception will be raised on failure."""
-    finished = False
-    exception = None
-
-    def __set_cb(obj, result, user_data):
-        nonlocal finished, exception
-        try:
-            EosParentalControls.set_app_filter_finish(result)
-            finished = True
-        except Exception as e:
-            exception = e
-
-    EosParentalControls.set_app_filter_async(
+    EosParentalControls.set_app_filter(
         connection=None, user_id=user_id, app_filter=app_filter,
-        allow_interactive_authorization=interactive, cancellable=None,
-        callback=__set_cb, user_data=None)
-
-    context = GLib.MainContext.default()
-    while not finished and not exception:
-        context.iteration(True)
-
-    if exception:
-        raise exception
+        allow_interactive_authorization=interactive, cancellable=None)
 
 
 def __set_app_filter_or_error(user_id, app_filter, interactive):