diff options
author | Ben Chan <benchan@chromium.org> | 2017-07-04 11:40:04 -0700 |
---|---|---|
committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-05 10:42:41 +0200 |
commit | 12d578ff8510c90d4f3214124bcd3f8505d357ac (patch) | |
tree | 316ff666089db06797f545c987441667f749a564 /src/mm-base-sim.c | |
parent | 87176cf52c1ab5ae1c0800b5f18070bdb03150f9 (diff) |
base-sim: port change_pin to use GTask
Diffstat (limited to 'src/mm-base-sim.c')
-rw-r--r-- | src/mm-base-sim.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/mm-base-sim.c b/src/mm-base-sim.c index fdd9ee14..51e4e6a7 100644 --- a/src/mm-base-sim.c +++ b/src/mm-base-sim.c @@ -88,23 +88,23 @@ change_pin_finish (MMBaseSim *self, GAsyncResult *res, 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 change_pin_ready (MMBaseModem *modem, GAsyncResult *res, - GSimpleAsyncResult *simple) + GTask *task) { GError *error = NULL; mm_base_modem_at_command_finish (modem, res, &error); if (error) - g_simple_async_result_take_error (simple, error); + g_task_return_error (task, error); else - g_simple_async_result_set_op_res_gboolean (simple, TRUE); - g_simple_async_result_complete (simple); - g_object_unref (simple); + g_task_return_boolean (task, TRUE); + + g_object_unref (task); } static void @@ -114,13 +114,10 @@ change_pin (MMBaseSim *self, GAsyncReadyCallback callback, gpointer user_data) { - GSimpleAsyncResult *result; + GTask *task; gchar *command; - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - change_pin); + task = g_task_new (self, NULL, callback, user_data); command = g_strdup_printf ("+CPWD=\"SC\",\"%s\",\"%s\"", old_pin, @@ -130,7 +127,7 @@ change_pin (MMBaseSim *self, 3, FALSE, (GAsyncReadyCallback)change_pin_ready, - result); + task); g_free (command); } |