diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-12 13:10:17 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-18 10:42:17 +0200 |
| commit | ece9b87a67f9d61d2837d68f4879e91dac04ac02 (patch) | |
| tree | 6824fd18349886c9b52de9d20f717f5fd9fb8ac3 | |
| parent | 7ee52bb99aacbce01b5a9998477a4946affb0963 (diff) | |
broadband-modem: port modem_3gpp_setup_unsolicited_registration_events to use GTask
| -rw-r--r-- | src/mm-broadband-modem.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 7093d665..05596a65 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -3715,7 +3715,7 @@ modem_3gpp_setup_unsolicited_registration_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 @@ -3769,16 +3769,11 @@ modem_3gpp_setup_unsolicited_registration_events (MMIfaceModem3gpp *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; MMPortSerialAt *ports[2]; GPtrArray *array; guint i; guint j; - - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_3gpp_setup_unsolicited_registration_events); + GTask *task; ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)); ports[1] = mm_base_modem_peek_port_secondary (MM_BASE_MODEM (self)); @@ -3802,9 +3797,9 @@ modem_3gpp_setup_unsolicited_registration_events (MMIfaceModem3gpp *self, } mm_3gpp_creg_regex_destroy (array); - g_simple_async_result_set_op_res_gboolean (result, TRUE); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + task = g_task_new (self, NULL, callback, user_data); + g_task_return_boolean (task, TRUE); + g_object_unref (task); } /*****************************************************************************/ |