diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-11 14:01:05 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-10-20 17:20:23 +0200 |
| commit | 07d922e250e2d8d47ebfad0ad39de23f47cc390b (patch) | |
| tree | bd9d8738fb6a7aca07967691bd33dfedaa10a9f0 | |
| parent | af2f87d2f2471f532aa4586d9243b622ee6434cf (diff) | |
| download | ModemManager-07d922e250e2d8d47ebfad0ad39de23f47cc390b.tar.gz | |
broadband-modem-qmi: port firmware_load_list to use GTask
| -rw-r--r-- | src/mm-broadband-modem-qmi.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index 67a7f33a1..947012983 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -10406,12 +10406,18 @@ firmware_check_support (MMIfaceModemFirmware *self, /*****************************************************************************/ /* Load firmware list (Firmware interface) */ +static void +firmware_list_free (GList *firmware_list) +{ + g_list_free_full (firmware_list, g_object_unref); +} + static GList * firmware_load_list_finish (MMIfaceModemFirmware *self, GAsyncResult *res, GError **error) { - return (GList *)g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)); + return g_task_propagate_pointer (G_TASK (res), error); } static void @@ -10420,20 +10426,15 @@ firmware_load_list (MMIfaceModemFirmware *_self, gpointer user_data) { MMBroadbandModemQmi *self = MM_BROADBAND_MODEM_QMI (_self); - GSimpleAsyncResult *result; GList *dup; - - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - firmware_load_list); + GTask *task; /* We'll return the new list of new references we create here */ dup = g_list_copy_deep (self->priv->firmware_list, (GCopyFunc)g_object_ref, NULL); - g_simple_async_result_set_op_res_gpointer (result, dup, NULL); - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + task = g_task_new (self, NULL, callback, user_data); + g_task_return_pointer (task, dup, (GDestroyNotify)firmware_list_free); + g_object_unref (task); } /*****************************************************************************/ |