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

iface-modem-cdma: port mm_iface_modem_cdma_register_in_network to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-06-29 04:46:03 -07:00
committed by Aleksander Morgado
parent 3cf23b6c44
commit 0d2fb2fe45
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mm-iface-modem-cdma.c
View File

@@ -396,22 +396,21 @@ mm_iface_modem_cdma_register_in_network_finish (MMIfaceModemCdma *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
register_in_network_ready (MMIfaceModemCdma *self, register_in_network_ready (MMIfaceModemCdma *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
if (!MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->register_in_network_finish (self, res, &error)) if (!MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->register_in_network_finish (self, 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
@@ -420,17 +419,15 @@ mm_iface_modem_cdma_register_in_network (MMIfaceModemCdma *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
task = g_task_new (self, NULL, callback, user_data);
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
mm_iface_modem_cdma_register_in_network);
MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->register_in_network ( MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->register_in_network (
self, self,
max_registration_time, max_registration_time,
(GAsyncReadyCallback)register_in_network_ready, (GAsyncReadyCallback)register_in_network_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/