diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-12 13:21:28 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-18 10:42:17 +0200 |
| commit | 17dff1f6696fe50a4a6cc99c4e5f73ad667b8d42 (patch) | |
| tree | cc254564b2027393a65d4c5ab9ea5bcbe0e9f691 | |
| parent | 03977eb501aa05cb5e3fc410a50aa7be2741f048 (diff) | |
broadband-modem: port modem_3gpp_ussd_check_support to use GTask
| -rw-r--r-- | src/mm-broadband-modem.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index c1368aae..aecc9f2a 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -5205,27 +5205,25 @@ modem_3gpp_ussd_check_support_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 cusd_format_check_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_simple_async_result_complete (simple); - g_object_unref (simple); + g_task_return_error (task, error); + g_object_unref (task); return; } - 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 @@ -5233,12 +5231,9 @@ modem_3gpp_ussd_check_support (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_check_support); + task = g_task_new (self, NULL, callback, user_data); /* Check USSD support */ mm_base_modem_at_command (MM_BASE_MODEM (self), @@ -5246,7 +5241,7 @@ modem_3gpp_ussd_check_support (MMIfaceModem3gppUssd *self, 3, TRUE, (GAsyncReadyCallback)cusd_format_check_ready, - result); + task); } /*****************************************************************************/ |