pango: Fix PangoGlyphItemIter binding

diff --git a/vapi/packages/pango/pango.metadata b/vapi/packages/pango/pango.metadata
index e56a3f2e30d00d2787d7e687c044ecfa1afd685d..a7f248cb6c72909889908fbb04637272eb79fb32 100644 (file)
--- a/vapi/packages/pango/pango.metadata
+++ b/vapi/packages/pango/pango.metadata
@@ -60,6 +60,7 @@ PangoFontDescription is_immutable="1"
 pango_font_description_from_string transfer_ownership="1"
 PangoGlyphInfo is_value_type="1"
 pango_glyph_item_letter_space.log_attrs is_array="1"
+PangoGlyphItemIter is_value_type="1"
 PangoGlyphGeometry is_value_type="1"
 pango_glyph_string_extents.ink_rect is_out="1"
 pango_glyph_string_extents.logical_rect is_out="1"

diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index 7d891f96a75df245d9ae58d205dcc64ad06a64a1..420589311618a0653d553c3c8f9026f9e67b8822 100644 (file)
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -287,23 +287,6 @@ namespace Pango {
                public unowned Pango.GlyphItem split (string text, int split_index);
        }
        [Compact]
-       [CCode (copy_function = "pango_glyph_item_iter_copy", type_id = "PANGO_TYPE_GLYPH_ITEM_ITER", cheader_filename = "pango/pango.h")]
-       public class GlyphItemIter {
-               public int end_char;
-               public int end_glyph;
-               public int end_index;
-               public weak Pango.GlyphItem glyph_item;
-               public int start_char;
-               public int start_glyph;
-               public int start_index;
-               public weak string text;
-               public Pango.GlyphItemIter copy ();
-               public bool init_end (Pango.GlyphItem glyph_item, string text);
-               public bool init_start (Pango.GlyphItem glyph_item, string text);
-               public bool next_cluster ();
-               public bool prev_cluster ();
-       }
-       [Compact]
        [CCode (copy_function = "pango_glyph_string_copy", type_id = "PANGO_TYPE_GLYPH_STRING", cheader_filename = "pango/pango.h")]
        public class GlyphString {
                public Pango.GlyphInfo glyphs;
@@ -531,6 +514,23 @@ namespace Pango {
                public Pango.GlyphGeometry geometry;
                public Pango.GlyphVisAttr attr;
        }
+       [CCode (type_id = "PANGO_TYPE_GLYPH_ITEM_ITER", cheader_filename = "pango/pango.h")]
+       public struct GlyphItemIter {
+               public weak Pango.GlyphItem glyph_item;
+               public weak string text;
+               public int start_glyph;
+               public int start_index;
+               public int start_char;
+               public int end_glyph;
+               public int end_index;
+               public int end_char;
+               public Pango.GlyphItemIter copy ();
+               public void free ();
+               public bool init_end (Pango.GlyphItem glyph_item, string text);
+               public bool init_start (Pango.GlyphItem glyph_item, string text);
+               public bool next_cluster ();
+               public bool prev_cluster ();
+       }
        [CCode (type_id = "PANGO_TYPE_GLYPH_VIS_ATTR", cheader_filename = "pango/pango.h")]
        public struct GlyphVisAttr {
                public uint is_cluster_start;