[Spice-commits] gtk/usb-device-widget.h

[Marc-André Lureau]

 gtk/usb-device-widget.h |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit a7565265532f6abec0fd3c6d843683b58eee070a
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Tue Aug 6 12:09:18 2013 +0200

    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.

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,