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

sierra: port modem_after_sim_unlock to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-14 22:40:35 -07:00
committed by Aleksander Morgado
parent 228bd14a11
commit 85915853e5
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -909,14 +909,14 @@ modem_after_sim_unlock_finish (MMIfaceModem *self,
GAsyncResult *res,
GError **error)
{
return TRUE;
return g_task_propagate_boolean (G_TASK (res), error);
}
static gboolean
after_sim_unlock_wait_cb (GSimpleAsyncResult *result)
after_sim_unlock_wait_cb (GTask *task)
{
g_simple_async_result_complete (result);
g_object_unref (result);
g_task_return_boolean (task, TRUE);
g_object_unref (task);
return G_SOURCE_REMOVE;
}
@@ -925,7 +925,7 @@ modem_after_sim_unlock (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
GSimpleAsyncResult *result;
GTask *task;
guint timeout = 8;
const gchar **drivers;
guint i;
@@ -941,12 +941,9 @@ modem_after_sim_unlock (MMIfaceModem *self,
timeout = 3;
}
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
modem_after_sim_unlock);
task = g_task_new (self, NULL, callback, user_data);
g_timeout_add_seconds (timeout, (GSourceFunc)after_sim_unlock_wait_cb, result);
g_timeout_add_seconds (timeout, (GSourceFunc)after_sim_unlock_wait_cb, task);
}
/*****************************************************************************/