diff options
| author | Ben Chan <benchan@chromium.org> | 2017-09-27 21:55:58 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-09-28 10:45:52 +0200 |
| commit | 4e3a6b4eb53a58ea7609d90647b46d51e8c3c79e (patch) | |
| tree | 28622b685b868047c7e5e902e13562bd7d27ce9f | |
| parent | fea6835592ddc12f4cd25c231169e4620ec756f9 (diff) | |
x22x: port load_supported_modes to use GTask
| -rw-r--r-- | plugins/x22x/mm-broadband-modem-x22x.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/plugins/x22x/mm-broadband-modem-x22x.c b/plugins/x22x/mm-broadband-modem-x22x.c index ee611f2c..4887f717 100644 --- a/plugins/x22x/mm-broadband-modem-x22x.c +++ b/plugins/x22x/mm-broadband-modem-x22x.c @@ -46,16 +46,13 @@ load_supported_modes_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) - return NULL; - - return 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 parent_load_supported_modes_ready (MMIfaceModem *self, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { GError *error = NULL; GArray *all; @@ -65,9 +62,8 @@ parent_load_supported_modes_ready (MMIfaceModem *self, all = iface_modem_parent->load_supported_modes_finish (self, res, &error); if (!all) { - g_simple_async_result_take_error (simple, error); - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_task_return_error (task, error); + g_object_unref (task); return; } /* Build list of combinations for 3GPP devices */ @@ -91,9 +87,8 @@ parent_load_supported_modes_ready (MMIfaceModem *self, g_array_unref (all); g_array_unref (combinations); - g_simple_async_result_set_op_res_gpointer (simple, filtered, (GDestroyNotify) g_array_unref); - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_task_return_pointer (task, filtered, (GDestroyNotify) g_array_unref); + g_object_unref (task); } static void @@ -105,10 +100,7 @@ load_supported_modes (MMIfaceModem *self, iface_modem_parent->load_supported_modes ( MM_IFACE_MODEM (self), (GAsyncReadyCallback)parent_load_supported_modes_ready, - g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - load_supported_modes)); + g_task_new (self, NULL, callback, user_data)); } /*****************************************************************************/ |