From 3010789e722f4a0fce62d7f172ad8134e1c5e866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 6 Aug 2013 12:09:18 +0200 Subject: [spice-gtk] usb-widget: fix gtk2 Python bindings The Python bindings generator failed to bind the USB widget, because of the object/class declaration. The declaration was circumventing the deprecated errors when compiling with GTK_DISABLE_DEPRECATED. We used to need that because of broken gtk+ headers, but it is no longer necessary since 15bd7ceba1434b5d710bfd16078044f30693467b. (cherry picked from commit a7565265532f6abec0fd3c6d843683b58eee070a) --- gtk/usb-device-widget.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gtk/usb-device-widget.h b/gtk/usb-device-widget.h index 3920990..b68cc6b 100644 --- a/gtk/usb-device-widget.h +++ b/gtk/usb-device-widget.h @@ -37,14 +37,6 @@ typedef struct _SpiceUsbDeviceWidget SpiceUsbDeviceWidget; typedef struct _SpiceUsbDeviceWidgetClass SpiceUsbDeviceWidgetClass; typedef struct _SpiceUsbDeviceWidgetPrivate SpiceUsbDeviceWidgetPrivate; -#if GTK_CHECK_VERSION(3,0,0) -typedef struct _GtkBox _SpiceGtkBox; -typedef struct _GtkBoxClass _SpiceGtkBoxClass; -#else -typedef struct _GtkVBox _SpiceGtkBox; -typedef struct _GtkVBoxClass _SpiceGtkBoxClass; -#endif - /** * SpiceUsbDeviceWidget: * @@ -52,7 +44,7 @@ typedef struct _GtkVBoxClass _SpiceGtkBoxClass; */ struct _SpiceUsbDeviceWidget { - _SpiceGtkBox parent; + GtkVBox parent; /*< private >*/ SpiceUsbDeviceWidgetPrivate *priv; @@ -67,7 +59,7 @@ struct _SpiceUsbDeviceWidget */ struct _SpiceUsbDeviceWidgetClass { - _SpiceGtkBoxClass parent_class; + GtkVBoxClass parent_class; /* signals */ void (*connect_failed) (SpiceUsbDeviceWidget *widget,