diff options
author | Ben Chan <benchan@chromium.org> | 2018-04-28 16:07:48 -0700 |
---|---|---|
committer | Aleksander Morgado <aleksander@aleksander.es> | 2018-06-02 17:56:59 +0200 |
commit | f330ffdaa993880260ed8c2d48eac5fee5dba11a (patch) | |
tree | 4c878b3ae285882922889eb937ab4dc04408d83d | |
parent | 3455b01b573d51d0cba9cd4c5221bd3b597b9589 (diff) | |
download | ModemManager-f330ffdaa993880260ed8c2d48eac5fee5dba11a.tar.gz |
broadband-modem-qmi: port oma_setup 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 c6c579407..4a8a45af3 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -9230,28 +9230,27 @@ oma_setup_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_set_feature_setting_ready (QmiClientOma *client, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { QmiMessageOmaSetFeatureSettingOutput *output; GError *error = NULL; output = qmi_client_oma_set_feature_setting_finish (client, res, &error); if (!output || !qmi_message_oma_set_feature_setting_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_set_feature_setting_output_unref (output); - - g_simple_async_result_complete (simple); - g_object_unref (simple); } static void @@ -9263,7 +9262,7 @@ oma_setup (MMIfaceModemOma *self, QmiClient *client = NULL; QmiMessageOmaSetFeatureSettingInput *input; - 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; @@ -9288,10 +9287,7 @@ oma_setup (MMIfaceModemOma *self, 5, NULL, (GAsyncReadyCallback)oma_set_feature_setting_ready, - g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - oma_setup)); + g_task_new (self, NULL, callback, user_data)); qmi_message_oma_set_feature_setting_input_unref (input); } |