diff options
| author | Richard Hughes <richard@hughsie.com> | 2011-11-01 09:32:34 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2011-11-01 09:32:34 +0000 |
| commit | 5f4424c43fe7cdb44257c0a145cb086f7fdc35b5 (patch) | |
| tree | 37793c28afc0c4c765ae0d8a50425997a61256dd | |
| parent | f8a56b324d6c0e1ebcc82a10100e4768b4f5f151 (diff) | |
| download | gusb-5f4424c43fe7cdb44257c0a145cb086f7fdc35b5.tar.gz | |
Do not use g_simple_async_result_is_valid() it fails when using the sync methods
| -rw-r--r-- | gusb/gusb-device.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/gusb/gusb-device.c b/gusb/gusb-device.c index 2336eba..745c99f 100644 --- a/gusb/gusb-device.c +++ b/gusb/gusb-device.c @@ -737,11 +737,8 @@ g_usb_device_control_transfer_finish (GUsbDevice *device, { GSimpleAsyncResult *simple; - g_return_val_if_fail (g_simple_async_result_is_valid (res, - G_OBJECT (device), - g_usb_device_control_transfer_async), - FALSE); - + g_return_val_if_fail (G_IS_OBJECT (device), FALSE); + g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); simple = G_SIMPLE_ASYNC_RESULT (res); @@ -894,11 +891,8 @@ g_usb_device_bulk_transfer_finish (GUsbDevice *device, { GSimpleAsyncResult *simple; - g_return_val_if_fail (g_simple_async_result_is_valid (res, - G_OBJECT (device), - g_usb_device_bulk_transfer_async), - FALSE); - + g_return_val_if_fail (G_IS_OBJECT (device), FALSE); + g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); simple = G_SIMPLE_ASYNC_RESULT (res); @@ -1007,11 +1001,8 @@ g_usb_device_interrupt_transfer_finish (GUsbDevice *device, { GSimpleAsyncResult *simple; - g_return_val_if_fail (g_simple_async_result_is_valid (res, - G_OBJECT (device), - g_usb_device_interrupt_transfer_async), - FALSE); - + g_return_val_if_fail (G_IS_OBJECT (device), FALSE); + g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (res), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); simple = G_SIMPLE_ASYNC_RESULT (res); |