diff options
| author | Ben Chan <benchan@chromium.org> | 2017-08-01 12:29:13 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-09-08 17:45:29 +0200 |
| commit | 5f641afe07dc878129b17b0ff0e6227d22c00b1c (patch) | |
| tree | 695f6836d2a291166fc28d9e06ad8c7c1124aa64 | |
| parent | 074e0f89fc8d2ced02621477efe90fb228a3734c (diff) | |
huawei: port modem_3gpp_disable_unsolicited_events to use GTask
| -rw-r--r-- | plugins/huawei/mm-broadband-modem-huawei.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c index c5c034ee..bcf2a32f 100644 --- a/plugins/huawei/mm-broadband-modem-huawei.c +++ b/plugins/huawei/mm-broadband-modem-huawei.c @@ -2057,36 +2057,34 @@ modem_3gpp_disable_unsolicited_events_finish (MMIfaceModem3gpp *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 parent_disable_unsolicited_events_ready (MMIfaceModem3gpp *self, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { GError *error = NULL; if (!iface_modem_3gpp_parent->disable_unsolicited_events_finish (self, res, &error)) - g_simple_async_result_take_error (simple, error); + g_task_return_error (task, error); else - g_simple_async_result_set_op_res_gboolean (simple, TRUE); - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_task_return_boolean (task, TRUE); + g_object_unref (task); } static void own_disable_unsolicited_events_ready (MMBaseModem *self, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { GError *error = NULL; mm_base_modem_at_command_full_finish (self, res, &error); if (error) { - g_simple_async_result_take_error (simple, error); - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_task_return_error (task, error); + g_object_unref (task); return; } @@ -2094,7 +2092,7 @@ own_disable_unsolicited_events_ready (MMBaseModem *self, iface_modem_3gpp_parent->disable_unsolicited_events ( MM_IFACE_MODEM_3GPP (self), (GAsyncReadyCallback)parent_disable_unsolicited_events_ready, - simple); + task); } static void @@ -2102,12 +2100,9 @@ modem_3gpp_disable_unsolicited_events (MMIfaceModem3gpp *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + GTask *task; - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_3gpp_disable_unsolicited_events); + task = g_task_new (self, NULL, callback, user_data); /* Our own disable first */ mm_base_modem_at_command_full ( @@ -2119,7 +2114,7 @@ modem_3gpp_disable_unsolicited_events (MMIfaceModem3gpp *self, FALSE, /* raw */ NULL, /* cancellable */ (GAsyncReadyCallback)own_disable_unsolicited_events_ready, - result); + task); } /*****************************************************************************/ |