diff options
| author | Ben Chan <benchan@chromium.org> | 2017-09-16 15:20:46 +0800 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-09-18 20:25:28 -0700 |
| commit | 5ffc3b7a9263a07fd30ad21738afe1a7b357c08f (patch) | |
| tree | 0aec1c848ce1ad1bee83610d2d8f5de95fafed24 | |
| parent | cb23ba7cba9fd92f6f03b635b90271fd32f77477 (diff) | |
option: port modem_3gpp_disable_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 eac47201..d5882352 100644 --- a/plugins/option/mm-broadband-modem-option.c +++ b/plugins/option/mm-broadband-modem-option.c @@ -1023,7 +1023,7 @@ modem_3gpp_disable_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 const MMBaseModemAtCommand unsolicited_disable_sequence[] = { @@ -1037,30 +1037,29 @@ static const MMBaseModemAtCommand unsolicited_disable_sequence[] = { static void parent_disable_unsolicited_events_ready (MMIfaceModem3gpp *self, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { GError *error = NULL; if (!iface_modem_3gpp_parent->disable_unsolicited_events_finish (self, res, &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 void own_disable_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_simple_async_result_complete (simple); - g_object_unref (simple); + g_task_return_error (task, error); + g_object_unref (task); return; } @@ -1068,7 +1067,7 @@ own_disable_unsolicited_events_ready (MMBaseModem *self, iface_modem_3gpp_parent->disable_unsolicited_events ( MM_IFACE_MODEM_3GPP (self), (GAsyncReadyCallback)parent_disable_unsolicited_events_ready, - simple); + task); } static void @@ -1076,13 +1075,6 @@ modem_3gpp_disable_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_disable_unsolicited_events); - /* Our own disable first */ mm_base_modem_at_sequence_full ( MM_BASE_MODEM (self), @@ -1092,7 +1084,7 @@ modem_3gpp_disable_unsolicited_events (MMIfaceModem3gpp *self, NULL, /* response_processor_context_free */ NULL, /* cancellable */ (GAsyncReadyCallback)own_disable_unsolicited_events_ready, - result); + g_task_new (self, NULL, callback, user_data)); } /*****************************************************************************/ |