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

broadband-modem: port modem_messaging_check_support to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-07-12 13:25:32 -07:00
committed by Aleksander Morgado
parent ed0c91b71b
commit c29cd5eb4e
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/mm-broadband-modem.c
View File

@@ -5269,28 +5269,26 @@ modem_messaging_check_support_finish (MMIfaceModemMessaging *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
cnmi_format_check_ready (MMBroadbandModem *self, cnmi_format_check_ready (MMBroadbandModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
if (error) { if (error) {
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
/* CNMI command is supported; assume we have full messaging capabilities */ /* CNMI command is supported; assume we have full messaging capabilities */
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 (task);
g_object_unref (simple);
} }
static void static void
@@ -5298,22 +5296,18 @@ modem_messaging_check_support (MMIfaceModemMessaging *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
modem_messaging_check_support);
/* We assume that CDMA-only modems don't have messaging capabilities */ /* We assume that CDMA-only modems don't have messaging capabilities */
if (mm_iface_modem_is_cdma_only (MM_IFACE_MODEM (self))) { if (mm_iface_modem_is_cdma_only (MM_IFACE_MODEM (self))) {
g_simple_async_result_set_error ( g_task_return_new_error (
result, task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_UNSUPPORTED, MM_CORE_ERROR_UNSUPPORTED,
"CDMA-only modems don't have messaging capabilities"); "CDMA-only modems don't have messaging capabilities");
g_simple_async_result_complete_in_idle (result); g_object_unref (task);
g_object_unref (result);
return; return;
} }
@@ -5323,7 +5317,7 @@ modem_messaging_check_support (MMIfaceModemMessaging *self,
3, 3,
TRUE, TRUE,
(GAsyncReadyCallback)cnmi_format_check_ready, (GAsyncReadyCallback)cnmi_format_check_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/