summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Chan <benchan@chromium.org>2017-07-11 14:08:51 -0700
committerAleksander Morgado <aleksander@aleksander.es>2017-10-20 17:20:23 +0200
commit3e91956d0cf4161a8b0443d3863599a06781dbf8 (patch)
tree7807cb42492a51d9d7648f8150f49c650fe706fd
parentd99398b05519df21a9bfc84e5c3de232e892bd0f (diff)
downloadModemManager-3e91956d0cf4161a8b0443d3863599a06781dbf8.tar.gz
broadband-modem-qmi: port location_load_capabilities to use GTask
-rw-r--r--src/mm-broadband-modem-qmi.c35
1 files changed, 16 insertions, 19 deletions
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index 39df86599..d64412a07 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -8401,17 +8401,21 @@ location_load_capabilities_finish (MMIfaceModemLocation *self,
GAsyncResult *res,
GError **error)
{
- if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
- return MM_MODEM_LOCATION_SOURCE_NONE;
+ GError *inner_error = NULL;
+ gssize value;
- return (MMModemLocationSource) GPOINTER_TO_UINT (g_simple_async_result_get_op_res_gpointer (
- G_SIMPLE_ASYNC_RESULT (res)));
+ value = g_task_propagate_int (G_TASK (res), &inner_error);
+ if (inner_error) {
+ g_propagate_error (error, inner_error);
+ return MM_MODEM_LOCATION_SOURCE_NONE;
+ }
+ return (MMModemLocationSource)value;
}
static void
parent_load_capabilities_ready (MMIfaceModemLocation *self,
GAsyncResult *res,
- GSimpleAsyncResult *simple)
+ GTask *task)
{
MMModemLocationSource sources;
GError *error = NULL;
@@ -8419,9 +8423,8 @@ parent_load_capabilities_ready (MMIfaceModemLocation *self,
sources = iface_modem_location_parent->load_capabilities_finish (self, res, &error);
if (error) {
- g_simple_async_result_take_error (simple, error);
- g_simple_async_result_complete (simple);
- g_object_unref (simple);
+ g_task_return_error (task, error);
+ g_object_unref (task);
return;
}
@@ -8442,11 +8445,8 @@ parent_load_capabilities_ready (MMIfaceModemLocation *self,
sources |= MM_MODEM_LOCATION_SOURCE_CDMA_BS;
/* So we're done, complete */
- g_simple_async_result_set_op_res_gpointer (simple,
- GUINT_TO_POINTER (sources),
- NULL);
- g_simple_async_result_complete (simple);
- g_object_unref (simple);
+ g_task_return_int (task, sources);
+ g_object_unref (task);
}
static void
@@ -8454,18 +8454,15 @@ location_load_capabilities (MMIfaceModemLocation *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
- GSimpleAsyncResult *result;
+ GTask *task;
- result = g_simple_async_result_new (G_OBJECT (self),
- callback,
- user_data,
- location_load_capabilities);
+ task = g_task_new (self, NULL, callback, user_data);
/* Chain up parent's setup */
iface_modem_location_parent->load_capabilities (
self,
(GAsyncReadyCallback)parent_load_capabilities_ready,
- result);
+ task);
}
/*****************************************************************************/