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

base-modem: port mm_base_modem_authorize to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-04-03 23:37:25 -07:00
committed by Aleksander Morgado
parent 2c4b061dda
commit 6ced121ce1
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/mm-base-modem.c
View File

@@ -1172,23 +1172,22 @@ mm_base_modem_authorize_finish (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); return g_task_propagate_boolean (G_TASK (res), error);
} }
static void static void
authorize_ready (MMAuthProvider *authp, authorize_ready (MMAuthProvider *authp,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
if (!mm_auth_provider_authorize_finish (authp, res, &error)) if (!mm_auth_provider_authorize_finish (authp, res, &error))
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else else
g_simple_async_result_set_op_res_gboolean (simple, TRUE); g_task_return_boolean (task, TRUE);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
void void
@@ -1198,18 +1197,14 @@ mm_base_modem_authorize (MMBaseModem *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, self->priv->authp_cancellable, callback, user_data);
callback,
user_data,
mm_base_modem_authorize);
/* When running in the session bus for tests, default to always allow */ /* When running in the session bus for tests, default to always allow */
if (mm_context_get_test_session ()) { if (mm_context_get_test_session ()) {
g_simple_async_result_set_op_res_gboolean (result, TRUE); g_task_return_boolean (task, TRUE);
g_simple_async_result_complete_in_idle (result); g_object_unref (task);
g_object_unref (result);
return; return;
} }
@@ -1218,7 +1213,7 @@ mm_base_modem_authorize (MMBaseModem *self,
authorization, authorization,
self->priv->authp_cancellable, self->priv->authp_cancellable,
(GAsyncReadyCallback)authorize_ready, (GAsyncReadyCallback)authorize_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/