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

libmm-glib,manager: port mm_manager_scan_devices to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-06-23 01:12:19 -07:00
committed by Aleksander Morgado
parent 2f3d9642f6
commit 19794d0846
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libmm-glib/mm-manager.c
View File

@@ -392,13 +392,13 @@ mm_manager_scan_devices_finish (MMManager *manager,
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
scan_devices_ready (MmGdbusOrgFreedesktopModemManager1 *manager_iface_proxy, scan_devices_ready (MmGdbusOrgFreedesktopModemManager1 *manager_iface_proxy,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
@@ -406,12 +406,11 @@ scan_devices_ready (MmGdbusOrgFreedesktopModemManager1 *manager_iface_proxy,
manager_iface_proxy, manager_iface_proxy,
res, res,
&error)) &error))
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_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
/** /**
@@ -436,20 +435,16 @@ mm_manager_scan_devices (MMManager *manager,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
GError *inner_error = NULL; GError *inner_error = NULL;
g_return_if_fail (MM_IS_MANAGER (manager)); g_return_if_fail (MM_IS_MANAGER (manager));
result = g_simple_async_result_new (G_OBJECT (manager), task = g_task_new (manager, cancellable, callback, user_data);
callback,
user_data,
mm_manager_scan_devices);
if (!ensure_modem_manager1_proxy (manager, &inner_error)) { if (!ensure_modem_manager1_proxy (manager, &inner_error)) {
g_simple_async_result_take_error (result, inner_error); g_task_return_error (task, inner_error);
g_simple_async_result_complete_in_idle (result); g_object_unref (task);
g_object_unref (result);
return; return;
} }
@@ -457,7 +452,7 @@ mm_manager_scan_devices (MMManager *manager,
manager->priv->manager_iface_proxy, manager->priv->manager_iface_proxy,
cancellable, cancellable,
(GAsyncReadyCallback)scan_devices_ready, (GAsyncReadyCallback)scan_devices_ready,
result); task);
} }
/** /**