diff options
| author | Ben Chan <benchan@chromium.org> | 2017-07-04 11:40:05 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-07-05 10:42:41 +0200 |
| commit | 650d2713501fc01bfd3f56e7cb516b72dd15937a (patch) | |
| tree | 9bad89b3c3f5c9c7a44d83dd116b210acf1743c1 | |
| parent | 12d578ff8510c90d4f3214124bcd3f8505d357ac (diff) | |
base-sim: port enable_pin to use GTask
| -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 51e4e6a7..289b6754 100644 --- a/src/mm-base-sim.c +++ b/src/mm-base-sim.c @@ -257,23 +257,23 @@ enable_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 enable_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 @@ -283,13 +283,10 @@ enable_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, - enable_pin); + task = g_task_new (self, NULL, callback, user_data); command = g_strdup_printf ("+CLCK=\"SC\",%d,\"%s\"", enabled ? 1 : 0, @@ -299,7 +296,7 @@ enable_pin (MMBaseSim *self, 3, FALSE, (GAsyncReadyCallback)enable_pin_ready, - result); + task); g_free (command); } |