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

huawei: port modem_after_sim_unlock to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-07-18 00:50:07 -07:00
committed by Aleksander Morgado
parent 0aae6d3e35
commit 36d975bd4e
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/huawei/mm-broadband-modem-huawei.c
View File

@@ -711,14 +711,14 @@ modem_after_sim_unlock_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
return TRUE; return g_task_propagate_boolean (G_TASK (res), error);
} }
static gboolean static gboolean
after_sim_unlock_wait_cb (GSimpleAsyncResult *result) after_sim_unlock_wait_cb (GTask *task)
{ {
g_simple_async_result_complete (result); g_task_return_boolean (task, TRUE);
g_object_unref (result); g_object_unref (task);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@@ -727,16 +727,13 @@ modem_after_sim_unlock (MMIfaceModem *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,
user_data,
modem_after_sim_unlock);
/* A 3-second wait is necessary for SIM to become ready, or the firmware may /* A 3-second wait is necessary for SIM to become ready, or the firmware may
* fail miserably and reboot itself */ * fail miserably and reboot itself */
g_timeout_add_seconds (3, (GSourceFunc)after_sim_unlock_wait_cb, result); g_timeout_add_seconds (3, (GSourceFunc)after_sim_unlock_wait_cb, task);
} }
/*****************************************************************************/ /*****************************************************************************/