diff options
| -rw-r--r-- | plugins/cinterion/mm-broadband-modem-cinterion.c | 57 |
1 files changed, 23 insertions, 34 deletions
diff --git a/plugins/cinterion/mm-broadband-modem-cinterion.c b/plugins/cinterion/mm-broadband-modem-cinterion.c index 4f28f042..53f6919a 100644 --- a/plugins/cinterion/mm-broadband-modem-cinterion.c +++ b/plugins/cinterion/mm-broadband-modem-cinterion.c @@ -1147,63 +1147,52 @@ register_in_network (MMIfaceModem3gpp *self, /* Supported bands (Modem interface) */ static GArray * -load_supported_bands_finish (MMIfaceModem *self, - GAsyncResult *res, - GError **error) +load_supported_bands_finish (MMIfaceModem *self, + GAsyncResult *res, + GError **error) { - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) - return NULL; - - return (GArray *) g_array_ref (g_simple_async_result_get_op_res_gpointer ( - G_SIMPLE_ASYNC_RESULT (res))); + return g_task_propagate_pointer (G_TASK (res), error); } static void -scfg_test_ready (MMBaseModem *_self, +scfg_test_ready (MMBaseModem *_self, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { MMBroadbandModemCinterion *self = MM_BROADBAND_MODEM_CINTERION (_self); - const gchar *response; - GError *error = NULL; - GArray *bands; + const gchar *response; + GError *error = NULL; + GArray *bands; response = mm_base_modem_at_command_finish (_self, res, &error); - if (!response) - g_simple_async_result_take_error (simple, error); - else if (!mm_cinterion_parse_scfg_test (response, - mm_broadband_modem_get_current_charset (MM_BROADBAND_MODEM (self)), - &bands, - &error)) - g_simple_async_result_take_error (simple, error); + if (!response || + !mm_cinterion_parse_scfg_test (response, + mm_broadband_modem_get_current_charset (MM_BROADBAND_MODEM (self)), + &bands, + &error)) + g_task_return_error (task, error); else { mm_cinterion_build_band (bands, 0, FALSE, &self->priv->supported_bands, NULL); g_assert (self->priv->supported_bands != 0); - g_simple_async_result_set_op_res_gpointer (simple, bands, (GDestroyNotify)g_array_unref); + g_task_return_pointer (task, bands, (GDestroyNotify)g_array_unref); } - - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_object_unref (task); } static void -load_supported_bands (MMIfaceModem *self, - GAsyncReadyCallback callback, - gpointer user_data) +load_supported_bands (MMIfaceModem *self, + GAsyncReadyCallback callback, + gpointer user_data) { - GSimpleAsyncResult *simple; - - simple = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - load_supported_bands); + GTask *task; + task = g_task_new (self, NULL, callback, user_data); mm_base_modem_at_command (MM_BASE_MODEM (self), "AT^SCFG=?", 3, FALSE, (GAsyncReadyCallback)scfg_test_ready, - simple); + task); } /*****************************************************************************/ |