summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathon Jongsma <jjongsma@redhat.com>2016-03-24 12:27:20 -0500
committerJonathon Jongsma <jjongsma@redhat.com>2016-03-24 15:29:44 -0500
commitff1f5651723a92c5d42206f0c3aa0210b14946a9 (patch)
tree61f005dbe4a1d09a2e79a45b86ead83e95f2fd46
parentd9dad6dacda9ba070b086afbc9cd0f08af2f114e (diff)
SpiceUsbDeviceManager: propagate errors from sub-tasks
_connect_device_async_cb() just turned TRUE unconditionally even if the sub-task had failed. Instead, introduce a _spice_usb_device_manager_connect_device_finish() function which passes up the result of the subtask.
-rw-r--r--src/usb-device-manager.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/usb-device-manager.c b/src/usb-device-manager.c
index 1bbf6b3..cc95c68 100644
--- a/src/usb-device-manager.c
+++ b/src/usb-device-manager.c
@@ -1563,6 +1563,18 @@ _spice_usb_device_manager_uninstall_driver_async(SpiceUsbDeviceManager *self,
#ifdef USE_USBREDIR
+static gboolean
+_spice_usb_device_manager_connect_device_finish(SpiceUsbDeviceManager *self,
+ GAsyncResult *res,
+ GError **error)
+{
+ GTask *task = G_TASK(res);
+
+ g_return_val_if_fail(g_task_is_valid(task, G_OBJECT(self)), FALSE);
+
+ return g_task_propagate_boolean(task, error);
+}
+
static void
_spice_usb_device_manager_connect_device_async(SpiceUsbDeviceManager *self,
SpiceUsbDevice *device,
@@ -1727,10 +1739,13 @@ void _connect_device_async_cb(GObject *gobject,
{
SpiceUsbDeviceManager *self = SPICE_USB_DEVICE_MANAGER(gobject);
GTask *task = user_data;
+ GError *error = NULL;
_set_redirecting(self, FALSE);
-
- g_task_return_boolean(task, TRUE);
+ if (_spice_usb_device_manager_connect_device_finish(self, channel_res, &error))
+ g_task_return_boolean(task, TRUE);
+ else
+ g_task_return_error(task, error);
g_object_unref(task);
}
#endif