gir-repository r19 - in trunk: . gir
- From: walters svn gnome org
- To: svn-commits-list gnome org
- Subject: gir-repository r19 - in trunk: . gir
- Date: Thu, 14 Aug 2008 16:11:24 +0000 (UTC)
Author: walters
Date: Thu Aug 14 16:11:24 2008
New Revision: 19
URL: http://svn.gnome.org/viewvc/gir-repository?rev=19&view=rev
Log:
2008-08-13 Colin Walters <walters verbum org>
* gir/Makefile.am: Move glib-2.0.gir and gobject-2.0.gir
to gobject-introspection.
* gir/*.gir: Regenerate.
Modified:
trunk/ChangeLog
trunk/gir/Makefile.am
trunk/gir/cairo.gir
trunk/gir/pango-1.0.gir
Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am (original)
+++ trunk/gir/Makefile.am Thu Aug 14 16:11:24 2008
@@ -1,32 +1,5 @@
GIRSOURCES =
-# glib
-GLIB_INCLUDEDIR=`pkg-config --variable=includedir glib-2.0`/glib-2.0
-GLIB_LIBDIR=`pkg-config --variable=libdir glib-2.0`
-glib-2.0.gir:
- $(G_IR_SCANNER) -v --namespace GLib \
- --output $@ \
- --strip-prefix=g \
- -I$(GLIB_INCLUDEDIR) \
- -I$(GLIB_LIBDIR)/glib-2.0/include \
- -DGETTEXT_PACKAGE=Dummy \
- $(GLIB_INCLUDEDIR)/glib/*.h
-GIRSOURCES += glib-2.0.gir
-
-# gobject
-GOBJECT_LIBDIR=`pkg-config --variable=libdir gobject-2.0`
-gobject-2.0.gir:
- $(G_IR_SCANNER) -v --namespace GObject \
- --output $@ \
- --strip-prefix=g \
- --include=glib-2.0.gir \
- -I$(GLIB_INCLUDEDIR) \
- -I$(GLIB_LIBDIR)/glib-2.0/include \
- -DGOBJECT_COMPILATION \
- --pkg glib-2.0 \
- $(GLIB_INCLUDEDIR)/gobject/*.h
-GIRSOURCES += gobject-2.0.gir
-
# cairo
FT_INCLUDEDIR=`pkg-config --variable=includedir freetype2`/freetype2
CAIRO_INCLUDEDIR=`pkg-config --variable=includedir cairo`/cairo
@@ -44,6 +17,7 @@
PANGO_LIBDIR=`pkg-config --variable=libdir pango`
pango-1.0.gir: cairo.gir
$(G_IR_SCANNER) -v --namespace Pango \
+ --include=$(GIRDIR)/glib-2.0.gir \
--include=$(GIRDIR)/gobject-2.0.gir \
--include=cairo.gir \
--library=$(PANGO_LIBDIR)/libpango-1.0.so.0 \
@@ -59,6 +33,7 @@
ATK_LIBDIR=`pkg-config --variable=libdir atk`
atk.gir:
$(G_IR_SCANNER) -v --namespace Atk \
+ --include=$(GIRDIR)/glib-2.0.gir \
--include=$(GIRDIR)/gobject-2.0.gir \
--library=$(ATK_LIBDIR)/libatk-1.0.so.0 \
--output $@ \
@@ -72,6 +47,7 @@
GDK_LIBDIR=`pkg-config --variable=libdir gdk-2.0`
gdk-x11-2.0.gir:
$(G_IR_SCANNER) -v --namespace Gdk \
+ --include=$(GIRDIR)/glib-2.0.gir \
--include=$(GIRDIR)/gobject-2.0.gir \
--include=$(srcdir)/cairo.gir \
--include=$(srcdir)/pango-1.0.gir \
@@ -93,6 +69,7 @@
GTK_LIBDIR=`pkg-config --variable=libdir gtk+-2.0`
gtk-x11-2.0.gir:
$(G_IR_SCANNER) -v --namespace Gtk \
+ --include=$(GIRDIR)/glib-2.0.gir \
--include=$(GIRDIR)/gobject-2.0.gir \
--include=$(srcdir)/cairo.gir \
--include=$(srcdir)/pango-1.0.gir \
Modified: trunk/gir/cairo.gir
==============================================================================
--- trunk/gir/cairo.gir (original)
+++ trunk/gir/cairo.gir Thu Aug 14 16:11:24 2008
@@ -3,6 +3,8 @@
xmlns:c="http://www.gtk.org/introspection/c/1.0";
xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
<namespace name="Cairo">
+ <alias name="cairo_bool_t" target="int"/>
+ <alias name="cairo_path_data_t" target="_cairo_path_data_t"/>
<function name="version" c:identifier="cairo_version">
<return-value>
<type name="int32" c:type="int"/>
@@ -62,7 +64,7 @@
<type name="any" c:type="void*"/>
</parameter>
<parameter name="data">
- <type name="unsigned*" c:type="unsigned*"/>
+ <type name="unsigned" c:type="unsigned*"/>
</parameter>
<parameter name="length">
<type name="unsigned" c:type="unsigned"/>
@@ -78,7 +80,7 @@
<type name="any" c:type="void*"/>
</parameter>
<parameter name="data">
- <type name="unsigned*" c:type="unsigned*"/>
+ <type name="unsigned" c:type="unsigned*"/>
</parameter>
<parameter name="length">
<type name="unsigned" c:type="unsigned"/>
@@ -87,7 +89,7 @@
</callback>
<function name="create" c:identifier="cairo_create">
<return-value>
- <type name="cairo_t*" c:type="cairo_t*"/>
+ <type name="cairo_t" c:type="cairo_t*"/>
</return-value>
<parameters>
<parameter name="target">
@@ -97,7 +99,7 @@
</function>
<function name="reference" c:identifier="cairo_reference">
<return-value>
- <type name="cairo_t*" c:type="cairo_t*"/>
+ <type name="cairo_t" c:type="cairo_t*"/>
</return-value>
<parameters>
<parameter name="cr">
@@ -204,7 +206,7 @@
</function>
<function name="pop_group" c:identifier="cairo_pop_group">
<return-value>
- <type name="cairo_pattern_t*" c:type="cairo_pattern_t*"/>
+ <type name="cairo_pattern_t" c:type="cairo_pattern_t*"/>
</return-value>
<parameters>
<parameter name="cr">
@@ -1074,7 +1076,7 @@
<type name="cairo_status_t" c:type="cairo_status_t"/>
</field>
<field name="rectangles">
- <type name="cairo_rectangle_t*" c:type="cairo_rectangle_t*"/>
+ <type name="cairo_rectangle_t" c:type="cairo_rectangle_t*"/>
</field>
<field name="num_rectangles">
<type name="int32" c:type="int"/>
@@ -1084,7 +1086,7 @@
<function name="copy_clip_rectangle_list"
c:identifier="cairo_copy_clip_rectangle_list">
<return-value>
- <type name="cairo_rectangle_list_t*" c:type="cairo_rectangle_list_t*"/>
+ <type name="cairo_rectangle_list_t" c:type="cairo_rectangle_list_t*"/>
</return-value>
<parameters>
<parameter name="cr">
@@ -1113,12 +1115,12 @@
<function name="font_options_create"
c:identifier="cairo_font_options_create">
<return-value>
- <type name="cairo_font_options_t*" c:type="cairo_font_options_t*"/>
+ <type name="cairo_font_options_t" c:type="cairo_font_options_t*"/>
</return-value>
</function>
<function name="font_options_copy" c:identifier="cairo_font_options_copy">
<return-value>
- <type name="cairo_font_options_t*" c:type="cairo_font_options_t*"/>
+ <type name="cairo_font_options_t" c:type="cairo_font_options_t*"/>
</return-value>
<parameters>
<parameter name="original">
@@ -1385,7 +1387,7 @@
</function>
<function name="get_font_face" c:identifier="cairo_get_font_face">
<return-value>
- <type name="cairo_font_face_t*" c:type="cairo_font_face_t*"/>
+ <type name="cairo_font_face_t" c:type="cairo_font_face_t*"/>
</return-value>
<parameters>
<parameter name="cr">
@@ -1408,7 +1410,7 @@
</function>
<function name="get_scaled_font" c:identifier="cairo_get_scaled_font">
<return-value>
- <type name="cairo_scaled_font_t*" c:type="cairo_scaled_font_t*"/>
+ <type name="cairo_scaled_font_t" c:type="cairo_scaled_font_t*"/>
</return-value>
<parameters>
<parameter name="cr">
@@ -1525,7 +1527,7 @@
<function name="font_face_reference"
c:identifier="cairo_font_face_reference">
<return-value>
- <type name="cairo_font_face_t*" c:type="cairo_font_face_t*"/>
+ <type name="cairo_font_face_t" c:type="cairo_font_face_t*"/>
</return-value>
<parameters>
<parameter name="font_face">
@@ -1612,7 +1614,7 @@
<function name="scaled_font_create"
c:identifier="cairo_scaled_font_create">
<return-value>
- <type name="cairo_scaled_font_t*" c:type="cairo_scaled_font_t*"/>
+ <type name="cairo_scaled_font_t" c:type="cairo_scaled_font_t*"/>
</return-value>
<parameters>
<parameter name="font_face">
@@ -1632,7 +1634,7 @@
<function name="scaled_font_reference"
c:identifier="cairo_scaled_font_reference">
<return-value>
- <type name="cairo_scaled_font_t*" c:type="cairo_scaled_font_t*"/>
+ <type name="cairo_scaled_font_t" c:type="cairo_scaled_font_t*"/>
</return-value>
<parameters>
<parameter name="scaled_font">
@@ -1772,7 +1774,7 @@
<function name="scaled_font_get_font_face"
c:identifier="cairo_scaled_font_get_font_face">
<return-value>
- <type name="cairo_font_face_t*" c:type="cairo_font_face_t*"/>
+ <type name="cairo_font_face_t" c:type="cairo_font_face_t*"/>
</return-value>
<parameters>
<parameter name="scaled_font">
@@ -1834,7 +1836,7 @@
</function>
<function name="get_source" c:identifier="cairo_get_source">
<return-value>
- <type name="cairo_pattern_t*" c:type="cairo_pattern_t*"/>
+ <type name="cairo_pattern_t" c:type="cairo_pattern_t*"/>
</return-value>
<parameters>
<parameter name="cr">
@@ -1979,7 +1981,7 @@
</function>
<function name="get_target" c:identifier="cairo_get_target">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="cr">
@@ -1989,7 +1991,7 @@
</function>
<function name="get_group_target" c:identifier="cairo_get_group_target">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="cr">
@@ -2002,7 +2004,7 @@
<type name="cairo_status_t" c:type="cairo_status_t"/>
</field>
<field name="data">
- <type name="cairo_path_data_t*" c:type="cairo_path_data_t*"/>
+ <type name="cairo_path_data_t" c:type="cairo_path_data_t*"/>
</field>
<field name="num_data">
<type name="int32" c:type="int"/>
@@ -2011,7 +2013,7 @@
<record name="cairo_path_t" c:type="cairo_path_t"/>
<function name="copy_path" c:identifier="cairo_copy_path">
<return-value>
- <type name="cairo_path_t*" c:type="cairo_path_t*"/>
+ <type name="cairo_path_t" c:type="cairo_path_t*"/>
</return-value>
<parameters>
<parameter name="cr">
@@ -2021,7 +2023,7 @@
</function>
<function name="copy_path_flat" c:identifier="cairo_copy_path_flat">
<return-value>
- <type name="cairo_path_t*" c:type="cairo_path_t*"/>
+ <type name="cairo_path_t" c:type="cairo_path_t*"/>
</return-value>
<parameters>
<parameter name="cr">
@@ -2075,7 +2077,7 @@
<function name="surface_create_similar"
c:identifier="cairo_surface_create_similar">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="other">
@@ -2094,7 +2096,7 @@
</function>
<function name="surface_reference" c:identifier="cairo_surface_reference">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="surface">
@@ -2361,7 +2363,7 @@
<function name="image_surface_create"
c:identifier="cairo_image_surface_create">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="format">
@@ -2392,7 +2394,7 @@
<function name="image_surface_create_for_data"
c:identifier="cairo_image_surface_create_for_data">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="data">
@@ -2415,7 +2417,7 @@
<function name="image_surface_get_data"
c:identifier="cairo_image_surface_get_data">
<return-value>
- <type name="unsigned*" c:type="unsigned*"/>
+ <type name="unsigned" c:type="unsigned*"/>
</return-value>
<parameters>
<parameter name="surface">
@@ -2470,7 +2472,7 @@
<function name="image_surface_create_from_png"
c:identifier="cairo_image_surface_create_from_png">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="filename">
@@ -2481,7 +2483,7 @@
<function name="image_surface_create_from_png_stream"
c:identifier="cairo_image_surface_create_from_png_stream">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="read_func">
@@ -2495,7 +2497,7 @@
<function name="pattern_create_rgb"
c:identifier="cairo_pattern_create_rgb">
<return-value>
- <type name="cairo_pattern_t*" c:type="cairo_pattern_t*"/>
+ <type name="cairo_pattern_t" c:type="cairo_pattern_t*"/>
</return-value>
<parameters>
<parameter name="red">
@@ -2512,7 +2514,7 @@
<function name="pattern_create_rgba"
c:identifier="cairo_pattern_create_rgba">
<return-value>
- <type name="cairo_pattern_t*" c:type="cairo_pattern_t*"/>
+ <type name="cairo_pattern_t" c:type="cairo_pattern_t*"/>
</return-value>
<parameters>
<parameter name="red">
@@ -2532,7 +2534,7 @@
<function name="pattern_create_for_surface"
c:identifier="cairo_pattern_create_for_surface">
<return-value>
- <type name="cairo_pattern_t*" c:type="cairo_pattern_t*"/>
+ <type name="cairo_pattern_t" c:type="cairo_pattern_t*"/>
</return-value>
<parameters>
<parameter name="surface">
@@ -2543,7 +2545,7 @@
<function name="pattern_create_linear"
c:identifier="cairo_pattern_create_linear">
<return-value>
- <type name="cairo_pattern_t*" c:type="cairo_pattern_t*"/>
+ <type name="cairo_pattern_t" c:type="cairo_pattern_t*"/>
</return-value>
<parameters>
<parameter name="x0">
@@ -2563,7 +2565,7 @@
<function name="pattern_create_radial"
c:identifier="cairo_pattern_create_radial">
<return-value>
- <type name="cairo_pattern_t*" c:type="cairo_pattern_t*"/>
+ <type name="cairo_pattern_t" c:type="cairo_pattern_t*"/>
</return-value>
<parameters>
<parameter name="cx0">
@@ -2588,7 +2590,7 @@
</function>
<function name="pattern_reference" c:identifier="cairo_pattern_reference">
<return-value>
- <type name="cairo_pattern_t*" c:type="cairo_pattern_t*"/>
+ <type name="cairo_pattern_t" c:type="cairo_pattern_t*"/>
</return-value>
<parameters>
<parameter name="pattern">
@@ -3129,7 +3131,7 @@
<function name="ft_font_face_create_for_pattern"
c:identifier="cairo_ft_font_face_create_for_pattern">
<return-value>
- <type name="cairo_font_face_t*" c:type="cairo_font_face_t*"/>
+ <type name="cairo_font_face_t" c:type="cairo_font_face_t*"/>
</return-value>
<parameters>
<parameter name="pattern">
@@ -3154,7 +3156,7 @@
<function name="ft_font_face_create_for_ft_face"
c:identifier="cairo_ft_font_face_create_for_ft_face">
<return-value>
- <type name="cairo_font_face_t*" c:type="cairo_font_face_t*"/>
+ <type name="cairo_font_face_t" c:type="cairo_font_face_t*"/>
</return-value>
<parameters>
<parameter name="face">
@@ -3190,7 +3192,7 @@
<function name="pdf_surface_create"
c:identifier="cairo_pdf_surface_create">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="filename">
@@ -3207,7 +3209,7 @@
<function name="pdf_surface_create_for_stream"
c:identifier="cairo_pdf_surface_create_for_stream">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="write_func">
@@ -3243,7 +3245,7 @@
</function>
<function name="ps_surface_create" c:identifier="cairo_ps_surface_create">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="filename">
@@ -3260,7 +3262,7 @@
<function name="ps_surface_create_for_stream"
c:identifier="cairo_ps_surface_create_for_stream">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="write_func">
@@ -3396,7 +3398,7 @@
<function name="svg_surface_create"
c:identifier="cairo_svg_surface_create">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="filename">
@@ -3413,7 +3415,7 @@
<function name="svg_surface_create_for_stream"
c:identifier="cairo_svg_surface_create_for_stream">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="write_func">
@@ -3471,7 +3473,7 @@
<function name="xlib_surface_create"
c:identifier="cairo_xlib_surface_create">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="dpy">
@@ -3494,7 +3496,7 @@
<function name="xlib_surface_create_for_bitmap"
c:identifier="cairo_xlib_surface_create_for_bitmap">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="dpy">
@@ -3554,7 +3556,7 @@
<function name="xlib_surface_get_display"
c:identifier="cairo_xlib_surface_get_display">
<return-value>
- <type name="Display*" c:type="Display*"/>
+ <type name="Display" c:type="Display*"/>
</return-value>
<parameters>
<parameter name="surface">
@@ -3576,7 +3578,7 @@
<function name="xlib_surface_get_screen"
c:identifier="cairo_xlib_surface_get_screen">
<return-value>
- <type name="Screen*" c:type="Screen*"/>
+ <type name="Screen" c:type="Screen*"/>
</return-value>
<parameters>
<parameter name="surface">
@@ -3587,7 +3589,7 @@
<function name="xlib_surface_get_visual"
c:identifier="cairo_xlib_surface_get_visual">
<return-value>
- <type name="Visual*" c:type="Visual*"/>
+ <type name="Visual" c:type="Visual*"/>
</return-value>
<parameters>
<parameter name="surface">
@@ -3631,7 +3633,7 @@
<function name="xlib_surface_create_with_xrender_format"
c:identifier="cairo_xlib_surface_create_with_xrender_format">
<return-value>
- <type name="cairo_surface_t*" c:type="cairo_surface_t*"/>
+ <type name="cairo_surface_t" c:type="cairo_surface_t*"/>
</return-value>
<parameters>
<parameter name="dpy">
@@ -3657,7 +3659,7 @@
<function name="xlib_surface_get_xrender_format"
c:identifier="cairo_xlib_surface_get_xrender_format">
<return-value>
- <type name="XRenderPictFormat*" c:type="XRenderPictFormat*"/>
+ <type name="XRenderPictFormat" c:type="XRenderPictFormat*"/>
</return-value>
<parameters>
<parameter name="surface">
Modified: trunk/gir/pango-1.0.gir
==============================================================================
--- trunk/gir/pango-1.0.gir (original)
+++ trunk/gir/pango-1.0.gir Thu Aug 14 16:11:24 2008
@@ -3,6 +3,10 @@
xmlns:c="http://www.gtk.org/introspection/c/1.0";
xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
<namespace name="Pango">
+ <alias name="PangoGlyph" target="guint32"/>
+ <alias name="PangoGlyphUnit" target="gint32"/>
+ <alias name="PangoLayoutRun" target="PangoGlyphItem"/>
+ <alias name="PangoXSubfont" target="guint16"/>
<record name="PangoCoverage" c:type="PangoCoverage"/>
<enumeration name="CoverageLevel"
c:type="PangoCoverageLevel"
@@ -27,12 +31,12 @@
</enumeration>
<function name="coverage_new" c:identifier="pango_coverage_new">
<return-value>
- <type name="PangoCoverage*" c:type="PangoCoverage*"/>
+ <type name="PangoCoverage" c:type="PangoCoverage*"/>
</return-value>
</function>
<function name="coverage_ref" c:identifier="pango_coverage_ref">
<return-value>
- <type name="PangoCoverage*" c:type="PangoCoverage*"/>
+ <type name="PangoCoverage" c:type="PangoCoverage*"/>
</return-value>
<parameters>
<parameter name="coverage">
@@ -52,7 +56,7 @@
</function>
<function name="coverage_copy" c:identifier="pango_coverage_copy">
<return-value>
- <type name="PangoCoverage*" c:type="PangoCoverage*"/>
+ <type name="PangoCoverage" c:type="PangoCoverage*"/>
</return-value>
<parameters>
<parameter name="coverage">
@@ -62,7 +66,7 @@
</function>
<function name="coverage_get" c:identifier="pango_coverage_get">
<return-value>
- <type name="PangoCoverageLevel" c:type="PangoCoverageLevel"/>
+ <type name="CoverageLevel" c:type="PangoCoverageLevel"/>
</return-value>
<parameters>
<parameter name="coverage">
@@ -85,7 +89,7 @@
<type name="int32" c:type="int"/>
</parameter>
<parameter name="level">
- <type name="PangoCoverageLevel" c:type="PangoCoverageLevel"/>
+ <type name="CoverageLevel" c:type="PangoCoverageLevel"/>
</parameter>
</parameters>
</function>
@@ -111,7 +115,7 @@
<type name="PangoCoverage" c:type="PangoCoverage*"/>
</parameter>
<parameter name="bytes">
- <type name="guchar" c:type="guchar**"/>
+ <type name="GLib.guchar" c:type="guchar**"/>
</parameter>
<parameter name="n_bytes">
<type name="int" c:type="int*"/>
@@ -121,11 +125,11 @@
<function name="coverage_from_bytes"
c:identifier="pango_coverage_from_bytes">
<return-value>
- <type name="PangoCoverage*" c:type="PangoCoverage*"/>
+ <type name="PangoCoverage" c:type="PangoCoverage*"/>
</return-value>
<parameters>
<parameter name="bytes">
- <type name="guchar" c:type="guchar*"/>
+ <type name="GLib.guchar" c:type="guchar*"/>
</parameter>
<parameter name="n_bytes">
<type name="int32" c:type="int"/>
@@ -134,43 +138,40 @@
</function>
<record name="PangoLogAttr" c:type="PangoLogAttr">
<field name="is_line_break">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
<field name="is_mandatory_break">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
<field name="is_char_break">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
<field name="is_white">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
<field name="is_cursor_position">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
<field name="is_word_start">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
<field name="is_word_end">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
<field name="is_sentence_boundary">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
<field name="is_sentence_start">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
<field name="is_sentence_end">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
<field name="backspace_deletes_character">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
<field name="is_expandable_space">
- <type name="guint" c:type="guint"/>
- </field>
- <field name="is_word_boundary">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
</record>
<record name="PangoEngineLang" c:type="PangoEngineLang"/>
@@ -222,6 +223,75 @@
</parameter>
</parameters>
</function>
+ <enumeration name="Direction"
+ c:type="PangoDirection"
+ glib:type-name="PangoDirection"
+ glib:get-type="pango_direction_get_type">
+ <member name="ltr"
+ value="0"
+ c:identifier="PANGO_DIRECTION_LTR"
+ glib:nick="ltr"/>
+ <member name="rtl"
+ value="1"
+ c:identifier="PANGO_DIRECTION_RTL"
+ glib:nick="rtl"/>
+ <member name="ttb-ltr"
+ value="2"
+ c:identifier="PANGO_DIRECTION_TTB_LTR"
+ glib:nick="ttb-ltr"/>
+ <member name="ttb-rtl"
+ value="3"
+ c:identifier="PANGO_DIRECTION_TTB_RTL"
+ glib:nick="ttb-rtl"/>
+ <member name="weak-ltr"
+ value="4"
+ c:identifier="PANGO_DIRECTION_WEAK_LTR"
+ glib:nick="weak-ltr"/>
+ <member name="weak-rtl"
+ value="5"
+ c:identifier="PANGO_DIRECTION_WEAK_RTL"
+ glib:nick="weak-rtl"/>
+ <member name="neutral"
+ value="6"
+ c:identifier="PANGO_DIRECTION_NEUTRAL"
+ glib:nick="neutral"/>
+ </enumeration>
+ <function name="unichar_direction" c:identifier="pango_unichar_direction">
+ <return-value>
+ <type name="Direction" c:type="PangoDirection"/>
+ </return-value>
+ <parameters>
+ <parameter name="ch">
+ <type name="GLib.gunichar" c:type="gunichar"/>
+ </parameter>
+ </parameters>
+ </function>
+ <function name="find_base_dir" c:identifier="pango_find_base_dir">
+ <return-value>
+ <type name="Direction" c:type="PangoDirection"/>
+ </return-value>
+ <parameters>
+ <parameter name="text">
+ <type name="string" c:type="gchar*"/>
+ </parameter>
+ <parameter name="length">
+ <type name="int32" c:type="gint"/>
+ </parameter>
+ </parameters>
+ </function>
+ <function name="get_mirror_char" c:identifier="pango_get_mirror_char">
+ <return-value>
+ <type name="boolean" c:type="gboolean"/>
+ </return-value>
+ <parameters>
+ <parameter name="ch">
+ <type name="GLib.gunichar" c:type="gunichar"/>
+ </parameter>
+ <parameter name="mirrored_ch">
+ <type name="GLib.gunichar" c:type="gunichar*"/>
+ </parameter>
+ </parameters>
+ </function>
<enumeration name="Gravity"
c:type="PangoGravity"
glib:type-name="PangoGravity"
@@ -475,7 +545,7 @@
<type name="Language" c:type="PangoLanguage*"/>
</parameter>
<parameter name="script">
- <type name="PangoScript" c:type="PangoScript"/>
+ <type name="Script" c:type="PangoScript"/>
</parameter>
</parameters>
</method>
@@ -805,17 +875,17 @@
<function name="script_for_unichar"
c:identifier="pango_script_for_unichar">
<return-value>
- <type name="PangoScript" c:type="PangoScript"/>
+ <type name="Script" c:type="PangoScript"/>
</return-value>
<parameters>
<parameter name="ch">
- <type name="gunichar" c:type="gunichar"/>
+ <type name="GLib.gunichar" c:type="gunichar"/>
</parameter>
</parameters>
</function>
<function name="script_iter_new" c:identifier="pango_script_iter_new">
<return-value>
- <type name="PangoScriptIter*" c:type="PangoScriptIter*"/>
+ <type name="PangoScriptIter" c:type="PangoScriptIter*"/>
</return-value>
<parameters>
<parameter name="text">
@@ -842,7 +912,7 @@
<type name="char" c:type="char**"/>
</parameter>
<parameter name="script">
- <type name="PangoScript" c:type="PangoScript*"/>
+ <type name="Script" c:type="PangoScript*"/>
</parameter>
</parameters>
</function>
@@ -869,11 +939,11 @@
<function name="script_get_sample_language"
c:identifier="pango_script_get_sample_language">
<return-value>
- <type name="PangoLanguage*" c:type="PangoLanguage*"/>
+ <type name="Language" c:type="PangoLanguage*"/>
</return-value>
<parameters>
<parameter name="script">
- <type name="PangoScript" c:type="PangoScript"/>
+ <type name="Script" c:type="PangoScript"/>
</parameter>
</parameters>
</function>
@@ -884,14 +954,14 @@
</return-value>
<parameters>
<parameter name="gravity">
- <type name="PangoGravity" c:type="PangoGravity"/>
+ <type name="Gravity" c:type="PangoGravity"/>
</parameter>
</parameters>
</function>
<function name="gravity_get_for_matrix"
c:identifier="pango_gravity_get_for_matrix">
<return-value>
- <type name="PangoGravity" c:type="PangoGravity"/>
+ <type name="Gravity" c:type="PangoGravity"/>
</return-value>
<parameters>
<parameter name="matrix">
@@ -902,178 +972,17 @@
<function name="gravity_get_for_script"
c:identifier="pango_gravity_get_for_script">
<return-value>
- <type name="PangoGravity" c:type="PangoGravity"/>
+ <type name="Gravity" c:type="PangoGravity"/>
</return-value>
<parameters>
<parameter name="script">
- <type name="PangoScript" c:type="PangoScript"/>
+ <type name="Script" c:type="PangoScript"/>
</parameter>
<parameter name="base_gravity">
- <type name="PangoGravity" c:type="PangoGravity"/>
+ <type name="Gravity" c:type="PangoGravity"/>
</parameter>
<parameter name="hint">
- <type name="PangoGravityHint" c:type="PangoGravityHint"/>
- </parameter>
- </parameters>
- </function>
- <enumeration name="BidiType"
- c:type="PangoBidiType"
- glib:type-name="PangoBidiType"
- glib:get-type="pango_bidi_type_get_type">
- <member name="l"
- value="0"
- c:identifier="PANGO_BIDI_TYPE_L"
- glib:nick="l"/>
- <member name="lre"
- value="1"
- c:identifier="PANGO_BIDI_TYPE_LRE"
- glib:nick="lre"/>
- <member name="lro"
- value="2"
- c:identifier="PANGO_BIDI_TYPE_LRO"
- glib:nick="lro"/>
- <member name="r"
- value="3"
- c:identifier="PANGO_BIDI_TYPE_R"
- glib:nick="r"/>
- <member name="al"
- value="4"
- c:identifier="PANGO_BIDI_TYPE_AL"
- glib:nick="al"/>
- <member name="rle"
- value="5"
- c:identifier="PANGO_BIDI_TYPE_RLE"
- glib:nick="rle"/>
- <member name="rlo"
- value="6"
- c:identifier="PANGO_BIDI_TYPE_RLO"
- glib:nick="rlo"/>
- <member name="pdf"
- value="7"
- c:identifier="PANGO_BIDI_TYPE_PDF"
- glib:nick="pdf"/>
- <member name="en"
- value="8"
- c:identifier="PANGO_BIDI_TYPE_EN"
- glib:nick="en"/>
- <member name="es"
- value="9"
- c:identifier="PANGO_BIDI_TYPE_ES"
- glib:nick="es"/>
- <member name="et"
- value="10"
- c:identifier="PANGO_BIDI_TYPE_ET"
- glib:nick="et"/>
- <member name="an"
- value="11"
- c:identifier="PANGO_BIDI_TYPE_AN"
- glib:nick="an"/>
- <member name="cs"
- value="12"
- c:identifier="PANGO_BIDI_TYPE_CS"
- glib:nick="cs"/>
- <member name="nsm"
- value="13"
- c:identifier="PANGO_BIDI_TYPE_NSM"
- glib:nick="nsm"/>
- <member name="bn"
- value="14"
- c:identifier="PANGO_BIDI_TYPE_BN"
- glib:nick="bn"/>
- <member name="b"
- value="15"
- c:identifier="PANGO_BIDI_TYPE_B"
- glib:nick="b"/>
- <member name="s"
- value="16"
- c:identifier="PANGO_BIDI_TYPE_S"
- glib:nick="s"/>
- <member name="ws"
- value="17"
- c:identifier="PANGO_BIDI_TYPE_WS"
- glib:nick="ws"/>
- <member name="on"
- value="18"
- c:identifier="PANGO_BIDI_TYPE_ON"
- glib:nick="on"/>
- </enumeration>
- <function name="bidi_type_for_unichar"
- c:identifier="pango_bidi_type_for_unichar">
- <return-value>
- <type name="PangoBidiType" c:type="PangoBidiType"/>
- </return-value>
- <parameters>
- <parameter name="ch">
- <type name="gunichar" c:type="gunichar"/>
- </parameter>
- </parameters>
- </function>
- <enumeration name="Direction"
- c:type="PangoDirection"
- glib:type-name="PangoDirection"
- glib:get-type="pango_direction_get_type">
- <member name="ltr"
- value="0"
- c:identifier="PANGO_DIRECTION_LTR"
- glib:nick="ltr"/>
- <member name="rtl"
- value="1"
- c:identifier="PANGO_DIRECTION_RTL"
- glib:nick="rtl"/>
- <member name="ttb-ltr"
- value="2"
- c:identifier="PANGO_DIRECTION_TTB_LTR"
- glib:nick="ttb-ltr"/>
- <member name="ttb-rtl"
- value="3"
- c:identifier="PANGO_DIRECTION_TTB_RTL"
- glib:nick="ttb-rtl"/>
- <member name="weak-ltr"
- value="4"
- c:identifier="PANGO_DIRECTION_WEAK_LTR"
- glib:nick="weak-ltr"/>
- <member name="weak-rtl"
- value="5"
- c:identifier="PANGO_DIRECTION_WEAK_RTL"
- glib:nick="weak-rtl"/>
- <member name="neutral"
- value="6"
- c:identifier="PANGO_DIRECTION_NEUTRAL"
- glib:nick="neutral"/>
- </enumeration>
- <function name="unichar_direction" c:identifier="pango_unichar_direction">
- <return-value>
- <type name="PangoDirection" c:type="PangoDirection"/>
- </return-value>
- <parameters>
- <parameter name="ch">
- <type name="gunichar" c:type="gunichar"/>
- </parameter>
- </parameters>
- </function>
- <function name="find_base_dir" c:identifier="pango_find_base_dir">
- <return-value>
- <type name="PangoDirection" c:type="PangoDirection"/>
- </return-value>
- <parameters>
- <parameter name="text">
- <type name="string" c:type="gchar*"/>
- </parameter>
- <parameter name="length">
- <type name="int32" c:type="gint"/>
- </parameter>
- </parameters>
- </function>
- <function name="get_mirror_char" c:identifier="pango_get_mirror_char">
- <return-value>
- <type name="boolean" c:type="gboolean"/>
- </return-value>
- <parameters>
- <parameter name="ch">
- <type name="gunichar" c:type="gunichar"/>
- </parameter>
- <parameter name="mirrored_ch">
- <type name="gunichar" c:type="gunichar*"/>
+ <type name="GravityHint" c:type="PangoGravityHint"/>
</parameter>
</parameters>
</function>
@@ -1257,7 +1166,7 @@
</constructor>
<method name="hash" c:identifier="pango_font_description_hash">
<return-value>
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</return-value>
<parameters>
<parameter name="desc">
@@ -1336,13 +1245,13 @@
<type name="FontDescription" c:type="PangoFontDescription*"/>
</parameter>
<parameter name="style">
- <type name="PangoStyle" c:type="PangoStyle"/>
+ <type name="Style" c:type="PangoStyle"/>
</parameter>
</parameters>
</method>
<method name="get_style" c:identifier="pango_font_description_get_style">
<return-value>
- <type name="PangoStyle" c:type="PangoStyle"/>
+ <type name="Style" c:type="PangoStyle"/>
</return-value>
<parameters>
<parameter name="desc">
@@ -1360,14 +1269,14 @@
<type name="FontDescription" c:type="PangoFontDescription*"/>
</parameter>
<parameter name="variant">
- <type name="PangoVariant" c:type="PangoVariant"/>
+ <type name="Variant" c:type="PangoVariant"/>
</parameter>
</parameters>
</method>
<method name="get_variant"
c:identifier="pango_font_description_get_variant">
<return-value>
- <type name="PangoVariant" c:type="PangoVariant"/>
+ <type name="Variant" c:type="PangoVariant"/>
</return-value>
<parameters>
<parameter name="desc">
@@ -1385,14 +1294,14 @@
<type name="FontDescription" c:type="PangoFontDescription*"/>
</parameter>
<parameter name="weight">
- <type name="PangoWeight" c:type="PangoWeight"/>
+ <type name="Weight" c:type="PangoWeight"/>
</parameter>
</parameters>
</method>
<method name="get_weight"
c:identifier="pango_font_description_get_weight">
<return-value>
- <type name="PangoWeight" c:type="PangoWeight"/>
+ <type name="Weight" c:type="PangoWeight"/>
</return-value>
<parameters>
<parameter name="desc">
@@ -1410,14 +1319,14 @@
<type name="FontDescription" c:type="PangoFontDescription*"/>
</parameter>
<parameter name="stretch">
- <type name="PangoStretch" c:type="PangoStretch"/>
+ <type name="Stretch" c:type="PangoStretch"/>
</parameter>
</parameters>
</method>
<method name="get_stretch"
c:identifier="pango_font_description_get_stretch">
<return-value>
- <type name="PangoStretch" c:type="PangoStretch"/>
+ <type name="Stretch" c:type="PangoStretch"/>
</return-value>
<parameters>
<parameter name="desc">
@@ -1483,14 +1392,14 @@
<type name="FontDescription" c:type="PangoFontDescription*"/>
</parameter>
<parameter name="gravity">
- <type name="PangoGravity" c:type="PangoGravity"/>
+ <type name="Gravity" c:type="PangoGravity"/>
</parameter>
</parameters>
</method>
<method name="get_gravity"
c:identifier="pango_font_description_get_gravity">
<return-value>
- <type name="PangoGravity" c:type="PangoGravity"/>
+ <type name="Gravity" c:type="PangoGravity"/>
</return-value>
<parameters>
<parameter name="desc">
@@ -1501,7 +1410,7 @@
<method name="get_set_fields"
c:identifier="pango_font_description_get_set_fields">
<return-value>
- <type name="PangoFontMask" c:type="PangoFontMask"/>
+ <type name="FontMask" c:type="PangoFontMask"/>
</return-value>
<parameters>
<parameter name="desc">
@@ -1519,7 +1428,7 @@
<type name="FontDescription" c:type="PangoFontDescription*"/>
</parameter>
<parameter name="to_unset">
- <type name="PangoFontMask" c:type="PangoFontMask"/>
+ <type name="FontMask" c:type="PangoFontMask"/>
</parameter>
</parameters>
</method>
@@ -1722,7 +1631,7 @@
</glib:boxed>
<class name="FontFamily"
c:type="PangoFontFamily"
- parent="GLib.Object"
+ parent="GObject.Object"
glib:type-name="PangoFontFamily"
glib:get-type="pango_font_family_get_type">
<method name="list_faces" c:identifier="pango_font_family_list_faces">
@@ -1734,7 +1643,7 @@
<type name="FontFamily" c:type="PangoFontFamily*"/>
</parameter>
<parameter name="faces">
- <type name="PangoFontFace" c:type="PangoFontFace***"/>
+ <type name="FontFace" c:type="PangoFontFace***"/>
</parameter>
<parameter name="n_faces">
<type name="int" c:type="int*"/>
@@ -1765,7 +1674,7 @@
</class>
<class name="FontFace"
c:type="PangoFontFace"
- parent="GLib.Object"
+ parent="GObject.Object"
glib:type-name="PangoFontFace"
glib:get-type="pango_font_face_get_type">
<method name="describe" c:identifier="pango_font_face_describe">
@@ -1819,7 +1728,7 @@
</class>
<class name="Font"
c:type="PangoFont"
- parent="GLib.Object"
+ parent="GObject.Object"
glib:type-name="PangoFont"
glib:get-type="pango_font_get_type">
<constructor name="map_load_font"
@@ -1832,7 +1741,7 @@
<type name="FontMap" c:type="PangoFontMap*"/>
</parameter>
<parameter name="context">
- <type name="PangoContext" c:type="PangoContext*"/>
+ <type name="Context" c:type="PangoContext*"/>
</parameter>
<parameter name="desc">
<type name="FontDescription" c:type="PangoFontDescription*"/>
@@ -1924,7 +1833,7 @@
</method>
<method name="get_font_map" c:identifier="pango_font_get_font_map">
<return-value>
- <type name="PangoFontMap" c:type="PangoFontMap*"/>
+ <type name="FontMap" c:type="PangoFontMap*"/>
</return-value>
<parameters>
<parameter name="font">
@@ -1983,13 +1892,13 @@
</glib:boxed>
<record name="PangoAttribute" c:type="PangoAttribute">
<field name="klass">
- <type name="PangoAttrClass*" c:type="PangoAttrClass*"/>
+ <type name="PangoAttrClass" c:type="PangoAttrClass*"/>
</field>
<field name="start_index">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
<field name="end_index">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
</record>
<record name="PangoAttrString" c:type="PangoAttrString">
@@ -2005,7 +1914,7 @@
<type name="PangoAttribute" c:type="PangoAttribute"/>
</field>
<field name="value">
- <type name="PangoLanguage*" c:type="PangoLanguage*"/>
+ <type name="Language" c:type="PangoLanguage*"/>
</field>
</record>
<record name="PangoAttrInt" c:type="PangoAttrInt">
@@ -2024,7 +1933,7 @@
<type name="int32" c:type="int"/>
</field>
<field name="absolute">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
</record>
<record name="PangoAttrFloat" c:type="PangoAttrFloat">
@@ -2040,7 +1949,7 @@
<type name="PangoAttribute" c:type="PangoAttribute"/>
</field>
<field name="color">
- <type name="PangoColor" c:type="PangoColor"/>
+ <type name="Color" c:type="PangoColor"/>
</field>
</record>
<record name="PangoAttrFontDesc" c:type="PangoAttrFontDesc">
@@ -2048,7 +1957,7 @@
<type name="PangoAttribute" c:type="PangoAttribute"/>
</field>
<field name="desc">
- <type name="PangoFontDescription*" c:type="PangoFontDescription*"/>
+ <type name="FontDescription" c:type="PangoFontDescription*"/>
</field>
</record>
<record name="PangoAttrShape" c:type="PangoAttrShape">
@@ -2068,7 +1977,7 @@
<type name="PangoAttrDataCopyFunc" c:type="PangoAttrDataCopyFunc"/>
</field>
<field name="destroy_func">
- <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+ <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
</field>
</record>
<record name="PangoAttrIterator" c:type="PangoAttrIterator"/>
@@ -2200,7 +2109,7 @@
</return-value>
<parameters>
<parameter name="attribute">
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</parameter>
<parameter name="data">
<type name="any" c:type="gpointer"/>
@@ -2220,7 +2129,7 @@
<function name="attr_type_register"
c:identifier="pango_attr_type_register">
<return-value>
- <type name="PangoAttrType" c:type="PangoAttrType"/>
+ <type name="AttrType" c:type="PangoAttrType"/>
</return-value>
<parameters>
<parameter name="name">
@@ -2228,17 +2137,6 @@
</parameter>
</parameters>
</function>
- <function name="attr_type_get_name"
- c:identifier="pango_attr_type_get_name">
- <return-value>
- <type name="string" c:type="char*"/>
- </return-value>
- <parameters>
- <parameter name="type">
- <type name="PangoAttrType" c:type="PangoAttrType"/>
- </parameter>
- </parameters>
- </function>
<function name="attribute_init" c:identifier="pango_attribute_init">
<return-value>
<type name="none" c:type="void"/>
@@ -2254,7 +2152,7 @@
</function>
<function name="attribute_copy" c:identifier="pango_attribute_copy">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="attr">
@@ -2287,7 +2185,7 @@
</function>
<function name="attr_language_new" c:identifier="pango_attr_language_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="language">
@@ -2297,7 +2195,7 @@
</function>
<function name="attr_family_new" c:identifier="pango_attr_family_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="family">
@@ -2308,7 +2206,7 @@
<function name="attr_foreground_new"
c:identifier="pango_attr_foreground_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="red">
@@ -2325,7 +2223,7 @@
<function name="attr_background_new"
c:identifier="pango_attr_background_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="red">
@@ -2341,7 +2239,7 @@
</function>
<function name="attr_size_new" c:identifier="pango_attr_size_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="size">
@@ -2352,7 +2250,7 @@
<function name="attr_size_new_absolute"
c:identifier="pango_attr_size_new_absolute">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="size">
@@ -2362,48 +2260,48 @@
</function>
<function name="attr_style_new" c:identifier="pango_attr_style_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="style">
- <type name="PangoStyle" c:type="PangoStyle"/>
+ <type name="Style" c:type="PangoStyle"/>
</parameter>
</parameters>
</function>
<function name="attr_weight_new" c:identifier="pango_attr_weight_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="weight">
- <type name="PangoWeight" c:type="PangoWeight"/>
+ <type name="Weight" c:type="PangoWeight"/>
</parameter>
</parameters>
</function>
<function name="attr_variant_new" c:identifier="pango_attr_variant_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="variant">
- <type name="PangoVariant" c:type="PangoVariant"/>
+ <type name="Variant" c:type="PangoVariant"/>
</parameter>
</parameters>
</function>
<function name="attr_stretch_new" c:identifier="pango_attr_stretch_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="stretch">
- <type name="PangoStretch" c:type="PangoStretch"/>
+ <type name="Stretch" c:type="PangoStretch"/>
</parameter>
</parameters>
</function>
<function name="attr_font_desc_new"
c:identifier="pango_attr_font_desc_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="desc">
@@ -2414,18 +2312,18 @@
<function name="attr_underline_new"
c:identifier="pango_attr_underline_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="underline">
- <type name="PangoUnderline" c:type="PangoUnderline"/>
+ <type name="Underline" c:type="PangoUnderline"/>
</parameter>
</parameters>
</function>
<function name="attr_underline_color_new"
c:identifier="pango_attr_underline_color_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="red">
@@ -2442,7 +2340,7 @@
<function name="attr_strikethrough_new"
c:identifier="pango_attr_strikethrough_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="strikethrough">
@@ -2453,7 +2351,7 @@
<function name="attr_strikethrough_color_new"
c:identifier="pango_attr_strikethrough_color_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="red">
@@ -2469,7 +2367,7 @@
</function>
<function name="attr_rise_new" c:identifier="pango_attr_rise_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="rise">
@@ -2479,7 +2377,7 @@
</function>
<function name="attr_scale_new" c:identifier="pango_attr_scale_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="scale_factor">
@@ -2489,7 +2387,7 @@
</function>
<function name="attr_fallback_new" c:identifier="pango_attr_fallback_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="enable_fallback">
@@ -2500,7 +2398,7 @@
<function name="attr_letter_spacing_new"
c:identifier="pango_attr_letter_spacing_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="letter_spacing">
@@ -2510,7 +2408,7 @@
</function>
<function name="attr_shape_new" c:identifier="pango_attr_shape_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="ink_rect">
@@ -2524,7 +2422,7 @@
<function name="attr_shape_new_with_data"
c:identifier="pango_attr_shape_new_with_data">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="ink_rect">
@@ -2540,28 +2438,28 @@
<type name="PangoAttrDataCopyFunc" c:type="PangoAttrDataCopyFunc"/>
</parameter>
<parameter name="destroy_func">
- <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+ <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
</parameter>
</parameters>
</function>
<function name="attr_gravity_new" c:identifier="pango_attr_gravity_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="gravity">
- <type name="PangoGravity" c:type="PangoGravity"/>
+ <type name="Gravity" c:type="PangoGravity"/>
</parameter>
</parameters>
</function>
<function name="attr_gravity_hint_new"
c:identifier="pango_attr_gravity_hint_new">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="hint">
- <type name="PangoGravityHint" c:type="PangoGravityHint"/>
+ <type name="GravityHint" c:type="PangoGravityHint"/>
</parameter>
</parameters>
</function>
@@ -2700,10 +2598,10 @@
<type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
</parameter>
<parameter name="start">
- <type name="gint" c:type="gint*"/>
+ <type name="GLib.gint" c:type="gint*"/>
</parameter>
<parameter name="end">
- <type name="gint" c:type="gint*"/>
+ <type name="GLib.gint" c:type="gint*"/>
</parameter>
</parameters>
</function>
@@ -2721,7 +2619,7 @@
<function name="attr_iterator_copy"
c:identifier="pango_attr_iterator_copy">
<return-value>
- <type name="PangoAttrIterator*" c:type="PangoAttrIterator*"/>
+ <type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
</return-value>
<parameters>
<parameter name="iterator">
@@ -2742,14 +2640,14 @@
</function>
<function name="attr_iterator_get" c:identifier="pango_attr_iterator_get">
<return-value>
- <type name="PangoAttribute*" c:type="PangoAttribute*"/>
+ <type name="PangoAttribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="iterator">
<type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
</parameter>
<parameter name="type">
- <type name="PangoAttrType" c:type="PangoAttrType"/>
+ <type name="AttrType" c:type="PangoAttrType"/>
</parameter>
</parameters>
</function>
@@ -2769,14 +2667,14 @@
<type name="Language" c:type="PangoLanguage**"/>
</parameter>
<parameter name="extra_attrs">
- <type name="GSList" c:type="GSList**"/>
+ <type name="GLib.GSList" c:type="GSList**"/>
</parameter>
</parameters>
</function>
<function name="attr_iterator_get_attrs"
c:identifier="pango_attr_iterator_get_attrs">
<return-value>
- <type name="GSList*" c:type="GSList*"/>
+ <type name="GLib.GSList" c:type="GSList*"/>
</return-value>
<parameters>
<parameter name="iterator">
@@ -2796,7 +2694,7 @@
<type name="int32" c:type="int"/>
</parameter>
<parameter name="accel_marker">
- <type name="gunichar" c:type="gunichar"/>
+ <type name="GLib.gunichar" c:type="gunichar"/>
</parameter>
<parameter name="attr_list">
<type name="AttrList" c:type="PangoAttrList**"/>
@@ -2805,22 +2703,22 @@
<type name="char" c:type="char**"/>
</parameter>
<parameter name="accel_char">
- <type name="gunichar" c:type="gunichar*"/>
+ <type name="GLib.gunichar" c:type="gunichar*"/>
</parameter>
<parameter name="error">
- <type name="GError" c:type="GError**"/>
+ <type name="GLib.GError" c:type="GError**"/>
</parameter>
</parameters>
</function>
<record name="PangoAnalysis" c:type="PangoAnalysis">
<field name="shape_engine">
- <type name="PangoEngineShape*" c:type="PangoEngineShape*"/>
+ <type name="PangoEngineShape" c:type="PangoEngineShape*"/>
</field>
<field name="lang_engine">
- <type name="PangoEngineLang*" c:type="PangoEngineLang*"/>
+ <type name="PangoEngineLang" c:type="PangoEngineLang*"/>
</field>
<field name="font">
- <type name="PangoFont*" c:type="PangoFont*"/>
+ <type name="Font" c:type="PangoFont*"/>
</field>
<field name="level">
<type name="uint8" c:type="guint8"/>
@@ -2835,10 +2733,10 @@
<type name="uint8" c:type="guint8"/>
</field>
<field name="language">
- <type name="PangoLanguage*" c:type="PangoLanguage*"/>
+ <type name="Language" c:type="PangoLanguage*"/>
</field>
<field name="extra_attrs">
- <type name="GSList*" c:type="GSList*"/>
+ <type name="GLib.GSList" c:type="GSList*"/>
</field>
</record>
<glib:boxed c:type="Item"
@@ -2922,10 +2820,10 @@
<type name="int32" c:type="gint"/>
</parameter>
<parameter name="paragraph_delimiter_index">
- <type name="gint" c:type="gint*"/>
+ <type name="GLib.gint" c:type="gint*"/>
</parameter>
<parameter name="next_paragraph_start">
- <type name="gint" c:type="gint*"/>
+ <type name="GLib.gint" c:type="gint*"/>
</parameter>
</parameters>
</function>
@@ -2956,7 +2854,7 @@
</function>
<class name="Fontset"
c:type="PangoFontset"
- parent="GLib.Object"
+ parent="GObject.Object"
glib:type-name="PangoFontset"
glib:get-type="pango_fontset_get_type">
<method name="get_font" c:identifier="pango_fontset_get_font">
@@ -2968,7 +2866,7 @@
<type name="Fontset" c:type="PangoFontset*"/>
</parameter>
<parameter name="wc">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</parameter>
</parameters>
</method>
@@ -3007,10 +2905,10 @@
</return-value>
<parameters>
<parameter name="fontset">
- <type name="PangoFontset*" c:type="PangoFontset*"/>
+ <type name="Fontset" c:type="PangoFontset*"/>
</parameter>
<parameter name="font">
- <type name="PangoFont*" c:type="PangoFont*"/>
+ <type name="Font" c:type="PangoFont*"/>
</parameter>
<parameter name="data">
<type name="any" c:type="gpointer"/>
@@ -3019,7 +2917,7 @@
</callback>
<class name="FontMap"
c:type="PangoFontMap"
- parent="GLib.Object"
+ parent="GObject.Object"
glib:type-name="PangoFontMap"
glib:get-type="pango_font_map_get_type">
<method name="load_fontset" c:identifier="pango_font_map_load_fontset">
@@ -3031,7 +2929,7 @@
<type name="FontMap" c:type="PangoFontMap*"/>
</parameter>
<parameter name="context">
- <type name="PangoContext" c:type="PangoContext*"/>
+ <type name="Context" c:type="PangoContext*"/>
</parameter>
<parameter name="desc">
<type name="FontDescription" c:type="PangoFontDescription*"/>
@@ -3060,7 +2958,7 @@
</class>
<class name="Context"
c:type="PangoContext"
- parent="GLib.Object"
+ parent="GObject.Object"
glib:type-name="PangoContext"
glib:get-type="pango_context_get_type">
<method name="get_font_map" c:identifier="pango_context_get_font_map">
@@ -3191,13 +3089,13 @@
<type name="Context" c:type="PangoContext*"/>
</parameter>
<parameter name="direction">
- <type name="PangoDirection" c:type="PangoDirection"/>
+ <type name="Direction" c:type="PangoDirection"/>
</parameter>
</parameters>
</method>
<method name="get_base_dir" c:identifier="pango_context_get_base_dir">
<return-value>
- <type name="PangoDirection" c:type="PangoDirection"/>
+ <type name="Direction" c:type="PangoDirection"/>
</return-value>
<parameters>
<parameter name="context">
@@ -3215,14 +3113,14 @@
<type name="Context" c:type="PangoContext*"/>
</parameter>
<parameter name="gravity">
- <type name="PangoGravity" c:type="PangoGravity"/>
+ <type name="Gravity" c:type="PangoGravity"/>
</parameter>
</parameters>
</method>
<method name="get_base_gravity"
c:identifier="pango_context_get_base_gravity">
<return-value>
- <type name="PangoGravity" c:type="PangoGravity"/>
+ <type name="Gravity" c:type="PangoGravity"/>
</return-value>
<parameters>
<parameter name="context">
@@ -3232,7 +3130,7 @@
</method>
<method name="get_gravity" c:identifier="pango_context_get_gravity">
<return-value>
- <type name="PangoGravity" c:type="PangoGravity"/>
+ <type name="Gravity" c:type="PangoGravity"/>
</return-value>
<parameters>
<parameter name="context">
@@ -3250,14 +3148,14 @@
<type name="Context" c:type="PangoContext*"/>
</parameter>
<parameter name="hint">
- <type name="PangoGravityHint" c:type="PangoGravityHint"/>
+ <type name="GravityHint" c:type="PangoGravityHint"/>
</parameter>
</parameters>
</method>
<method name="get_gravity_hint"
c:identifier="pango_context_get_gravity_hint">
<return-value>
- <type name="PangoGravityHint" c:type="PangoGravityHint"/>
+ <type name="GravityHint" c:type="PangoGravityHint"/>
</return-value>
<parameters>
<parameter name="context">
@@ -3291,7 +3189,7 @@
</class>
<function name="itemize" c:identifier="pango_itemize">
<return-value>
- <type name="GList*" c:type="GList*"/>
+ <type name="GLib.GList" c:type="GList*"/>
</return-value>
<parameters>
<parameter name="context">
@@ -3317,14 +3215,14 @@
<function name="itemize_with_base_dir"
c:identifier="pango_itemize_with_base_dir">
<return-value>
- <type name="GList*" c:type="GList*"/>
+ <type name="GLib.GList" c:type="GList*"/>
</return-value>
<parameters>
<parameter name="context">
<type name="Context" c:type="PangoContext*"/>
</parameter>
<parameter name="base_dir">
- <type name="PangoDirection" c:type="PangoDirection"/>
+ <type name="Direction" c:type="PangoDirection"/>
</parameter>
<parameter name="text">
<type name="string" c:type="char*"/>
@@ -3356,7 +3254,7 @@
</record>
<record name="PangoGlyphVisAttr" c:type="PangoGlyphVisAttr">
<field name="is_cluster_start">
- <type name="guint" c:type="guint"/>
+ <type name="uint32" c:type="guint"/>
</field>
</record>
<record name="PangoGlyphInfo" c:type="PangoGlyphInfo">
@@ -3372,7 +3270,7 @@
</record>
<function name="glyph_string_new" c:identifier="pango_glyph_string_new">
<return-value>
- <type name="PangoGlyphString*" c:type="PangoGlyphString*"/>
+ <type name="GlyphString" c:type="PangoGlyphString*"/>
</return-value>
</function>
<function name="glyph_string_set_size"
@@ -3382,7 +3280,7 @@
</return-value>
<parameters>
<parameter name="string">
- <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
+ <type name="GlyphString" c:type="PangoGlyphString*"/>
</parameter>
<parameter name="new_len">
<type name="int32" c:type="gint"/>
@@ -3569,11 +3467,11 @@
</function>
<function name="reorder_items" c:identifier="pango_reorder_items">
<return-value>
- <type name="GList*" c:type="GList*"/>
+ <type name="GLib.GList" c:type="GList*"/>
</return-value>
<parameters>
<parameter name="logical_items">
- <type name="GList" c:type="GList*"/>
+ <type name="GLib.GList" c:type="GList*"/>
</parameter>
</parameters>
</function>
@@ -3704,7 +3602,7 @@
</method>
<method name="apply_attrs" c:identifier="pango_glyph_item_apply_attrs">
<return-value>
- <type name="GSList" c:type="GSList*"/>
+ <type name="GLib.GSList" c:type="GSList*"/>
</return-value>
<parameters>
<parameter name="glyph_item">
@@ -3740,7 +3638,7 @@
</glib:boxed>
<function name="tab_array_new" c:identifier="pango_tab_array_new">
<return-value>
- <type name="PangoTabArray*" c:type="PangoTabArray*"/>
+ <type name="TabArray" c:type="PangoTabArray*"/>
</return-value>
<parameters>
<parameter name="initial_size">
@@ -3754,7 +3652,7 @@
<function name="tab_array_new_with_positions"
c:identifier="pango_tab_array_new_with_positions">
<return-value>
- <type name="PangoTabArray*" c:type="PangoTabArray*"/>
+ <type name="TabArray" c:type="PangoTabArray*"/>
</return-value>
<parameters>
<parameter name="size">
@@ -3852,7 +3750,7 @@
<type name="TabAlign" c:type="PangoTabAlign*"/>
</parameter>
<parameter name="location">
- <type name="gint" c:type="gint*"/>
+ <type name="GLib.gint" c:type="gint*"/>
</parameter>
</parameters>
</method>
@@ -3868,7 +3766,7 @@
<type name="TabAlign" c:type="PangoTabAlign**"/>
</parameter>
<parameter name="locations">
- <type name="gint" c:type="gint**"/>
+ <type name="GLib.gint" c:type="gint**"/>
</parameter>
</parameters>
</method>
@@ -3886,7 +3784,7 @@
</glib:boxed>
<class name="Layout"
c:type="PangoLayout"
- parent="GLib.Object"
+ parent="GObject.Object"
glib:type-name="PangoLayout"
glib:get-type="pango_layout_get_type">
<constructor name="new" c:identifier="pango_layout_new">
@@ -4011,10 +3909,10 @@
<type name="int32" c:type="int"/>
</parameter>
<parameter name="accel_marker">
- <type name="gunichar" c:type="gunichar"/>
+ <type name="GLib.gunichar" c:type="gunichar"/>
</parameter>
<parameter name="accel_char">
- <type name="gunichar" c:type="gunichar*"/>
+ <type name="GLib.gunichar" c:type="gunichar*"/>
</parameter>
</parameters>
</method>
@@ -4352,7 +4250,7 @@
<type name="PangoLogAttr" c:type="PangoLogAttr**"/>
</parameter>
<parameter name="n_attrs">
- <type name="gint" c:type="gint*"/>
+ <type name="GLib.gint" c:type="gint*"/>
</parameter>
</parameters>
</method>
@@ -4530,16 +4428,6 @@
</parameter>
</parameters>
</method>
- <method name="get_baseline" c:identifier="pango_layout_get_baseline">
- <return-value>
- <type name="int32" c:type="int"/>
- </return-value>
- <parameters>
- <parameter name="layout">
- <type name="Layout" c:type="PangoLayout*"/>
- </parameter>
- </parameters>
- </method>
<method name="get_line_count" c:identifier="pango_layout_get_line_count">
<return-value>
<type name="int32" c:type="int"/>
@@ -4552,7 +4440,7 @@
</method>
<method name="get_line" c:identifier="pango_layout_get_line">
<return-value>
- <type name="PangoLayoutLine" c:type="PangoLayoutLine*"/>
+ <type name="LayoutLine" c:type="PangoLayoutLine*"/>
</return-value>
<parameters>
<parameter name="layout">
@@ -4566,7 +4454,7 @@
<method name="get_line_readonly"
c:identifier="pango_layout_get_line_readonly">
<return-value>
- <type name="PangoLayoutLine" c:type="PangoLayoutLine*"/>
+ <type name="LayoutLine" c:type="PangoLayoutLine*"/>
</return-value>
<parameters>
<parameter name="layout">
@@ -4579,7 +4467,7 @@
</method>
<method name="get_lines" c:identifier="pango_layout_get_lines">
<return-value>
- <type name="GSList" c:type="GSList*"/>
+ <type name="GLib.GSList" c:type="GSList*"/>
</return-value>
<parameters>
<parameter name="layout">
@@ -4590,7 +4478,7 @@
<method name="get_lines_readonly"
c:identifier="pango_layout_get_lines_readonly">
<return-value>
- <type name="GSList" c:type="GSList*"/>
+ <type name="GLib.GSList" c:type="GSList*"/>
</return-value>
<parameters>
<parameter name="layout">
@@ -4970,7 +4858,7 @@
<record name="PangoRendererPrivate" c:type="PangoRendererPrivate"/>
<class name="Renderer"
c:type="PangoRenderer"
- parent="GLib.Object"
+ parent="GObject.Object"
glib:type-name="PangoRenderer"
glib:get-type="pango_renderer_get_type">
<method name="draw_layout" c:identifier="pango_renderer_draw_layout">
@@ -5249,13 +5137,13 @@
</return-value>
<parameters>
<parameter name="renderer">
- <type name="PangoRenderer*" c:type="PangoRenderer*"/>
+ <type name="Renderer" c:type="PangoRenderer*"/>
</parameter>
<parameter name="font">
- <type name="PangoFont*" c:type="PangoFont*"/>
+ <type name="Font" c:type="PangoFont*"/>
</parameter>
<parameter name="glyphs">
- <type name="PangoGlyphString*" c:type="PangoGlyphString*"/>
+ <type name="GlyphString" c:type="PangoGlyphString*"/>
</parameter>
<parameter name="x">
<type name="int32" c:type="int"/>
@@ -5271,10 +5159,10 @@
</return-value>
<parameters>
<parameter name="renderer">
- <type name="PangoRenderer*" c:type="PangoRenderer*"/>
+ <type name="Renderer" c:type="PangoRenderer*"/>
</parameter>
<parameter name="part">
- <type name="PangoRenderPart" c:type="PangoRenderPart"/>
+ <type name="RenderPart" c:type="PangoRenderPart"/>
</parameter>
<parameter name="x">
<type name="int32" c:type="int"/>
@@ -5296,7 +5184,7 @@
</return-value>
<parameters>
<parameter name="renderer">
- <type name="PangoRenderer*" c:type="PangoRenderer*"/>
+ <type name="Renderer" c:type="PangoRenderer*"/>
</parameter>
<parameter name="x">
<type name="int32" c:type="int"/>
@@ -5318,10 +5206,10 @@
</return-value>
<parameters>
<parameter name="renderer">
- <type name="PangoRenderer*" c:type="PangoRenderer*"/>
+ <type name="Renderer" c:type="PangoRenderer*"/>
</parameter>
<parameter name="attr">
- <type name="PangoAttrShape*" c:type="PangoAttrShape*"/>
+ <type name="PangoAttrShape" c:type="PangoAttrShape*"/>
</parameter>
<parameter name="x">
<type name="int32" c:type="int"/>
@@ -5337,10 +5225,10 @@
</return-value>
<parameters>
<parameter name="renderer">
- <type name="PangoRenderer*" c:type="PangoRenderer*"/>
+ <type name="Renderer" c:type="PangoRenderer*"/>
</parameter>
<parameter name="part">
- <type name="PangoRenderPart" c:type="PangoRenderPart"/>
+ <type name="RenderPart" c:type="PangoRenderPart"/>
</parameter>
<parameter name="y1_">
<type name="double" c:type="double"/>
@@ -5368,10 +5256,10 @@
</return-value>
<parameters>
<parameter name="renderer">
- <type name="PangoRenderer*" c:type="PangoRenderer*"/>
+ <type name="Renderer" c:type="PangoRenderer*"/>
</parameter>
<parameter name="font">
- <type name="PangoFont*" c:type="PangoFont*"/>
+ <type name="Font" c:type="PangoFont*"/>
</parameter>
<parameter name="glyph">
<type name="PangoGlyph" c:type="PangoGlyph"/>
@@ -5390,10 +5278,10 @@
</return-value>
<parameters>
<parameter name="renderer">
- <type name="PangoRenderer*" c:type="PangoRenderer*"/>
+ <type name="Renderer" c:type="PangoRenderer*"/>
</parameter>
<parameter name="part">
- <type name="PangoRenderPart" c:type="PangoRenderPart"/>
+ <type name="RenderPart" c:type="PangoRenderPart"/>
</parameter>
</parameters>
</callback>
@@ -5403,7 +5291,7 @@
</return-value>
<parameters>
<parameter name="renderer">
- <type name="PangoRenderer*" c:type="PangoRenderer*"/>
+ <type name="Renderer" c:type="PangoRenderer*"/>
</parameter>
</parameters>
</callback>
@@ -5413,7 +5301,7 @@
</return-value>
<parameters>
<parameter name="renderer">
- <type name="PangoRenderer*" c:type="PangoRenderer*"/>
+ <type name="Renderer" c:type="PangoRenderer*"/>
</parameter>
</parameters>
</callback>
@@ -5423,10 +5311,10 @@
</return-value>
<parameters>
<parameter name="renderer">
- <type name="PangoRenderer*" c:type="PangoRenderer*"/>
+ <type name="Renderer" c:type="PangoRenderer*"/>
</parameter>
<parameter name="run">
- <type name="PangoLayoutRun*" c:type="PangoLayoutRun*"/>
+ <type name="PangoLayoutRun" c:type="PangoLayoutRun*"/>
</parameter>
</parameters>
</callback>
@@ -5453,7 +5341,7 @@
</class>
<function name="split_file_list" c:identifier="pango_split_file_list">
<return-value>
- <type name="char**" c:type="char**"/>
+ <type name="char" c:type="char**"/>
</return-value>
<parameters>
<parameter name="str">
@@ -5480,7 +5368,7 @@
<type name="FILE" c:type="FILE*"/>
</parameter>
<parameter name="str">
- <type name="GString" c:type="GString*"/>
+ <type name="GLib.GString" c:type="GString*"/>
</parameter>
</parameters>
</function>
@@ -5503,7 +5391,7 @@
<type name="char" c:type="char**"/>
</parameter>
<parameter name="out">
- <type name="GString" c:type="GString*"/>
+ <type name="GLib.GString" c:type="GString*"/>
</parameter>
</parameters>
</function>
@@ -5516,7 +5404,7 @@
<type name="char" c:type="char**"/>
</parameter>
<parameter name="out">
- <type name="GString" c:type="GString*"/>
+ <type name="GLib.GString" c:type="GString*"/>
</parameter>
</parameters>
</function>
@@ -5539,7 +5427,7 @@
</return-value>
<parameters>
<parameter name="type">
- <type name="GType" c:type="GType"/>
+ <type name="GObject.GType" c:type="GType"/>
</parameter>
<parameter name="str">
<type name="string" c:type="char*"/>
@@ -5636,7 +5524,7 @@
<function name="log2vis_get_embedding_levels"
c:identifier="pango_log2vis_get_embedding_levels">
<return-value>
- <type name="guint8*" c:type="guint8*"/>
+ <type name="guint8" c:type="guint8*"/>
</return-value>
<parameters>
<parameter name="text">
@@ -5656,7 +5544,7 @@
</return-value>
<parameters>
<parameter name="ch">
- <type name="gunichar" c:type="gunichar"/>
+ <type name="GLib.gunichar" c:type="gunichar"/>
</parameter>
</parameters>
</function>
@@ -5694,10 +5582,10 @@
</return-value>
<parameters>
<parameter name="cr">
- <type name="cairo_t*" c:type="cairo_t*"/>
+ <type name="Cairo.cairo_t" c:type="cairo_t*"/>
</parameter>
<parameter name="attr">
- <type name="PangoAttrShape*" c:type="PangoAttrShape*"/>
+ <type name="PangoAttrShape" c:type="PangoAttrShape*"/>
</parameter>
<parameter name="do_path">
<type name="boolean" c:type="gboolean"/>
@@ -5710,19 +5598,19 @@
<function name="cairo_font_map_get_type"
c:identifier="pango_cairo_font_map_get_type">
<return-value>
- <type name="GType" c:type="GType"/>
+ <type name="GObject.GType" c:type="GType"/>
</return-value>
</function>
<function name="cairo_font_map_new"
c:identifier="pango_cairo_font_map_new">
<return-value>
- <type name="PangoFontMap*" c:type="PangoFontMap*"/>
+ <type name="FontMap" c:type="PangoFontMap*"/>
</return-value>
</function>
<function name="cairo_font_map_new_for_font_type"
c:identifier="pango_cairo_font_map_new_for_font_type">
<return-value>
- <type name="PangoFontMap*" c:type="PangoFontMap*"/>
+ <type name="FontMap" c:type="PangoFontMap*"/>
</return-value>
<parameters>
<parameter name="fonttype">
@@ -5733,7 +5621,7 @@
<function name="cairo_font_map_get_default"
c:identifier="pango_cairo_font_map_get_default">
<return-value>
- <type name="PangoFontMap*" c:type="PangoFontMap*"/>
+ <type name="FontMap" c:type="PangoFontMap*"/>
</return-value>
</function>
<function name="cairo_font_map_get_font_type"
@@ -5775,7 +5663,7 @@
<function name="cairo_font_map_create_context"
c:identifier="pango_cairo_font_map_create_context">
<return-value>
- <type name="PangoContext*" c:type="PangoContext*"/>
+ <type name="Context" c:type="PangoContext*"/>
</return-value>
<parameters>
<parameter name="fontmap">
@@ -5786,13 +5674,13 @@
<function name="cairo_font_get_type"
c:identifier="pango_cairo_font_get_type">
<return-value>
- <type name="GType" c:type="GType"/>
+ <type name="GObject.GType" c:type="GType"/>
</return-value>
</function>
<function name="cairo_font_get_scaled_font"
c:identifier="pango_cairo_font_get_scaled_font">
<return-value>
- <type name="cairo_scaled_font_t*" c:type="cairo_scaled_font_t*"/>
+ <type name="Cairo.cairo_scaled_font_t" c:type="cairo_scaled_font_t*"/>
</return-value>
<parameters>
<parameter name="font">
@@ -5807,7 +5695,7 @@
</return-value>
<parameters>
<parameter name="cr">
- <type name="cairo_t" c:type="cairo_t*"/>
+ <type name="Cairo.cairo_t" c:type="cairo_t*"/>
</parameter>
<parameter name="context">
<type name="Context" c:type="PangoContext*"/>
@@ -5824,14 +5712,16 @@
<type name="Context" c:type="PangoContext*"/>
</parameter>
<parameter name="options">
- <type name="cairo_font_options_t" c:type="cairo_font_options_t*"/>
+ <type name="Cairo.cairo_font_options_t"
+ c:type="cairo_font_options_t*"/>
</parameter>
</parameters>
</function>
<function name="cairo_context_get_font_options"
c:identifier="pango_cairo_context_get_font_options">
<return-value>
- <type name="cairo_font_options_t*" c:type="cairo_font_options_t*"/>
+ <type name="Cairo.cairo_font_options_t"
+ c:type="cairo_font_options_t*"/>
</return-value>
<parameters>
<parameter name="context">
@@ -5881,7 +5771,7 @@
<type name="any" c:type="gpointer"/>
</parameter>
<parameter name="dnotify">
- <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+ <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
</parameter>
</parameters>
</function>
@@ -5903,11 +5793,11 @@
<function name="cairo_create_layout"
c:identifier="pango_cairo_create_layout">
<return-value>
- <type name="PangoLayout*" c:type="PangoLayout*"/>
+ <type name="Layout" c:type="PangoLayout*"/>
</return-value>
<parameters>
<parameter name="cr">
- <type name="cairo_t" c:type="cairo_t*"/>
+ <type name="Cairo.cairo_t" c:type="cairo_t*"/>
</parameter>
</parameters>
</function>
@@ -5918,7 +5808,7 @@
</return-value>
<parameters>
<parameter name="cr">
- <type name="cairo_t" c:type="cairo_t*"/>
+ <type name="Cairo.cairo_t" c:type="cairo_t*"/>
</parameter>
<parameter name="layout">
<type name="Layout" c:type="PangoLayout*"/>
@@ -5932,7 +5822,7 @@
</return-value>
<parameters>
<parameter name="cr">
- <type name="cairo_t" c:type="cairo_t*"/>
+ <type name="Cairo.cairo_t" c:type="cairo_t*"/>
</parameter>
<parameter name="font">
<type name="Font" c:type="PangoFont*"/>
@@ -5949,7 +5839,7 @@
</return-value>
<parameters>
<parameter name="cr">
- <type name="cairo_t" c:type="cairo_t*"/>
+ <type name="Cairo.cairo_t" c:type="cairo_t*"/>
</parameter>
<parameter name="line">
<type name="LayoutLine" c:type="PangoLayoutLine*"/>
@@ -5962,7 +5852,7 @@
</return-value>
<parameters>
<parameter name="cr">
- <type name="cairo_t" c:type="cairo_t*"/>
+ <type name="Cairo.cairo_t" c:type="cairo_t*"/>
</parameter>
<parameter name="layout">
<type name="Layout" c:type="PangoLayout*"/>
@@ -5976,7 +5866,7 @@
</return-value>
<parameters>
<parameter name="cr">
- <type name="cairo_t" c:type="cairo_t*"/>
+ <type name="Cairo.cairo_t" c:type="cairo_t*"/>
</parameter>
<parameter name="x">
<type name="double" c:type="double"/>
@@ -5999,7 +5889,7 @@
</return-value>
<parameters>
<parameter name="cr">
- <type name="cairo_t" c:type="cairo_t*"/>
+ <type name="Cairo.cairo_t" c:type="cairo_t*"/>
</parameter>
<parameter name="font">
<type name="Font" c:type="PangoFont*"/>
@@ -6016,7 +5906,7 @@
</return-value>
<parameters>
<parameter name="cr">
- <type name="cairo_t" c:type="cairo_t*"/>
+ <type name="Cairo.cairo_t" c:type="cairo_t*"/>
</parameter>
<parameter name="line">
<type name="LayoutLine" c:type="PangoLayoutLine*"/>
@@ -6029,7 +5919,7 @@
</return-value>
<parameters>
<parameter name="cr">
- <type name="cairo_t" c:type="cairo_t*"/>
+ <type name="Cairo.cairo_t" c:type="cairo_t*"/>
</parameter>
<parameter name="layout">
<type name="Layout" c:type="PangoLayout*"/>
@@ -6043,7 +5933,7 @@
</return-value>
<parameters>
<parameter name="cr">
- <type name="cairo_t" c:type="cairo_t*"/>
+ <type name="Cairo.cairo_t" c:type="cairo_t*"/>
</parameter>
<parameter name="x">
<type name="double" c:type="double"/>
@@ -6062,19 +5952,9 @@
<record name="PangoFcFont" c:type="PangoFcFont"/>
<function name="fc_font_get_type" c:identifier="pango_fc_font_get_type">
<return-value>
- <type name="GType" c:type="GType"/>
+ <type name="GObject.GType" c:type="GType"/>
</return-value>
</function>
- <function name="fc_font_lock_face" c:identifier="pango_fc_font_lock_face">
- <return-value>
- <type name="FT_Face" c:type="FT_Face"/>
- </return-value>
- <parameters>
- <parameter name="font">
- <type name="PangoFcFont" c:type="PangoFcFont*"/>
- </parameter>
- </parameters>
- </function>
<function name="fc_font_unlock_face"
c:identifier="pango_fc_font_unlock_face">
<return-value>
@@ -6088,18 +5968,18 @@
</function>
<record name="PangoFcDecoder" c:type="PangoFcDecoder">
<field name="parent_instance">
- <type name="GObject" c:type="GObject"/>
+ <type name="GObject.Object" c:type="GObject"/>
</field>
<callback name="get_charset">
<return-value>
- <type name="FcCharSet*" c:type="FcCharSet*"/>
+ <type name="FcCharSet" c:type="FcCharSet*"/>
</return-value>
<parameters>
<parameter name="decoder">
- <type name="PangoFcDecoder*" c:type="PangoFcDecoder*"/>
+ <type name="PangoFcDecoder" c:type="PangoFcDecoder*"/>
</parameter>
<parameter name="fcfont">
- <type name="PangoFcFont*" c:type="PangoFcFont*"/>
+ <type name="PangoFcFont" c:type="PangoFcFont*"/>
</parameter>
</parameters>
</callback>
@@ -6109,10 +5989,10 @@
</return-value>
<parameters>
<parameter name="decoder">
- <type name="PangoFcDecoder*" c:type="PangoFcDecoder*"/>
+ <type name="PangoFcDecoder" c:type="PangoFcDecoder*"/>
</parameter>
<parameter name="fcfont">
- <type name="PangoFcFont*" c:type="PangoFcFont*"/>
+ <type name="PangoFcFont" c:type="PangoFcFont*"/>
</parameter>
<parameter name="wc">
<type name="uint32" c:type="guint32"/>
@@ -6143,13 +6023,13 @@
<function name="fc_decoder_get_type"
c:identifier="pango_fc_decoder_get_type">
<return-value>
- <type name="GType" c:type="GType"/>
+ <type name="GObject.GType" c:type="GType"/>
</return-value>
</function>
<function name="fc_decoder_get_charset"
c:identifier="pango_fc_decoder_get_charset">
<return-value>
- <type name="FcCharSet*" c:type="FcCharSet*"/>
+ <type name="FcCharSet" c:type="FcCharSet*"/>
</return-value>
<parameters>
<parameter name="decoder">
@@ -6182,16 +6062,16 @@
<function name="fc_font_map_get_type"
c:identifier="pango_fc_font_map_get_type">
<return-value>
- <type name="GType" c:type="GType"/>
+ <type name="GObject.GType" c:type="GType"/>
</return-value>
</function>
<callback name="PangoFcDecoderFindFunc">
<return-value>
- <type name="PangoFcDecoder*" c:type="PangoFcDecoder*"/>
+ <type name="PangoFcDecoder" c:type="PangoFcDecoder*"/>
</return-value>
<parameters>
<parameter name="pattern">
- <type name="FcPattern*" c:type="FcPattern*"/>
+ <type name="FcPattern" c:type="FcPattern*"/>
</parameter>
<parameter name="user_data">
<type name="any" c:type="gpointer"/>
@@ -6214,14 +6094,14 @@
<type name="any" c:type="gpointer"/>
</parameter>
<parameter name="dnotify">
- <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+ <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
</parameter>
</parameters>
</function>
<function name="fc_font_description_from_pattern"
c:identifier="pango_fc_font_description_from_pattern">
<return-value>
- <type name="PangoFontDescription*" c:type="PangoFontDescription*"/>
+ <type name="FontDescription" c:type="PangoFontDescription*"/>
</return-value>
<parameters>
<parameter name="pattern">
@@ -6239,149 +6119,22 @@
</return-value>
<parameters>
<parameter name="pattern">
- <type name="FcPattern*" c:type="FcPattern*"/>
+ <type name="FcPattern" c:type="FcPattern*"/>
</parameter>
<parameter name="data">
<type name="any" c:type="gpointer"/>
</parameter>
</parameters>
</callback>
- <function name="ft2_render" c:identifier="pango_ft2_render">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="bitmap">
- <type name="FT_Bitmap" c:type="FT_Bitmap*"/>
- </parameter>
- <parameter name="font">
- <type name="Font" c:type="PangoFont*"/>
- </parameter>
- <parameter name="glyphs">
- <type name="GlyphString" c:type="PangoGlyphString*"/>
- </parameter>
- <parameter name="x">
- <type name="int32" c:type="gint"/>
- </parameter>
- <parameter name="y">
- <type name="int32" c:type="gint"/>
- </parameter>
- </parameters>
- </function>
- <function name="ft2_render_transformed"
- c:identifier="pango_ft2_render_transformed">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="bitmap">
- <type name="FT_Bitmap" c:type="FT_Bitmap*"/>
- </parameter>
- <parameter name="matrix">
- <type name="Matrix" c:type="PangoMatrix*"/>
- </parameter>
- <parameter name="font">
- <type name="Font" c:type="PangoFont*"/>
- </parameter>
- <parameter name="glyphs">
- <type name="GlyphString" c:type="PangoGlyphString*"/>
- </parameter>
- <parameter name="x">
- <type name="int32" c:type="int"/>
- </parameter>
- <parameter name="y">
- <type name="int32" c:type="int"/>
- </parameter>
- </parameters>
- </function>
- <function name="ft2_render_layout_line"
- c:identifier="pango_ft2_render_layout_line">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="bitmap">
- <type name="FT_Bitmap" c:type="FT_Bitmap*"/>
- </parameter>
- <parameter name="line">
- <type name="LayoutLine" c:type="PangoLayoutLine*"/>
- </parameter>
- <parameter name="x">
- <type name="int32" c:type="int"/>
- </parameter>
- <parameter name="y">
- <type name="int32" c:type="int"/>
- </parameter>
- </parameters>
- </function>
- <function name="ft2_render_layout_line_subpixel"
- c:identifier="pango_ft2_render_layout_line_subpixel">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="bitmap">
- <type name="FT_Bitmap" c:type="FT_Bitmap*"/>
- </parameter>
- <parameter name="line">
- <type name="LayoutLine" c:type="PangoLayoutLine*"/>
- </parameter>
- <parameter name="x">
- <type name="int32" c:type="int"/>
- </parameter>
- <parameter name="y">
- <type name="int32" c:type="int"/>
- </parameter>
- </parameters>
- </function>
- <function name="ft2_render_layout" c:identifier="pango_ft2_render_layout">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="bitmap">
- <type name="FT_Bitmap" c:type="FT_Bitmap*"/>
- </parameter>
- <parameter name="layout">
- <type name="Layout" c:type="PangoLayout*"/>
- </parameter>
- <parameter name="x">
- <type name="int32" c:type="int"/>
- </parameter>
- <parameter name="y">
- <type name="int32" c:type="int"/>
- </parameter>
- </parameters>
- </function>
- <function name="ft2_render_layout_subpixel"
- c:identifier="pango_ft2_render_layout_subpixel">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="bitmap">
- <type name="FT_Bitmap" c:type="FT_Bitmap*"/>
- </parameter>
- <parameter name="layout">
- <type name="Layout" c:type="PangoLayout*"/>
- </parameter>
- <parameter name="x">
- <type name="int32" c:type="int"/>
- </parameter>
- <parameter name="y">
- <type name="int32" c:type="int"/>
- </parameter>
- </parameters>
- </function>
<function name="ft2_font_map_get_type"
c:identifier="pango_ft2_font_map_get_type">
<return-value>
- <type name="GType" c:type="GType"/>
+ <type name="GObject.GType" c:type="GType"/>
</return-value>
</function>
<function name="ft2_font_map_new" c:identifier="pango_ft2_font_map_new">
<return-value>
- <type name="PangoFontMap*" c:type="PangoFontMap*"/>
+ <type name="FontMap" c:type="PangoFontMap*"/>
</return-value>
</function>
<function name="ft2_font_map_set_resolution"
@@ -6417,7 +6170,7 @@
<type name="any" c:type="gpointer"/>
</parameter>
<parameter name="notify">
- <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+ <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
</parameter>
</parameters>
</function>
@@ -6435,7 +6188,7 @@
<function name="ft2_font_map_create_context"
c:identifier="pango_ft2_font_map_create_context">
<return-value>
- <type name="PangoContext*" c:type="PangoContext*"/>
+ <type name="Context" c:type="PangoContext*"/>
</return-value>
<parameters>
<parameter name="fontmap">
@@ -6445,7 +6198,7 @@
</function>
<function name="ft2_get_context" c:identifier="pango_ft2_get_context">
<return-value>
- <type name="PangoContext*" c:type="PangoContext*"/>
+ <type name="Context" c:type="PangoContext*"/>
</return-value>
<parameters>
<parameter name="dpi_x">
@@ -6459,7 +6212,7 @@
<function name="ft2_font_map_for_display"
c:identifier="pango_ft2_font_map_for_display">
<return-value>
- <type name="PangoFontMap*" c:type="PangoFontMap*"/>
+ <type name="FontMap" c:type="PangoFontMap*"/>
</return-value>
</function>
<function name="ft2_shutdown_display"
@@ -6496,20 +6249,10 @@
</parameter>
</parameters>
</function>
- <function name="ft2_font_get_face" c:identifier="pango_ft2_font_get_face">
- <return-value>
- <type name="FT_Face" c:type="FT_Face"/>
- </return-value>
- <parameters>
- <parameter name="font">
- <type name="Font" c:type="PangoFont*"/>
- </parameter>
- </parameters>
- </function>
<function name="ft2_font_get_coverage"
c:identifier="pango_ft2_font_get_coverage">
<return-value>
- <type name="PangoCoverage*" c:type="PangoCoverage*"/>
+ <type name="PangoCoverage" c:type="PangoCoverage*"/>
</return-value>
<parameters>
<parameter name="font">
@@ -6522,70 +6265,32 @@
</function>
<record name="PangoXftRenderer" c:type="PangoXftRenderer">
<field name="parent_instance">
- <type name="PangoRenderer" c:type="PangoRenderer"/>
+ <type name="Renderer" c:type="PangoRenderer"/>
</field>
<field name="display">
- <type name="Display*" c:type="Display*"/>
+ <type name="Display" c:type="Display*"/>
</field>
<field name="screen">
<type name="int32" c:type="int"/>
</field>
<field name="draw">
- <type name="XftDraw*" c:type="XftDraw*"/>
+ <type name="XftDraw" c:type="XftDraw*"/>
</field>
<field name="priv">
- <type name="PangoXftRendererPrivate*"
+ <type name="PangoXftRendererPrivate"
c:type="PangoXftRendererPrivate*"/>
</field>
- <callback name="composite_trapezoids">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="xftrenderer">
- <type name="PangoXftRenderer*" c:type="PangoXftRenderer*"/>
- </parameter>
- <parameter name="part">
- <type name="PangoRenderPart" c:type="PangoRenderPart"/>
- </parameter>
- <parameter name="trapezoids">
- <type name="XTrapezoid*" c:type="XTrapezoid*"/>
- </parameter>
- <parameter name="n_trapezoids">
- <type name="int32" c:type="int"/>
- </parameter>
- </parameters>
- </callback>
- <callback name="composite_glyphs">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="xftrenderer">
- <type name="PangoXftRenderer*" c:type="PangoXftRenderer*"/>
- </parameter>
- <parameter name="xft_font">
- <type name="XftFont*" c:type="XftFont*"/>
- </parameter>
- <parameter name="glyphs">
- <type name="XftGlyphSpec*" c:type="XftGlyphSpec*"/>
- </parameter>
- <parameter name="n_glyphs">
- <type name="int32" c:type="int"/>
- </parameter>
- </parameters>
- </callback>
</record>
<record name="PangoXftRendererPrivate" c:type="PangoXftRendererPrivate"/>
<function name="xft_renderer_get_type"
c:identifier="pango_xft_renderer_get_type">
<return-value>
- <type name="GType" c:type="GType"/>
+ <type name="GObject.GType" c:type="GType"/>
</return-value>
</function>
<function name="xft_renderer_new" c:identifier="pango_xft_renderer_new">
<return-value>
- <type name="PangoRenderer*" c:type="PangoRenderer*"/>
+ <type name="Renderer" c:type="PangoRenderer*"/>
</return-value>
<parameters>
<parameter name="display">
@@ -6760,7 +6465,7 @@
</return-value>
<parameters>
<parameter name="pattern">
- <type name="FcPattern*" c:type="FcPattern*"/>
+ <type name="FcPattern" c:type="FcPattern*"/>
</parameter>
<parameter name="data">
<type name="any" c:type="gpointer"/>
@@ -6769,7 +6474,7 @@
</callback>
<function name="xft_get_font_map" c:identifier="pango_xft_get_font_map">
<return-value>
- <type name="PangoFontMap*" c:type="PangoFontMap*"/>
+ <type name="FontMap" c:type="PangoFontMap*"/>
</return-value>
<parameters>
<parameter name="display">
@@ -6782,7 +6487,7 @@
</function>
<function name="xft_get_context" c:identifier="pango_xft_get_context">
<return-value>
- <type name="PangoContext*" c:type="PangoContext*"/>
+ <type name="Context" c:type="PangoContext*"/>
</return-value>
<parameters>
<parameter name="display">
@@ -6826,7 +6531,7 @@
<type name="any" c:type="gpointer"/>
</parameter>
<parameter name="notify">
- <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+ <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
</parameter>
</parameters>
</function>
@@ -6847,12 +6552,12 @@
<function name="xft_font_map_get_type"
c:identifier="pango_xft_font_map_get_type">
<return-value>
- <type name="GType" c:type="GType"/>
+ <type name="GObject.GType" c:type="GType"/>
</return-value>
</function>
<function name="xft_font_get_type" c:identifier="pango_xft_font_get_type">
<return-value>
- <type name="GType" c:type="GType"/>
+ <type name="GObject.GType" c:type="GType"/>
</return-value>
</function>
<callback name="PangoGetGCFunc">
@@ -6861,10 +6566,10 @@
</return-value>
<parameters>
<parameter name="context">
- <type name="PangoContext*" c:type="PangoContext*"/>
+ <type name="Context" c:type="PangoContext*"/>
</parameter>
<parameter name="color">
- <type name="PangoColor*" c:type="PangoColor*"/>
+ <type name="Color" c:type="PangoColor*"/>
</parameter>
<parameter name="base_gc">
<type name="GC" c:type="GC"/>
@@ -6877,7 +6582,7 @@
</return-value>
<parameters>
<parameter name="context">
- <type name="PangoContext*" c:type="PangoContext*"/>
+ <type name="Context" c:type="PangoContext*"/>
</parameter>
<parameter name="gc">
<type name="GC" c:type="GC"/>
@@ -6886,7 +6591,7 @@
</callback>
<function name="x_get_context" c:identifier="pango_x_get_context">
<return-value>
- <type name="PangoContext*" c:type="PangoContext*"/>
+ <type name="Context" c:type="PangoContext*"/>
</return-value>
<parameters>
<parameter name="display">
@@ -6913,7 +6618,7 @@
</function>
<function name="x_load_font" c:identifier="pango_x_load_font">
<return-value>
- <type name="PangoFont*" c:type="PangoFont*"/>
+ <type name="Font" c:type="PangoFont*"/>
</return-value>
<parameters>
<parameter name="display">
@@ -7052,7 +6757,7 @@
<record name="PangoXFontCache" c:type="PangoXFontCache"/>
<function name="x_font_cache_new" c:identifier="pango_x_font_cache_new">
<return-value>
- <type name="PangoXFontCache*" c:type="PangoXFontCache*"/>
+ <type name="PangoXFontCache" c:type="PangoXFontCache*"/>
</return-value>
<parameters>
<parameter name="display">
@@ -7072,7 +6777,7 @@
</function>
<function name="x_font_cache_load" c:identifier="pango_x_font_cache_load">
<return-value>
- <type name="XFontStruct*" c:type="XFontStruct*"/>
+ <type name="XFontStruct" c:type="XFontStruct*"/>
</return-value>
<parameters>
<parameter name="cache">
@@ -7100,7 +6805,7 @@
<function name="x_font_map_for_display"
c:identifier="pango_x_font_map_for_display">
<return-value>
- <type name="PangoFontMap*" c:type="PangoFontMap*"/>
+ <type name="FontMap" c:type="PangoFontMap*"/>
</return-value>
<parameters>
<parameter name="display">
@@ -7122,7 +6827,7 @@
<function name="x_font_map_get_font_cache"
c:identifier="pango_x_font_map_get_font_cache">
<return-value>
- <type name="PangoXFontCache*" c:type="PangoXFontCache*"/>
+ <type name="PangoXFontCache" c:type="PangoXFontCache*"/>
</return-value>
<parameters>
<parameter name="font_map">
@@ -7195,7 +6900,7 @@
<type name="PangoXSubfont" c:type="PangoXSubfont"/>
</parameter>
<parameter name="glyphs">
- <type name="gunichar" c:type="gunichar**"/>
+ <type name="GLib.gunichar" c:type="gunichar**"/>
</parameter>
<parameter name="n_glyphs">
<type name="int" c:type="int*"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
