diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-10 16:16:49 -0700 |
|---|---|---|
| committer | Ben Chan <benchan@chromium.org> | 2017-07-11 10:30:39 -0700 |
| commit | cc71743e26131355c148a0848449edf5b5617714 (patch) | |
| tree | 035c9c3ef58b00d074638f84e66d0ec743007b56 /src | |
| parent | 5b0b3f326e363ed4a058427896950ba5b70225b6 (diff) | |
broadband-modem-mbim: port modem_3gpp_load_imei to use GTask
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-broadband-modem-mbim.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c index 583ec81f..b4b42fb2 100644 --- a/src/mm-broadband-modem-mbim.c +++ b/src/mm-broadband-modem-mbim.c @@ -1664,10 +1664,7 @@ modem_3gpp_load_imei_finish (MMIfaceModem3gpp *self, GAsyncResult *res, GError **error) { - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) - return NULL; - - return g_strdup (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res))); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -1676,24 +1673,19 @@ modem_3gpp_load_imei (MMIfaceModem3gpp *_self, gpointer user_data) { MMBroadbandModemMbim *self = MM_BROADBAND_MODEM_MBIM (_self); - GSimpleAsyncResult *result; - - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_3gpp_load_imei); + GTask *task; + task = g_task_new (self, NULL, callback, user_data); if (self->priv->caps_device_id) - g_simple_async_result_set_op_res_gpointer (result, - self->priv->caps_device_id, - NULL); + g_task_return_pointer (task, + g_strdup (self->priv->caps_device_id), + g_free); else - g_simple_async_result_set_error (result, - MM_CORE_ERROR, - MM_CORE_ERROR_FAILED, - "Device doesn't report a valid IMEI"); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + g_task_return_new_error (task, + MM_CORE_ERROR, + MM_CORE_ERROR_FAILED, + "Device doesn't report a valid IMEI"); + g_object_unref (task); } /*****************************************************************************/ |