diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-12 13:33:25 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-18 10:42:17 +0200 |
| commit | 101c646cf93feb7d843895ff3456a6627c20b302 (patch) | |
| tree | 8d18c9f1e58df1a64d124784c1a1e0b319dcb71d | |
| parent | 1d72695df93bdb22e1788375b2f962f41a655925 (diff) | |
broadband-modem: port modem_messaging_load_supported_storages to use GTask
| -rw-r--r-- | src/mm-broadband-modem.c | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 9ac8e151..52d721aa 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -5351,21 +5351,21 @@ modem_messaging_load_supported_storages_finish (MMIfaceModemMessaging *self, { SupportedStoragesResult *result; - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) + result = g_task_propagate_pointer (G_TASK (res), error); + if (!result) return FALSE; - result = (SupportedStoragesResult *)g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)); *mem1 = g_array_ref (result->mem1); *mem2 = g_array_ref (result->mem2); *mem3 = g_array_ref (result->mem3); - + supported_storages_result_free (result); return TRUE; } static void cpms_format_check_ready (MMBroadbandModem *self, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { const gchar *response; GError *error = NULL; @@ -5373,9 +5373,8 @@ cpms_format_check_ready (MMBroadbandModem *self, response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); if (error) { - 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; } @@ -5386,22 +5385,20 @@ cpms_format_check_ready (MMBroadbandModem *self, &result->mem1, &result->mem2, &result->mem3)) { - g_simple_async_result_set_error (simple, - MM_CORE_ERROR, - MM_CORE_ERROR_FAILED, - "Couldn't parse supported storages reply: '%s'", - response); supported_storages_result_free (result); - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_task_return_new_error (task, + MM_CORE_ERROR, + MM_CORE_ERROR_FAILED, + "Couldn't parse supported storages reply: '%s'", + response); + g_object_unref (task); return; } - g_simple_async_result_set_op_res_gpointer (simple, - result, - (GDestroyNotify)supported_storages_result_free); - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_task_return_pointer (task, + result, + (GDestroyNotify)supported_storages_result_free); + g_object_unref (task); } static void @@ -5409,12 +5406,9 @@ modem_messaging_load_supported_storages (MMIfaceModemMessaging *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + GTask *task; - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_messaging_load_supported_storages); + task = g_task_new (self, NULL, callback, user_data); /* Check support storages */ mm_base_modem_at_command (MM_BASE_MODEM (self), @@ -5422,7 +5416,7 @@ modem_messaging_load_supported_storages (MMIfaceModemMessaging *self, 3, TRUE, (GAsyncReadyCallback)cpms_format_check_ready, - result); + task); } /*****************************************************************************/ |