aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBen Chan <benchan@chromium.org>2017-07-11 14:05:39 -0700
committerAleksander Morgado <aleksander@aleksander.es>2017-10-20 17:20:23 +0200
commitaf2f87d2f2471f532aa4586d9243b622ee6434cf (patch)
treea6f9650ca221b86d2641dd93f63372261d3d3682 /src
parent02fadb6e914030a34935af3cc5d4192f35fb5a81 (diff)
broadband-modem-qmi: port firmware_load_current to use GTask
Diffstat (limited to 'src')
-rw-r--r--src/mm-broadband-modem-qmi.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index d65f92b1..67a7f33a 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -10444,7 +10444,7 @@ firmware_load_current_finish (MMIfaceModemFirmware *self,
GAsyncResult *res,
GError **error)
{
- return (MMFirmwareProperties *)g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
+ return g_task_propagate_pointer (G_TASK (res), error);
}
static void
@@ -10453,20 +10453,14 @@ firmware_load_current (MMIfaceModemFirmware *_self,
gpointer user_data)
{
MMBroadbandModemQmi *self = MM_BROADBAND_MODEM_QMI (_self);
- GSimpleAsyncResult *result;
-
- result = g_simple_async_result_new (G_OBJECT (self),
- callback,
- user_data,
- firmware_load_current);
+ GTask *task;
- /* We'll return the reference we create here */
- g_simple_async_result_set_op_res_gpointer (
- result,
+ task = g_task_new (self, NULL, callback, user_data);
+ g_task_return_pointer (
+ task,
self->priv->current_firmware ? g_object_ref (self->priv->current_firmware) : NULL,
- NULL);
- g_simple_async_result_complete_in_idle (result);
- g_object_unref (result);
+ g_object_unref);
+ g_object_unref (task);
}
/*****************************************************************************/