diff options
| author | Ben Chan <benchan@chromium.org> | 2017-09-16 15:17:35 +0800 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-09-18 20:25:28 -0700 |
| commit | cb23ba7cba9fd92f6f03b635b90271fd32f77477 (patch) | |
| tree | 7c45096ad67feb9c4aedb564aa2882c27f2c9073 | |
| parent | 3fdfe5e3aba232f3cdb5f623e674b8a57509e663 (diff) | |
option: port modem_3gpp_enable_unsolicited_events to use GTask
| -rw-r--r-- | plugins/option/mm-broadband-modem-option.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/plugins/option/mm-broadband-modem-option.c b/plugins/option/mm-broadband-modem-option.c index f9c09581..eac47201 100644 --- a/plugins/option/mm-broadband-modem-option.c +++ b/plugins/option/mm-broadband-modem-option.c @@ -952,23 +952,23 @@ modem_3gpp_enable_unsolicited_events_finish (MMIfaceModem3gpp *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 own_enable_unsolicited_events_ready (MMBaseModem *self, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { GError *error = NULL; mm_base_modem_at_sequence_full_finish (self, res, NULL, &error); if (error) - g_simple_async_result_take_error (simple, error); + g_task_return_error (task, error); else - 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 const MMBaseModemAtCommand unsolicited_enable_sequence[] = { @@ -982,14 +982,13 @@ static const MMBaseModemAtCommand unsolicited_enable_sequence[] = { static void parent_enable_unsolicited_events_ready (MMIfaceModem3gpp *self, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { GError *error = NULL; if (!iface_modem_3gpp_parent->enable_unsolicited_events_finish (self, res, &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); } /* Our own enable now */ @@ -1001,7 +1000,7 @@ parent_enable_unsolicited_events_ready (MMIfaceModem3gpp *self, NULL, /* response_processor_context_free */ NULL, /* cancellable */ (GAsyncReadyCallback)own_enable_unsolicited_events_ready, - simple); + task); } static void @@ -1009,18 +1008,11 @@ modem_3gpp_enable_unsolicited_events (MMIfaceModem3gpp *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; - - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_3gpp_enable_unsolicited_events); - /* Chain up parent's enable */ iface_modem_3gpp_parent->enable_unsolicited_events ( self, (GAsyncReadyCallback)parent_enable_unsolicited_events_ready, - result); + g_task_new (self, NULL, callback, user_data)); } /*****************************************************************************/ |