diff options
| author | Ben Chan <benchan@chromium.org> | 2017-09-26 05:31:52 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-09-28 10:49:56 +0200 |
| commit | 2e7aff84a62dfcedaaf22e47a42ea6bb152e8421 (patch) | |
| tree | 2fab92e5cf798c83421c9e3e1f8461b9a994eca0 | |
| parent | 9f573d3bcf8f5f28093c33a001851e80458c928a (diff) | |
mbm: port modem_create_bearer to use GTask
| -rw-r--r-- | plugins/mbm/mm-broadband-modem-mbm.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/plugins/mbm/mm-broadband-modem-mbm.c b/plugins/mbm/mm-broadband-modem-mbm.c index 513f2d43..2fd1653a 100644 --- a/plugins/mbm/mm-broadband-modem-mbm.c +++ b/plugins/mbm/mm-broadband-modem-mbm.c @@ -89,31 +89,24 @@ modem_create_bearer_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { - MMBaseBearer *bearer; - - bearer = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)); - mm_dbg ("New MBM 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_mbm_new_ready (GObject *source, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { MMBaseBearer *bearer = NULL; GError *error = NULL; bearer = mm_broadband_bearer_mbm_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 @@ -122,19 +115,12 @@ modem_create_bearer (MMIfaceModem *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; - - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_create_bearer); - mm_dbg ("Creating MBM bearer..."); mm_broadband_bearer_mbm_new (MM_BROADBAND_MODEM_MBM (self), properties, NULL, /* cancellable */ (GAsyncReadyCallback)broadband_bearer_mbm_new_ready, - result); + g_task_new (self, NULL, callback, user_data)); } /*****************************************************************************/ |