diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-12 13:25:32 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-18 10:42:17 +0200 |
| commit | c29cd5eb4e027c5052160be6111be9bae93a98df (patch) | |
| tree | 6c4349ea11e983a91c5c18742e86967be351334b /src/mm-broadband-modem.c | |
| parent | ed0c91b71b27c78caaeaff1a0a4daff2c2b94d1f (diff) | |
broadband-modem: port modem_messaging_check_support to use GTask
Diffstat (limited to 'src/mm-broadband-modem.c')
| -rw-r--r-- | src/mm-broadband-modem.c | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index fe9e5498..9a6c3da7 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -5269,28 +5269,26 @@ modem_messaging_check_support_finish (MMIfaceModemMessaging *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 cnmi_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; } /* CNMI command is supported; assume we have full messaging 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 @@ -5298,22 +5296,18 @@ modem_messaging_check_support (MMIfaceModemMessaging *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + GTask *task; - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_messaging_check_support); + task = g_task_new (self, NULL, callback, user_data); /* We assume that CDMA-only modems don't have messaging capabilities */ if (mm_iface_modem_is_cdma_only (MM_IFACE_MODEM (self))) { - g_simple_async_result_set_error ( - result, + g_task_return_new_error ( + task, MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED, "CDMA-only modems don't have messaging capabilities"); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + g_object_unref (task); return; } @@ -5323,7 +5317,7 @@ modem_messaging_check_support (MMIfaceModemMessaging *self, 3, TRUE, (GAsyncReadyCallback)cnmi_format_check_ready, - result); + task); } /*****************************************************************************/ |