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

huawei: port location_load_capabilities to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-08-01 11:17:12 -07:00
committed by Aleksander Morgado
parent 36d975bd4e
commit 6ebc07f882
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/huawei/mm-broadband-modem-huawei.c
View File

@@ -3647,25 +3647,29 @@ location_load_capabilities_finish (MMIfaceModemLocation *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) GError *inner_error = NULL;
return MM_MODEM_LOCATION_SOURCE_NONE; 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 static void
parent_load_capabilities_ready (MMIfaceModemLocation *self, parent_load_capabilities_ready (MMIfaceModemLocation *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
MMModemLocationSource sources; MMModemLocationSource sources;
GError *error = NULL; GError *error = NULL;
sources = iface_modem_location_parent->load_capabilities_finish (self, res, &error); sources = iface_modem_location_parent->load_capabilities_finish (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;
} }
@@ -3676,11 +3680,8 @@ parent_load_capabilities_ready (MMIfaceModemLocation *self,
MM_MODEM_LOCATION_SOURCE_GPS_UNMANAGED); MM_MODEM_LOCATION_SOURCE_GPS_UNMANAGED);
/* So we're done, complete */ /* So we're done, complete */
g_simple_async_result_set_op_res_gpointer (simple, g_task_return_int (task, sources);
GUINT_TO_POINTER (sources), g_object_unref (task);
NULL);
g_simple_async_result_complete (simple);
g_object_unref (simple);
} }
static void static void
@@ -3688,17 +3689,14 @@ location_load_capabilities (MMIfaceModemLocation *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,
location_load_capabilities);
/* Chain up parent's setup */ /* Chain up parent's setup */
iface_modem_location_parent->load_capabilities (self, iface_modem_location_parent->load_capabilities (self,
(GAsyncReadyCallback)parent_load_capabilities_ready, (GAsyncReadyCallback)parent_load_capabilities_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/