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

[Marc-André Lureau]

 Makefile.am             |    4 +---
 gtk/usb-device-widget.h |   12 ++++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 856ce17aa51ee7ac03ad20bafc2e118ffa182f10
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Tue Mar 20 17:20:48 2012 +0100

    build-sys: fix make distclean going twice in vapi dir
    
    Don't use DIST_SUBDIRS, it's not needed anyway.

diff --git a/Makefile.am b/Makefile.am
index 334752b..5f1353c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 NULL =
 
-SUBDIRS = common gtk po python_modules doc data
-DIST_SUBDIRS = spice-protocol vapi $(SUBDIRS)
-
+SUBDIRS = spice-protocol common gtk po python_modules doc data
 if HAVE_INTROSPECTION
 if WITH_VALA
 SUBDIRS += vapi
commit ca6066d95215c2b632e56d2ce31a89539e5623da
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Tue Mar 20 15:01:10 2012 +0100

    build-sys: fix compilation of bindings
    
    Hide symbol from API to fix pygobject.
    
    Also vapigen chokes on "record" typename
    
    SpiceClientGtk-3.0.gir:32.55-32.55: error: The type name `Gtk.BoxClass' could not be found <type name="Gtk.BoxClass" c:type="GtkBoxClass"/>
    
    This seems to be a bug in symbol lookup in vapigen. Using a struct
    typedef solves it.

diff --git a/gtk/usb-device-widget.h b/gtk/usb-device-widget.h
index b0513c4..3920990 100644
--- a/gtk/usb-device-widget.h
+++ b/gtk/usb-device-widget.h
@@ -38,11 +38,11 @@ typedef struct _SpiceUsbDeviceWidgetClass SpiceUsbDeviceWidgetClass;
 typedef struct _SpiceUsbDeviceWidgetPrivate SpiceUsbDeviceWidgetPrivate;
 
 #if GTK_CHECK_VERSION(3,0,0)
-typedef GtkBox SpiceGtkBox;
-typedef GtkBoxClass SpiceGtkBoxClass;
+typedef struct _GtkBox _SpiceGtkBox;
+typedef struct _GtkBoxClass _SpiceGtkBoxClass;
 #else
-typedef GtkVBox SpiceGtkBox;
-typedef GtkVBoxClass SpiceGtkBoxClass;
+typedef struct _GtkVBox _SpiceGtkBox;
+typedef struct _GtkVBoxClass _SpiceGtkBoxClass;
 #endif
 
 /**
@@ -52,7 +52,7 @@ typedef GtkVBoxClass SpiceGtkBoxClass;
  */
 struct _SpiceUsbDeviceWidget
 {
-    SpiceGtkBox parent;
+    _SpiceGtkBox parent;
 
     /*< private >*/
     SpiceUsbDeviceWidgetPrivate *priv;
@@ -67,7 +67,7 @@ struct _SpiceUsbDeviceWidget
  */
 struct _SpiceUsbDeviceWidgetClass
 {
-    SpiceGtkBoxClass parent_class;
+    _SpiceGtkBoxClass parent_class;
 
     /* signals */
     void (*connect_failed) (SpiceUsbDeviceWidget *widget,