colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadband-modem: port modem_3gpp_load_subscription_state to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-07-12 13:07:37 -07:00
committed by Aleksander Morgado
parent c812101a12
commit 1fe33d34e8
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/mm-broadband-modem.c
View File

@@ -3679,11 +3679,15 @@ modem_3gpp_load_subscription_state_finish (MMIfaceModem3gpp *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) GError *inner_error = NULL;
return MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN; gssize value;
return (MMModem3gppSubscriptionState) GPOINTER_TO_UINT ( value = g_task_propagate_int (G_TASK (res), &inner_error);
g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res))); if (inner_error) {
g_propagate_error (error, inner_error);
return MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN;
}
return (MMModem3gppSubscriptionState)value;
} }
static void static void
@@ -3691,20 +3695,11 @@ modem_3gpp_load_subscription_state (MMIfaceModem3gpp *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback, g_task_return_int (task, MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN);
user_data, g_object_unref (task);
modem_3gpp_load_subscription_state);
g_simple_async_result_set_op_res_gpointer (
result,
GUINT_TO_POINTER (MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN),
NULL);
g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
} }
/*****************************************************************************/ /*****************************************************************************/