diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-12 13:14:54 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-18 10:42:17 +0200 |
| commit | 5ccefe30c36cfbbf7856ac5395102b585d3fc782 (patch) | |
| tree | ffd7fd8c8af5b798f0390f5f4fcc163a0f2ce279 /src | |
| parent | 17dff1f6696fe50a4a6cc99c4e5f73ad667b8d42 (diff) | |
broadband-modem: port modem_3gpp_ussd_cancel to use GTask
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-broadband-modem.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index aecc9f2a..31ea06e0 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -4577,23 +4577,22 @@ modem_3gpp_ussd_cancel_finish (MMIfaceModem3gppUssd *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 cancel_command_ready (MMBroadbandModem *self, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { GError *error = NULL; mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); if (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); /* Complete the pending action, if any */ if (self->priv->pending_ussd_action) { @@ -4615,19 +4614,16 @@ modem_3gpp_ussd_cancel (MMIfaceModem3gppUssd *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + GTask *task; - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_3gpp_ussd_cancel); + task = g_task_new (self, NULL, callback, user_data); mm_base_modem_at_command (MM_BASE_MODEM (self), "+CUSD=2", 10, TRUE, (GAsyncReadyCallback)cancel_command_ready, - result); + task); } /*****************************************************************************/ |