| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | The autoptr types should be excluded from gobject-introspection parsing as |
| 2 | they're not user-facing. |
| 3 | |
| 4 | Upstream-Status: Submitted |
| 5 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 6 | |
| 7 | diff --git a/gio/gio-autocleanups.h b/gio/gio-autocleanups.h |
| 8 | index a95ba65..24ccc2d 100644 |
| 9 | --- a/gio/gio-autocleanups.h |
| 10 | +++ b/gio/gio-autocleanups.h |
| 11 | @@ -21,6 +21,8 @@ |
| 12 | #error "Only <gio/gio.h> can be included directly." |
| 13 | #endif |
| 14 | |
| 15 | +#ifndef __GI_SCANNER__ |
| 16 | + |
| 17 | G_DEFINE_AUTOPTR_CLEANUP_FUNC(GAction, g_object_unref) |
| 18 | G_DEFINE_AUTOPTR_CLEANUP_FUNC(GActionMap, g_object_unref) |
| 19 | G_DEFINE_AUTOPTR_CLEANUP_FUNC(GAppInfo, g_object_unref) |
| 20 | @@ -146,3 +148,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVolume, g_object_unref) |
| 21 | G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVolumeMonitor, g_object_unref) |
| 22 | G_DEFINE_AUTOPTR_CLEANUP_FUNC(GZlibCompressor, g_object_unref) |
| 23 | G_DEFINE_AUTOPTR_CLEANUP_FUNC(GZlibDecompressor, g_object_unref) |
| 24 | + |
| 25 | +#endif |
| 26 | diff --git a/glib/glib-autocleanups.h b/glib/glib-autocleanups.h |
| 27 | index 6355f75..09d28be 100644 |
| 28 | --- a/glib/glib-autocleanups.h |
| 29 | +++ b/glib/glib-autocleanups.h |
| 30 | @@ -21,6 +21,8 @@ |
| 31 | #error "Only <glib.h> can be included directly." |
| 32 | #endif |
| 33 | |
| 34 | +#ifndef __GI_SCANNER__ |
| 35 | + |
| 36 | static inline void |
| 37 | g_autoptr_cleanup_generic_gfree (void *p) |
| 38 | { |
| 39 | @@ -87,3 +89,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVariantDict, g_variant_dict_unref) |
| 40 | G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GVariantDict, g_variant_dict_clear) |
| 41 | G_DEFINE_AUTOPTR_CLEANUP_FUNC(GVariantType, g_variant_type_free) |
| 42 | G_DEFINE_AUTO_CLEANUP_FREE_FUNC(GStrv, g_strfreev, NULL) |
| 43 | + |
| 44 | +#endif |
| 45 | diff --git a/gobject/gobject-autocleanups.h b/gobject/gobject-autocleanups.h |
| 46 | index 980203f..a1d4ba1 100644 |
| 47 | --- a/gobject/gobject-autocleanups.h |
| 48 | +++ b/gobject/gobject-autocleanups.h |
| 49 | @@ -21,6 +21,10 @@ |
| 50 | #error "Only <glib-object.h> can be included directly." |
| 51 | #endif |
| 52 | |
| 53 | +#ifndef __GI_SCANNER__ |
| 54 | + |
| 55 | G_DEFINE_AUTOPTR_CLEANUP_FUNC(GObject, g_object_unref) |
| 56 | G_DEFINE_AUTOPTR_CLEANUP_FUNC(GInitiallyUnowned, g_object_unref) |
| 57 | G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GValue, g_value_unset) |
| 58 | + |
| 59 | +#endif |