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

broadband-modem-qmi: port common_setup_cleanup_unsolicited_events to use GTask

Browse Source
This commit is contained in:
Ben Chan
2018-05-01 16:47:05 -07:00
committed by Aleksander Morgado
parent baefe53ab9
commit 85eb5bdcbd
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mm-broadband-modem-qmi.c
View File

@@ -6874,7 +6874,7 @@ common_setup_cleanup_unsolicited_events_finish (MMBroadbandModemQmi *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
@@ -6958,25 +6958,21 @@ common_setup_cleanup_unsolicited_events (MMBroadbandModemQmi *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
QmiClient *client = NULL; QmiClient *client = NULL;
if (!ensure_qmi_client (MM_BROADBAND_MODEM_QMI (self), if (!assure_qmi_client (MM_BROADBAND_MODEM_QMI (self),
QMI_SERVICE_NAS, &client, QMI_SERVICE_NAS, &client,
callback, user_data)) callback, user_data))
return; return;
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
common_enable_disable_unsolicited_events);
if (enable == self->priv->unsolicited_events_setup) { if (enable == self->priv->unsolicited_events_setup) {
mm_dbg ("Unsolicited events already %s; skipping", mm_dbg ("Unsolicited events already %s; skipping",
enable ? "setup" : "cleanup"); enable ? "setup" : "cleanup");
g_simple_async_result_set_op_res_gboolean (result, TRUE); g_task_return_boolean (task, TRUE);
g_simple_async_result_complete_in_idle (result); g_object_unref (task);
g_object_unref (result);
return; return;
} }
@@ -7016,9 +7012,8 @@ common_setup_cleanup_unsolicited_events (MMBroadbandModemQmi *self,
} }
#endif /* WITH_NEWEST_QMI_COMMANDS */ #endif /* WITH_NEWEST_QMI_COMMANDS */
g_simple_async_result_set_op_res_gboolean (result, TRUE); g_task_return_boolean (task, TRUE);
g_simple_async_result_complete_in_idle (result); g_object_unref (task);
g_object_unref (result);
} }
/*****************************************************************************/ /*****************************************************************************/