diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-12 13:27:49 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-18 10:42:17 +0200 |
| commit | c270720e9405fc18158bde847a7f81e885587abf (patch) | |
| tree | fcbb2506380fc89c5f12973ada0c196d67852c66 | |
| parent | 4249792c4e7e83a055ea22da1dc8d14c3afce08b (diff) | |
broadband-modem: port modem_voice_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 0fad25f0..825a7e03 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -6586,28 +6586,26 @@ modem_voice_check_support_finish (MMIfaceModemVoice *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 ath_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; } /* ATH command is supported; assume we have full voice capabilities */ - 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 @@ -6615,12 +6613,9 @@ modem_voice_check_support (MMIfaceModemVoice *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + GTask *task; - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_voice_check_support); + task = g_task_new (self, NULL, callback, user_data); /* We assume that all modems have voice capabilities, but ... */ @@ -6630,7 +6625,7 @@ modem_voice_check_support (MMIfaceModemVoice *self, 3, TRUE, (GAsyncReadyCallback)ath_format_check_ready, - result); + task); } /*****************************************************************************/ |