diff options
| author | Ben Chan <benchan@chromium.org> | 2018-05-01 17:40:14 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2018-06-02 17:56:59 +0200 |
| commit | 8ad01d31accf4446c49a7edd5f1e2ca14ff37374 (patch) | |
| tree | b7654f2f2854a47022d62f465f93cdb96384982f | |
| parent | df0d2f955255fd7249efb68165b6e208768337af (diff) | |
| download | ModemManager-8ad01d31accf4446c49a7edd5f1e2ca14ff37374.tar.gz | |
broadband-modem-qmi: port common_setup_cleanup_unsolicited_registration_events to use GTask
| -rw-r--r-- | src/mm-broadband-modem-qmi.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index 27aba290d..78780e6c6 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -6353,7 +6353,7 @@ common_setup_cleanup_unsolicited_registration_events_finish (MMBroadbandModemQmi 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); } #if defined WITH_NEWEST_QMI_COMMANDS @@ -6384,25 +6384,21 @@ common_setup_cleanup_unsolicited_registration_events (MMBroadbandModemQmi *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + GTask *task; QmiClient *client = NULL; - if (!ensure_qmi_client (MM_BROADBAND_MODEM_QMI (self), + if (!assure_qmi_client (MM_BROADBAND_MODEM_QMI (self), QMI_SERVICE_NAS, &client, callback, user_data)) return; - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - common_setup_cleanup_unsolicited_registration_events); + task = g_task_new (self, NULL, callback, user_data); if (enable == self->priv->unsolicited_registration_events_setup) { mm_dbg ("Unsolicited registration events already %s; skipping", enable ? "setup" : "cleanup"); - g_simple_async_result_set_op_res_gboolean (result, TRUE); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + g_task_return_boolean (task, TRUE); + g_object_unref (task); return; } @@ -6443,9 +6439,8 @@ common_setup_cleanup_unsolicited_registration_events (MMBroadbandModemQmi *self, } } - g_simple_async_result_set_op_res_gboolean (result, TRUE); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + g_task_return_boolean (task, TRUE); + g_object_unref (task); } /*****************************************************************************/ |