diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-06 13:50:26 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-18 10:42:16 +0200 |
| commit | f7db91616935f9ccd740415cb0bead63f2fde426 (patch) | |
| tree | 09165f3c6ca074a57531fa9b835ba34116aaab4a | |
| parent | a7dee00e5c9377ac5f80c632f6cc9f67aac1eea5 (diff) | |
broadband-modem: port modem_create_bearer to use GTask
| -rw-r--r-- | src/mm-broadband-modem.c | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index da36491c..6aff6f9c 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -263,34 +263,23 @@ modem_create_bearer_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { - MMBaseBearer *bearer; - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) - return NULL; - - bearer = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)); - mm_dbg ("New bearer created at DBus path '%s'", mm_base_bearer_get_path (bearer)); - - return g_object_ref (bearer); + return g_task_propagate_pointer (G_TASK (res), error); } static void broadband_bearer_new_ready (GObject *source, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { MMBaseBearer *bearer = NULL; GError *error = NULL; bearer = mm_broadband_bearer_new_finish (res, &error); if (!bearer) - g_simple_async_result_take_error (simple, error); + g_task_return_error (task, error); else - g_simple_async_result_set_op_res_gpointer (simple, - bearer, - g_object_unref); - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_task_return_pointer (task, bearer, g_object_unref); + g_object_unref (task); } static void @@ -299,13 +288,9 @@ modem_create_bearer (MMIfaceModem *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + GTask *task; - /* Set a new ref to the bearer object as result */ - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_create_bearer); + task = g_task_new (self, NULL, callback, user_data); /* We just create a MMBroadbandBearer */ mm_dbg ("Creating Broadband bearer in broadband modem"); @@ -313,7 +298,7 @@ modem_create_bearer (MMIfaceModem *self, properties, NULL, /* cancellable */ (GAsyncReadyCallback)broadband_bearer_new_ready, - result); + task); } /*****************************************************************************/ |