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

base-sim: port change_pin to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-07-04 11:40:04 -07:00
committed by Aleksander Morgado
parent 87176cf52c
commit 12d578ff85
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mm-base-sim.c
View File

@@ -88,23 +88,23 @@ change_pin_finish (MMBaseSim *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) 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 static void
change_pin_ready (MMBaseModem *modem, change_pin_ready (MMBaseModem *modem,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
mm_base_modem_at_command_finish (modem, res, &error); mm_base_modem_at_command_finish (modem, res, &error);
if (error) if (error)
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else else
g_simple_async_result_set_op_res_gboolean (simple, TRUE); g_task_return_boolean (task, TRUE);
g_simple_async_result_complete (simple);
g_object_unref (simple); g_object_unref (task);
} }
static void static void
@@ -114,13 +114,10 @@ change_pin (MMBaseSim *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
gchar *command; gchar *command;
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
change_pin);
command = g_strdup_printf ("+CPWD=\"SC\",\"%s\",\"%s\"", command = g_strdup_printf ("+CPWD=\"SC\",\"%s\",\"%s\"",
old_pin, old_pin,
@@ -130,7 +127,7 @@ change_pin (MMBaseSim *self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)change_pin_ready, (GAsyncReadyCallback)change_pin_ready,
result); task);
g_free (command); g_free (command);
} }