[Spice-devel] [spice-gtk Win32 v5 04/22] spice_usb_device_manager_remove_dev: use type SpiceUsbDevice for "device"

[Marc-André Lureau]

ack

On Mon, Jul 9, 2012 at 2:14 PM, Uri Lublin <uril at redhat.com> wrote:
> Currently SpiceUsbDevice is a BOX for libusb_device.
> In preparation for a different SpiceUsbDevice.
> ---
>  gtk/usb-device-manager.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/gtk/usb-device-manager.c b/gtk/usb-device-manager.c
> index 8b277cc..c50a7da 100644
> --- a/gtk/usb-device-manager.c
> +++ b/gtk/usb-device-manager.c
> @@ -609,7 +609,7 @@ static void spice_usb_device_manager_remove_dev(SpiceUsbDeviceManager  *self,
>                                                  GUdevDevice            *udev)
>  {
>      SpiceUsbDeviceManagerPrivate *priv = self->priv;
> -    libusb_device *curr, *device = NULL;
> +    SpiceUsbDevice *curr, *device = NULL;
>      int bus, address;
>      guint i;
>
> @@ -618,8 +618,8 @@ static void spice_usb_device_manager_remove_dev(SpiceUsbDeviceManager  *self,
>
>      for (i = 0; i < priv->devices->len; i++) {
>          curr = g_ptr_array_index(priv->devices, i);
> -        if (libusb_get_bus_number(curr) == bus &&
> -               libusb_get_device_address(curr) == address) {
> +        if (libusb_get_bus_number((libusb_device*)curr) == bus &&
> +               libusb_get_device_address((libusb_device*)curr) == address) {
>              device = curr;
>              break;
>          }
> @@ -631,7 +631,7 @@ static void spice_usb_device_manager_remove_dev(SpiceUsbDeviceManager  *self,
>          return;
>      }
>
> -    spice_usb_device_manager_disconnect_device(self, (SpiceUsbDevice *)device);
> +    spice_usb_device_manager_disconnect_device(self, device);
>
>      SPICE_DEBUG("device removed %p", device);
>      g_signal_emit(self, signals[DEVICE_REMOVED], 0, device);
> --
> 1.7.1
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel



-- 
Marc-André Lureau