diff options
| author | Ben Chan <benchan@chromium.org> | 2017-09-14 22:40:35 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-09-18 20:39:03 -0700 |
| commit | 85915853e57f2495767ea264df6aee4f5ab39ab0 (patch) | |
| tree | e0c1c8b20601420f6c511fa5aaa69c3888ad7c28 | |
| parent | 228bd14a11ed3362e78db71c4d076b330f32db90 (diff) | |
sierra: port modem_after_sim_unlock to use GTask
| -rw-r--r-- | plugins/sierra/mm-broadband-modem-sierra.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/plugins/sierra/mm-broadband-modem-sierra.c b/plugins/sierra/mm-broadband-modem-sierra.c index 6a5ef1bf..8e68ff6d 100644 --- a/plugins/sierra/mm-broadband-modem-sierra.c +++ b/plugins/sierra/mm-broadband-modem-sierra.c @@ -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); } /*****************************************************************************/ |