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