diff options
| author | Ben Chan <benchan@chromium.org> | 2018-04-28 15:52:52 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2018-06-02 17:57:00 +0200 |
| commit | 456a09c6551f21a92441fcd69a48718a08f1324c (patch) | |
| tree | 08265c108e4e14a4574216f18e27c74406404f43 | |
| parent | ce7b3a7bb0911bc51472df3302be64365939ab48 (diff) | |
broadband-modem-qmi: port oma_cancel_session to use GTask
| -rw-r--r-- | src/mm-broadband-modem-qmi.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index dc9343b0..5663a525 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -9431,28 +9431,27 @@ oma_cancel_session_finish (MMIfaceModemOma *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 oma_cancel_session_ready (QmiClientOma *client, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { QmiMessageOmaCancelSessionOutput *output; GError *error = NULL; output = qmi_client_oma_cancel_session_finish (client, res, &error); if (!output || !qmi_message_oma_cancel_session_output_get_result (output, &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_task_return_boolean (task, TRUE); + + g_object_unref (task); if (output) qmi_message_oma_cancel_session_output_unref (output); - - g_simple_async_result_complete (simple); - g_object_unref (simple); } static void @@ -9462,7 +9461,7 @@ oma_cancel_session (MMIfaceModemOma *self, { QmiClient *client = NULL; - if (!ensure_qmi_client (MM_BROADBAND_MODEM_QMI (self), + if (!assure_qmi_client (MM_BROADBAND_MODEM_QMI (self), QMI_SERVICE_OMA, &client, callback, user_data)) return; @@ -9473,10 +9472,7 @@ oma_cancel_session (MMIfaceModemOma *self, 5, NULL, (GAsyncReadyCallback)oma_cancel_session_ready, - g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - oma_cancel_session)); + g_task_new (self, NULL, callback, user_data)); } /*****************************************************************************/ |