gtk_init_with_args.entries as array mark PangoLogAttr as value type

2007-09-01 Mathias Hasselmann <mathias.hasselmann@gmx.de>

	* vapi/packages/gtk+-2.0/gtk+-2.0.metadata:
	  gtk_init_with_args.entries as array
	* vapi/packages/pango/pango.metadata:
	  mark PangoLogAttr as value type
	* vapi/gtk+-2.0.vala, vapi/pango.vala:
	  regenerated

svn path=/trunk/; revision=565

diff --git a/ChangeLog b/ChangeLog
index f67782e982ed7f6004fe75bfe92b3c77dc831be7..021bb27bd62c8a9832bc59483f8f5d0d22405813 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-01  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
+
+       * vapi/packages/gtk+-2.0/gtk+-2.0.metadata:
+         gtk_init_with_args.entries as array
+       * vapi/packages/pango/pango.metadata:
+         mark PangoLogAttr as value type
+       * vapi/gtk+-2.0.vala, vapi/pango.vala:
+         regenerated
+
 2007-09-01  Jürg Billeter  <j@bitron.ch>
 
        * vala/valaclass.vala, vala/valadatatype.vala, vala/valainterface.vala,

diff --git a/vapi/gtk+-2.0.vala b/vapi/gtk+-2.0.vala
index 2a7464e125d9bfde348f67e57270fa3dc528c6ba..2f462d56d689d564ce8367d9468e5b6748711ebc 100644 (file)
--- a/vapi/gtk+-2.0.vala
+++ b/vapi/gtk+-2.0.vala
@@ -1,4 +1,4 @@
-/* gtk+-2.0.vala generated by lt-vapigen, do not modify. */
+/* gtk+-2.0.vala generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_")]
 namespace Gtk {
@@ -5584,7 +5584,7 @@ namespace Gtk {
                [NoArrayLength]
                public static bool check_abi_check (int argc, string[] argv, int num_checks, ulong sizeof_GtkWindow, ulong sizeof_GtkBox);
                [NoArrayLength]
-               public static bool with_args (int argc, string[] argv, string parameter_string, out GLib.OptionEntry entries, string translation_domain) throws GLib.Error;
+               public static bool with_args (int argc, string[] argv, string parameter_string, GLib.OptionEntry[] entries, string translation_domain) throws GLib.Error;
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Input {

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index ffe06db6930fa0d6f720767c30d704fb27bbf46b..de0d1bd71a947df09ed4cde5a3c7e7ccba28b3c8 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -36,6 +36,7 @@ gtk_init_abi_check.argv is_array="1"
 gtk_init_check.argv is_array="1"
 gtk_init_check_abi_check.argv is_array="1"
 gtk_init_with_args.argv is_array="1"
+gtk_init_with_args.entries is_array="1"
 GtkItem::deselect has_emitter="1"
 GtkItem::select has_emitter="1"
 GtkItem::toggle has_emitter="1"

diff --git a/vapi/packages/pango/pango.metadata b/vapi/packages/pango/pango.metadata
index 955446632db5d40a847e8182393166b654aa92e5..2036d890047a852496847acabba8b55bffcd1c1a 100644 (file)
--- a/vapi/packages/pango/pango.metadata
+++ b/vapi/packages/pango/pango.metadata
@@ -1,6 +1,6 @@
 Pango cheader_filename="pango/pango.h"
 pango_attr_size_new_absolute hidden="1"
+PangoLogAttr is_value_type="1"
 PangoColor is_value_type="1"
 PangoMatrix is_value_type="1"
 PangoRectangle is_value_type="1"
-

diff --git a/vapi/pango.vala b/vapi/pango.vala
index 16c461efd37496a590562ff7fdda3004bb1e6227..c04df529df3d1edb4023358ce62df2ac928b3e54 100644 (file)
--- a/vapi/pango.vala
+++ b/vapi/pango.vala
@@ -560,7 +560,7 @@ namespace Pango {
                public weak Pango.Item item;
                public weak Pango.GlyphString glyphs;
                public weak GLib.SList apply_attrs (string text, Pango.AttrList list);
-               public void letter_space (string text, Pango.LogAttr log_attrs, int letter_spacing);
+               public void letter_space (string text, out Pango.LogAttr log_attrs, int letter_spacing);
                public weak Pango.GlyphItem split (string text, int split_index);
        }
        [CCode (copy_function = "pango_glyph_string_copy", cheader_filename = "pango/pango.h")]
@@ -637,21 +637,6 @@ namespace Pango {
                public weak Pango.GlyphString glyphs;
        }
        [CCode (cheader_filename = "pango/pango.h")]
-       public class LogAttr {
-               public uint is_line_break;
-               public uint is_mandatory_break;
-               public uint is_char_break;
-               public uint is_white;
-               public uint is_cursor_position;
-               public uint is_word_start;
-               public uint is_word_end;
-               public uint is_sentence_boundary;
-               public uint is_sentence_start;
-               public uint is_sentence_end;
-               public uint backspace_deletes_character;
-               public uint is_expandable_space;
-       }
-       [CCode (cheader_filename = "pango/pango.h")]
        public class ScriptIter {
                public void get_range (out string start, out string end, Pango.Script script);
                public ScriptIter (string text, int length);
@@ -744,6 +729,21 @@ namespace Pango {
                public weak string to_string ();
        }
        [CCode (cheader_filename = "pango/pango.h")]
+       public struct LogAttr {
+               public uint is_line_break;
+               public uint is_mandatory_break;
+               public uint is_char_break;
+               public uint is_white;
+               public uint is_cursor_position;
+               public uint is_word_start;
+               public uint is_word_end;
+               public uint is_sentence_boundary;
+               public uint is_sentence_start;
+               public uint is_sentence_end;
+               public uint backspace_deletes_character;
+               public uint is_expandable_space;
+       }
+       [CCode (cheader_filename = "pango/pango.h")]
        public struct Matrix {
                public double xx;
                public double xy;
@@ -789,7 +789,7 @@ namespace Pango {
        public static void extents_to_pixels (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
        public static Pango.Direction find_base_dir (string text, int length);
        public static void find_paragraph_boundary (string text, int length, int paragraph_delimiter_index, int next_paragraph_start);
-       public static void get_log_attrs (string text, int length, int level, Pango.Language language, Pango.LogAttr log_attrs, int attrs_len);
+       public static void get_log_attrs (string text, int length, int level, Pango.Language language, out Pango.LogAttr log_attrs, int attrs_len);
        public static Pango.Gravity gravity_get_for_matrix (out Pango.Matrix matrix);
        public static Pango.Gravity gravity_get_for_script (Pango.Script script, Pango.Gravity base_gravity, Pango.GravityHint hint);
        public static double gravity_to_rotation (Pango.Gravity gravity);