diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-12 13:20:12 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-18 10:42:17 +0200 |
| commit | 03977eb501aa05cb5e3fc410a50aa7be2741f048 (patch) | |
| tree | 3c52f8c281d9d51eba03388d2cedfc636d43cbea | |
| parent | 249f880c3c8ee71983b776c4453b1527cdab39ec (diff) | |
broadband-modem: port modem_3gpp_ussd_{enable,disable}_unsolicited_result_codes to use GTask
| -rw-r--r-- | src/mm-broadband-modem.c | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index af3f39ae..c1368aae 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -5142,27 +5142,25 @@ modem_3gpp_ussd_enable_disable_unsolicited_result_codes_finish (MMIfaceModem3gpp 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 urc_enable_disable_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 @@ -5170,19 +5168,16 @@ modem_3gpp_ussd_disable_unsolicited_result_codes (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_disable_unsolicited_result_codes); + task = g_task_new (self, NULL, callback, user_data); mm_base_modem_at_command (MM_BASE_MODEM (self), "+CUSD=0", 3, TRUE, (GAsyncReadyCallback)urc_enable_disable_ready, - result); + task); } static void @@ -5190,19 +5185,16 @@ modem_3gpp_ussd_enable_unsolicited_result_codes (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_enable_unsolicited_result_codes); + task = g_task_new (self, NULL, callback, user_data); mm_base_modem_at_command (MM_BASE_MODEM (self), "+CUSD=1", 3, TRUE, (GAsyncReadyCallback)urc_enable_disable_ready, - result); + task); } /*****************************************************************************/ |