From ceb13f525194d9fa70a9f6d71f5825034a8d96c1 Mon Sep 17 00:00:00 2001 From: Ben Chan Date: Wed, 5 Jul 2017 17:32:50 -0700 Subject: broadband-modem: port enable_location_gathering to use GTask --- src/mm-broadband-modem.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 6f90030e..fc2a26d6 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -8306,7 +8306,7 @@ enable_location_gathering_finish (MMIfaceModemLocation *self, GAsyncResult *res, GError **error) { - return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); + return g_task_propagate_boolean (G_TASK (res), error); } static void @@ -8315,12 +8315,7 @@ enable_location_gathering (MMIfaceModemLocation *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; - - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - enable_location_gathering); + GTask *task; /* 3GPP modems need to re-run registration checks when enabling the 3GPP * location source, so that we get up to date LAC/CI location information. @@ -8337,9 +8332,9 @@ enable_location_gathering (MMIfaceModemLocation *self, } /* Done we are */ - g_simple_async_result_set_op_res_gboolean (result, TRUE); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + task = g_task_new (self, NULL, callback, user_data); + g_task_return_boolean (task, TRUE); + g_object_unref (task); } /*****************************************************************************/ -- cgit v1.2.3-70-g09d2