diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-10 15:57:44 -0700 |
|---|---|---|
| committer | Ben Chan <benchan@chromium.org> | 2017-07-11 10:30:39 -0700 |
| commit | 43aaa92ee1959dadd150ceb01624655d87876628 (patch) | |
| tree | 4f4f89ccbc015764f212ced2461e57fff42bc720 | |
| parent | fb9c758f050ab004f993aee48f9f5395d8699b46 (diff) | |
broadband-modem-mbim: port modem_load_equipment_identifier to use GTask
| -rw-r--r-- | src/mm-broadband-modem-mbim.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c index c3deb30a..bb9392a7 100644 --- a/src/mm-broadband-modem-mbim.c +++ b/src/mm-broadband-modem-mbim.c @@ -326,30 +326,28 @@ modem_load_equipment_identifier_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { - if (MM_BROADBAND_MODEM_MBIM (self)->priv->caps_device_id) - return g_strdup (MM_BROADBAND_MODEM_MBIM (self)->priv->caps_device_id); - - g_set_error (error, - MM_CORE_ERROR, - MM_CORE_ERROR_FAILED, - "Device ID not given in device capabilities"); - return NULL; + return g_task_propagate_pointer (G_TASK (res), error); } static void -modem_load_equipment_identifier (MMIfaceModem *self, +modem_load_equipment_identifier (MMIfaceModem *_self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + MMBroadbandModemMbim *self = MM_BROADBAND_MODEM_MBIM (_self); + GTask *task; - /* Just complete */ - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_load_equipment_identifier); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + task = g_task_new (self, NULL, callback, user_data); + if (self->priv->caps_device_id) + g_task_return_pointer (task, + g_strdup (self->priv->caps_device_id), + g_free); + else + g_task_return_new_error (task, + MM_CORE_ERROR, + MM_CORE_ERROR_FAILED, + "Device ID not given in device capabilities"); + g_object_unref (task); } /*****************************************************************************/ |