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

broadband-modem-qmi: port modem_3gpp_load_imei to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-10-20 17:20:24 +02:00
committed by Aleksander Morgado
parent be1b3add84
commit 942a3565e2
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem-qmi.c
+9 -22
View File
@@ -3968,14 +3968,7 @@ modem_3gpp_load_imei_finish (MMIfaceModem3gpp *self,
GAsyncResult *res,
GError **error)
{
gchar *imei;
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
return NULL;
imei = g_strdup (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)));
mm_dbg ("loaded IMEI: %s", imei);
return imei;
return g_task_propagate_pointer (G_TASK (res), error);
}
static void
@@ -3984,24 +3977,18 @@ modem_3gpp_load_imei (MMIfaceModem3gpp *_self,
gpointer user_data)
{
MMBroadbandModemQmi *self = MM_BROADBAND_MODEM_QMI (_self);
GSimpleAsyncResult *result;
GTask *task;
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
modem_3gpp_load_imei);
task = g_task_new (self, NULL, callback, user_data);
if (self->priv->imei)
g_simple_async_result_set_op_res_gpointer (result,
self->priv->imei,
NULL);
g_task_return_pointer (task, g_strdup (self->priv->imei), g_free);
else
g_simple_async_result_set_error (result,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Device doesn't report a valid IMEI");
g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
g_task_return_new_error (task,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Device doesn't report a valid IMEI");
g_object_unref (task);
}
/*****************************************************************************/