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

broadband-modem-qmi: port messaging_set_default_storage to use GTask

Browse Source
This commit is contained in:
Ben Chan
2018-05-01 17:42:40 -07:00
committed by Aleksander Morgado
parent 216fb6bbe8
commit 3cd9ae6321
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7169,13 +7169,13 @@ messaging_set_default_storage_finish (MMIfaceModemMessaging *_self,
return iface_modem_messaging_parent->set_default_storage_finish (_self, res, error); return iface_modem_messaging_parent->set_default_storage_finish (_self, res, 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
wms_set_routes_ready (QmiClientWms *client, wms_set_routes_ready (QmiClientWms *client,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
QmiMessageWmsSetRoutesOutput *output = NULL; QmiMessageWmsSetRoutesOutput *output = NULL;
GError *error = NULL; GError *error = NULL;
@@ -7183,19 +7183,17 @@ wms_set_routes_ready (QmiClientWms *client,
output = qmi_client_wms_set_routes_finish (client, res, &error); output = qmi_client_wms_set_routes_finish (client, res, &error);
if (!output) { if (!output) {
g_prefix_error (&error, "QMI operation failed: "); g_prefix_error (&error, "QMI operation failed: ");
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
} else if (!qmi_message_wms_set_routes_output_get_result (output, &error)) { } else if (!qmi_message_wms_set_routes_output_get_result (output, &error)) {
g_prefix_error (&error, "Couldn't set routes: "); g_prefix_error (&error, "Couldn't set routes: ");
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_object_unref (task);
if (output) if (output)
qmi_message_wms_set_routes_output_unref (output); qmi_message_wms_set_routes_output_unref (output);
g_simple_async_result_complete (simple);
g_object_unref (simple);
} }
static void static void
@@ -7205,7 +7203,6 @@ messaging_set_default_storage (MMIfaceModemMessaging *_self,
gpointer user_data) gpointer user_data)
{ {
MMBroadbandModemQmi *self = MM_BROADBAND_MODEM_QMI (_self); MMBroadbandModemQmi *self = MM_BROADBAND_MODEM_QMI (_self);
GSimpleAsyncResult *result;
QmiClient *client = NULL; QmiClient *client = NULL;
QmiMessageWmsSetRoutesInput *input; QmiMessageWmsSetRoutesInput *input;
GArray *routes_array; GArray *routes_array;
@@ -7217,16 +7214,11 @@ messaging_set_default_storage (MMIfaceModemMessaging *_self,
return; return;
} }
if (!ensure_qmi_client (MM_BROADBAND_MODEM_QMI (self), if (!assure_qmi_client (MM_BROADBAND_MODEM_QMI (self),
QMI_SERVICE_WMS, &client, QMI_SERVICE_WMS, &client,
callback, user_data)) callback, user_data))
return; return;
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
messaging_set_default_storage);
/* Build routes array and add it as input /* Build routes array and add it as input
* Just worry about Class 0 and Class 1 messages for now */ * Just worry about Class 0 and Class 1 messages for now */
input = qmi_message_wms_set_routes_input_new (); input = qmi_message_wms_set_routes_input_new ();
@@ -7246,7 +7238,7 @@ messaging_set_default_storage (MMIfaceModemMessaging *_self,
5, 5,
NULL, NULL,
(GAsyncReadyCallback)wms_set_routes_ready, (GAsyncReadyCallback)wms_set_routes_ready,
result); g_task_new (self, NULL, callback, user_data));
qmi_message_wms_set_routes_input_unref (input); qmi_message_wms_set_routes_input_unref (input);
g_array_unref (routes_array); g_array_unref (routes_array);