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

broadband-modem-qmi: port oma_cancel_session to use GTask

Browse Source
This commit is contained in:
Ben Chan
2018-04-28 15:52:52 -07:00
committed by Aleksander Morgado
parent ce7b3a7bb0
commit 456a09c655
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mm-broadband-modem-qmi.c
View File

@@ -9431,28 +9431,27 @@ oma_cancel_session_finish (MMIfaceModemOma *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
oma_cancel_session_ready (QmiClientOma *client, oma_cancel_session_ready (QmiClientOma *client,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
QmiMessageOmaCancelSessionOutput *output; QmiMessageOmaCancelSessionOutput *output;
GError *error = NULL; GError *error = NULL;
output = qmi_client_oma_cancel_session_finish (client, res, &error); output = qmi_client_oma_cancel_session_finish (client, res, &error);
if (!output || !qmi_message_oma_cancel_session_output_get_result (output, &error)) if (!output || !qmi_message_oma_cancel_session_output_get_result (output, &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_object_unref (task);
if (output) if (output)
qmi_message_oma_cancel_session_output_unref (output); qmi_message_oma_cancel_session_output_unref (output);
g_simple_async_result_complete (simple);
g_object_unref (simple);
} }
static void static void
@@ -9462,7 +9461,7 @@ oma_cancel_session (MMIfaceModemOma *self,
{ {
QmiClient *client = NULL; QmiClient *client = NULL;
if (!ensure_qmi_client (MM_BROADBAND_MODEM_QMI (self), if (!assure_qmi_client (MM_BROADBAND_MODEM_QMI (self),
QMI_SERVICE_OMA, &client, QMI_SERVICE_OMA, &client,
callback, user_data)) callback, user_data))
return; return;
@@ -9473,10 +9472,7 @@ oma_cancel_session (MMIfaceModemOma *self,
5, 5,
NULL, NULL,
(GAsyncReadyCallback)oma_cancel_session_ready, (GAsyncReadyCallback)oma_cancel_session_ready,
g_simple_async_result_new (G_OBJECT (self), g_task_new (self, NULL, callback, user_data));
callback,
user_data,
oma_cancel_session));
} }
/*****************************************************************************/ /*****************************************************************************/