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

icera: port modem_load_unlock_retries to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-12 03:45:38 -07:00
committed by Aleksander Morgado
parent ce732e568c
commit 4ecc8a13fd
1 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/icera/mm-broadband-modem-icera.c
View File

@@ -1054,16 +1054,13 @@ modem_load_unlock_retries_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) return g_task_propagate_pointer (G_TASK (res), error);
return NULL;
return (MMUnlockRetries *) g_object_ref (g_simple_async_result_get_op_res_gpointer (
G_SIMPLE_ASYNC_RESULT (res)));
} }
static void static void
load_unlock_retries_ready (MMBaseModem *self, load_unlock_retries_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *operation_result) GTask *task)
{ {
const gchar *response; const gchar *response;
GError *error = NULL; GError *error = NULL;
@@ -1072,9 +1069,8 @@ load_unlock_retries_ready (MMBaseModem *self,
response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
if (!response) { if (!response) {
mm_dbg ("Couldn't query unlock retries: '%s'", error->message); mm_dbg ("Couldn't query unlock retries: '%s'", error->message);
g_simple_async_result_take_error (operation_result, error); g_task_return_error (task, error);
g_simple_async_result_complete (operation_result); g_object_unref (task);
g_object_unref (operation_result);
return; return;
} }
@@ -1086,18 +1082,15 @@ load_unlock_retries_ready (MMBaseModem *self,
mm_unlock_retries_set (retries, MM_MODEM_LOCK_SIM_PUK, puk1); mm_unlock_retries_set (retries, MM_MODEM_LOCK_SIM_PUK, puk1);
mm_unlock_retries_set (retries, MM_MODEM_LOCK_SIM_PIN2, pin2); mm_unlock_retries_set (retries, MM_MODEM_LOCK_SIM_PIN2, pin2);
mm_unlock_retries_set (retries, MM_MODEM_LOCK_SIM_PUK2, puk2); mm_unlock_retries_set (retries, MM_MODEM_LOCK_SIM_PUK2, puk2);
g_simple_async_result_set_op_res_gpointer (operation_result, g_task_return_pointer (task, retries, g_object_unref);
retries,
g_object_unref);
} else { } else {
g_simple_async_result_set_error (operation_result, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Invalid unlock retries response: '%s'", "Invalid unlock retries response: '%s'",
response); response);
} }
g_simple_async_result_complete (operation_result); g_object_unref (task);
g_object_unref (operation_result);
} }
static void static void
@@ -1111,10 +1104,7 @@ modem_load_unlock_retries (MMIfaceModem *self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)load_unlock_retries_ready, (GAsyncReadyCallback)load_unlock_retries_ready,
g_simple_async_result_new (G_OBJECT (self), g_task_new (self, NULL, callback, user_data));
callback,
user_data,
modem_load_unlock_retries));
} }
/*****************************************************************************/ /*****************************************************************************/