diff options
-rw-r--r-- | pango/pango-engine.h | 10 | ||||
-rw-r--r-- | pango/pango-font.h | 2 | ||||
-rw-r--r-- | pango/pango-item.h | 5 | ||||
-rw-r--r-- | pango/pango-modules.h | 7 | ||||
-rw-r--r-- | pango/pango-types.h | 2 |
5 files changed, 21 insertions, 5 deletions
diff --git a/pango/pango-engine.h b/pango/pango-engine.h index 8b99ec63..16b39c3f 100644 --- a/pango/pango-engine.h +++ b/pango/pango-engine.h @@ -30,6 +30,11 @@ G_BEGIN_DECLS +/* All of this is deprecated and entirely useless for bindings. + * Leave it out of the gir file. + */ +#ifndef __GI_SCANNER__ + #ifndef PANGO_DISABLE_DEPRECATED /** @@ -287,11 +292,6 @@ struct _PangoEngineInfo gint n_scripts; }; -/* We should to ignore these unprefixed symbols when going through - * this header with the introspection scanner - */ -#ifndef __GI_SCANNER__ - /** * script_engine_list: (skip) * @engines: location to store a pointer to an array of engines. diff --git a/pango/pango-font.h b/pango/pango-font.h index 1fbade27..76aa59a1 100644 --- a/pango/pango-font.h +++ b/pango/pango-font.h @@ -561,10 +561,12 @@ PangoFontDescription *pango_font_describe_with_absolute_size (PangoFont * PANGO_AVAILABLE_IN_ALL PangoCoverage * pango_font_get_coverage (PangoFont *font, PangoLanguage *language); +#ifndef __GI_SCANNER__ PANGO_DEPRECATED_IN_1_44 PangoEngineShape * pango_font_find_shaper (PangoFont *font, PangoLanguage *language, guint32 ch); +#endif PANGO_AVAILABLE_IN_ALL PangoFontMetrics * pango_font_get_metrics (PangoFont *font, PangoLanguage *language); diff --git a/pango/pango-item.h b/pango/pango-item.h index 9c02a45a..638f970a 100644 --- a/pango/pango-item.h +++ b/pango/pango-item.h @@ -77,8 +77,13 @@ typedef struct _PangoItem PangoItem; */ struct _PangoAnalysis { +#ifndef __GI_SCANNER__ PangoEngineShape *shape_engine; PangoEngineLang *lang_engine; +#else + gpointer shape_engine; + gpointer lang_engine; +#endif PangoFont *font; guint8 level; diff --git a/pango/pango-modules.h b/pango/pango-modules.h index 64900a17..54b347a2 100644 --- a/pango/pango-modules.h +++ b/pango/pango-modules.h @@ -26,6 +26,11 @@ G_BEGIN_DECLS +/* All of this is deprecated and entirely useless for bindings. + * Leave it out of the gir file. + */ +#ifndef __GI_SCANNER__ + #ifndef PANGO_DISABLE_DEPRECATED typedef struct _PangoMap PangoMap; @@ -72,6 +77,8 @@ void pango_module_register (PangoIncludedModule *module); #endif /* PANGO_DISABLE_DEPRECATED */ +#endif /* __GI_SCANNER__ */ + G_END_DECLS #endif /* __PANGO_MODULES_H__ */ diff --git a/pango/pango-types.h b/pango/pango-types.h index 82f879da..f9c0cf35 100644 --- a/pango/pango-types.h +++ b/pango/pango-types.h @@ -31,8 +31,10 @@ G_BEGIN_DECLS typedef struct _PangoLogAttr PangoLogAttr; +#ifndef __GI_SCANNER__ typedef struct _PangoEngineLang PangoEngineLang; typedef struct _PangoEngineShape PangoEngineShape; +#endif typedef struct _PangoFont PangoFont; typedef struct _PangoFontMap PangoFontMap; |