diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-12 13:07:37 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-18 10:42:17 +0200 |
| commit | 1fe33d34e8c7ef1d6baf21c0517ceb15f2898d0a (patch) | |
| tree | d1147ae66bd29e7afec2cccd66509e3e29ef8554 /src/mm-broadband-modem.c | |
| parent | c812101a128529ae4240c69347031c335f0cacf1 (diff) | |
broadband-modem: port modem_3gpp_load_subscription_state to use GTask
Diffstat (limited to 'src/mm-broadband-modem.c')
| -rw-r--r-- | src/mm-broadband-modem.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 05aed431..10d62c29 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -3679,11 +3679,15 @@ modem_3gpp_load_subscription_state_finish (MMIfaceModem3gpp *self, GAsyncResult *res, GError **error) { - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) - return MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN; + GError *inner_error = NULL; + gssize value; - return (MMModem3gppSubscriptionState) GPOINTER_TO_UINT ( - g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res))); + value = g_task_propagate_int (G_TASK (res), &inner_error); + if (inner_error) { + g_propagate_error (error, inner_error); + return MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN; + } + return (MMModem3gppSubscriptionState)value; } static void @@ -3691,20 +3695,11 @@ modem_3gpp_load_subscription_state (MMIfaceModem3gpp *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; - - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_3gpp_load_subscription_state); - - g_simple_async_result_set_op_res_gpointer ( - result, - GUINT_TO_POINTER (MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN), - NULL); + GTask *task; - g_simple_async_result_complete_in_idle (result); - g_object_unref (result); + task = g_task_new (self, NULL, callback, user_data); + g_task_return_int (task, MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN); + g_object_unref (task); } /*****************************************************************************/ |