mbm: port modem_after_sim_unlock to use GTask
This commit is contained in:

committed by
Aleksander Morgado

parent
2e7aff84a6
commit
43bf7c764b
@@ -154,14 +154,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -170,15 +170,12 @@ 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);
|
|
||||||
|
|
||||||
/* wait so sim pin is done */
|
/* wait so sim pin is done */
|
||||||
g_timeout_add (500, (GSourceFunc)after_sim_unlock_wait_cb, result);
|
g_timeout_add (500, (GSourceFunc)after_sim_unlock_wait_cb, task);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
Reference in New Issue
Block a user