[gupnp] Skip DeviceInfo VFuncs in GIR

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit dcfe8a6d7827548cecac36c5596b60db09f10e33
Author: Jens Georg <mail jensge org>
Date:   Sat May 14 14:20:38 2011 +0200

    Skip DeviceInfo VFuncs in GIR
    
    This fixes a name-clash with similar named functions with slightly
    different argument lists

 libgupnp/Makefile.am         |    2 +-
 libgupnp/gupnp-device-info.h |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/libgupnp/Makefile.am b/libgupnp/Makefile.am
index d901f7b..fa773f0 100644
--- a/libgupnp/Makefile.am
+++ b/libgupnp/Makefile.am
@@ -108,7 +108,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)
 if HAVE_INTROSPECTION
 GUPnP-1.0.gir: libgupnp-1.0.la
 GUPnP_1_0_gir_INCLUDES = libxml2-2.0 GObject-2.0 Soup-2.4 GSSDP-1.0
-GUPnP_1_0_gir_CFLAGS = $(INCLUDES) $(AM_CFLAGS)
+GUPnP_1_0_gir_CFLAGS = -DGOBJECT_INTROSPECTION_SKIP $(INCLUDES) $(AM_CFLAGS)
 GUPnP_1_0_gir_LIBS = libgupnp-1.0.la
 GUPnP_1_0_gir_FILES = $(introspection_sources)
 GUPnP_1_0_gir_NAMESPACE = GUPnP
diff --git a/libgupnp/gupnp-device-info.h b/libgupnp/gupnp-device-info.h
index f573c63..7b603d2 100644
--- a/libgupnp/gupnp-device-info.h
+++ b/libgupnp/gupnp-device-info.h
@@ -77,11 +77,15 @@ struct _GUPnPDeviceInfoClass {
 
         /* vtable */
         xmlNode          * (* get_element) (GUPnPDeviceInfo *info);
+
+        /* FIXME: Once we can break API/ABI, clean-up and rename the
+         * _get_device/_get_service functions */
+#ifndef GOBJECT_INTROSPECTION_SKIP
         GUPnPDeviceInfo  * (* get_device)  (GUPnPDeviceInfo *info,
                                             xmlNode         *element);
         GUPnPServiceInfo * (* get_service) (GUPnPDeviceInfo *info,
                                             xmlNode         *element);
-
+#endif
         /* future padding */
         void (* _gupnp_reserved1) (void);
         void (* _gupnp_reserved2) (void);