diff options
| author | Ben Chan <benchan@chromium.org> | 2017-09-15 00:42:59 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-09-18 20:39:03 -0700 |
| commit | 509ba7475a1f77bcfa6529c33e845994ff27b49a (patch) | |
| tree | affcebe957c7c4541d7f7178235ce1c28c5f9427 | |
| parent | 26be99b8a710a9ee8bf1c0c49b31c5c9e3e96cb9 (diff) | |
sierra: port setup_registration_checks to use GTask
| -rw-r--r-- | plugins/sierra/mm-broadband-modem-sierra.c | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/plugins/sierra/mm-broadband-modem-sierra.c b/plugins/sierra/mm-broadband-modem-sierra.c index 0af8b2a3..ecd53ddc 100644 --- a/plugins/sierra/mm-broadband-modem-sierra.c +++ b/plugins/sierra/mm-broadband-modem-sierra.c @@ -1202,51 +1202,51 @@ setup_registration_checks_finish (MMIfaceModemCdma *self, { SetupRegistrationChecksResults *results; - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) + results = g_task_propagate_pointer (G_TASK (res), error); + if (!results) return FALSE; - results = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)); *skip_qcdm_call_manager_step = results->skip_qcdm_call_manager_step; *skip_qcdm_hdr_step = results->skip_qcdm_hdr_step; *skip_at_cdma_service_status_step = results->skip_at_cdma_service_status_step; *skip_at_cdma1x_serving_system_step = results->skip_at_cdma1x_serving_system_step; *skip_detailed_registration_state = results->skip_detailed_registration_state; + g_free (results); return TRUE; } static void parent_setup_registration_checks_ready (MMIfaceModemCdma *self, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { GError *error = NULL; - SetupRegistrationChecksResults results = { 0 }; + SetupRegistrationChecksResults *results; + results = g_new0 (SetupRegistrationChecksResults, 1); if (!iface_modem_cdma_parent->setup_registration_checks_finish (self, res, - &results.skip_qcdm_call_manager_step, - &results.skip_qcdm_hdr_step, - &results.skip_at_cdma_service_status_step, - &results.skip_at_cdma1x_serving_system_step, - &results.skip_detailed_registration_state, + &results->skip_qcdm_call_manager_step, + &results->skip_qcdm_hdr_step, + &results->skip_at_cdma_service_status_step, + &results->skip_at_cdma1x_serving_system_step, + &results->skip_detailed_registration_state, &error)) { - g_simple_async_result_take_error (simple, error); + g_task_return_error (task, error); + g_free (results); } else { /* Skip +CSS */ - results.skip_at_cdma1x_serving_system_step = TRUE; + results->skip_at_cdma1x_serving_system_step = TRUE; /* Skip +CAD */ - results.skip_at_cdma_service_status_step = TRUE; + results->skip_at_cdma_service_status_step = TRUE; /* Force to always use the detailed registration checks, as we have * !STATUS for that */ - results.skip_detailed_registration_state = FALSE; + results->skip_detailed_registration_state = FALSE; - g_simple_async_result_set_op_res_gpointer (simple, &results, NULL); + g_task_return_pointer (task, results, g_free); } - - /* All done. NOTE: complete NOT in idle! */ - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_object_unref (task); } static void @@ -1254,17 +1254,14 @@ setup_registration_checks (MMIfaceModemCdma *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + GTask *task; - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - setup_registration_checks); + task = g_task_new (self, NULL, callback, user_data); /* Run parent's checks first */ iface_modem_cdma_parent->setup_registration_checks (self, (GAsyncReadyCallback)parent_setup_registration_checks_ready, - result); + task); } /*****************************************************************************/ |