diff options
| author | Ben Chan <benchan@chromium.org> | 2017-09-20 22:35:12 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-09-28 10:39:25 +0200 |
| commit | 996612f8dba8958bc6ddd4f0aa6257b7267e1770 (patch) | |
| tree | 627872423168337ed986de3ee3cd4e9eef4464e6 /plugins | |
| parent | 2991ae0e86d99f46986c983b928629264d253fa9 (diff) | |
mtk: port load_supported_modes to use GTask
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mtk/mm-broadband-modem-mtk.c | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/plugins/mtk/mm-broadband-modem-mtk.c b/plugins/mtk/mm-broadband-modem-mtk.c index 8ac7c786..59bb1773 100644 --- a/plugins/mtk/mm-broadband-modem-mtk.c +++ b/plugins/mtk/mm-broadband-modem-mtk.c @@ -180,7 +180,7 @@ modem_after_sim_unlock (MMIfaceModem *self, static void get_supported_modes_ready (MMBaseModem *self, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { const gchar *response; @@ -195,9 +195,8 @@ get_supported_modes_ready (MMBaseModem *self, response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); if (!response) { mm_dbg ("Fail to get response %s", response); - 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; } @@ -280,12 +279,8 @@ get_supported_modes_ready (MMBaseModem *self, * +GCAP, +WS64 not support completely, generic filter will filter * out 4G modes. */ - g_simple_async_result_set_op_res_gpointer (simple, - combinations, - (GDestroyNotify)g_array_unref); - - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_task_return_pointer (task, combinations, (GDestroyNotify)g_array_unref); + g_object_unref (task); g_regex_unref (r); if (match_info) @@ -298,17 +293,12 @@ load_supported_modes (MMIfaceModem *self, GAsyncReadyCallback callback, gpointer user_data) { - mm_base_modem_at_command ( - MM_BASE_MODEM (self), - "+EGMR=0,0", - 3, - FALSE, - (GAsyncReadyCallback)get_supported_modes_ready, - g_simple_async_result_new ( - G_OBJECT (self), - callback, - user_data, - load_supported_modes)); + mm_base_modem_at_command (MM_BASE_MODEM (self), + "+EGMR=0,0", + 3, + FALSE, + (GAsyncReadyCallback)get_supported_modes_ready, + g_task_new (self, NULL, callback, user_data)); } static GArray * @@ -316,10 +306,7 @@ 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); } /*****************************************************************************/ |