diff options
| author | Ben Chan <benchan@chromium.org> | 2017-09-12 04:04:33 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-09-13 16:36:49 +0200 |
| commit | 18a55f6940e068e52db8e766cccd97545f7205e3 (patch) | |
| tree | af49d3b0df3aa65e90f41825e562a0926c096af5 | |
| parent | d6bd83e5cfc0fe684cf96f254415fe7458860a24 (diff) | |
icera: port modem_power_up to use GTask
| -rw-r--r-- | plugins/icera/mm-broadband-modem-icera.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/plugins/icera/mm-broadband-modem-icera.c b/plugins/icera/mm-broadband-modem-icera.c index 7b4fe97c..dff73a8e 100644 --- a/plugins/icera/mm-broadband-modem-icera.c +++ b/plugins/icera/mm-broadband-modem-icera.c @@ -942,13 +942,13 @@ modem_power_up_finish (MMIfaceModem *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 cfun_enable_ready (MMBaseModem *self, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { GError *error = NULL; @@ -957,13 +957,14 @@ cfun_enable_ready (MMBaseModem *self, if (g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_NOT_ALLOWED)) - g_simple_async_result_take_error (simple, error); - else + g_task_return_error (task, error); + else { g_error_free (error); + g_task_return_boolean (task, TRUE); + } } - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_object_unref (task); } static void @@ -971,19 +972,12 @@ modem_power_up (MMIfaceModem *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; - - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_power_up); - mm_base_modem_at_command (MM_BASE_MODEM (self), "+CFUN=1", 10, FALSE, (GAsyncReadyCallback)cfun_enable_ready, - result); + g_task_new (self, NULL, callback, user_data)); } /*****************************************************************************/ |