[vala/staging: 5/5] gtk+-2.0: port "struct" annotations from the GIR version

[Rico Tzschichholz <ricotz src gnome org>]

commit 92903c16573b9d25427204349cbce708c4cae1bc
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Thu Aug 21 10:45:13 2014 +0200

    gtk+-2.0: port "struct" annotations from the GIR version

 vapi/gtk+-2.0.vapi                       |   90 ++++++++++++++----------------
 vapi/packages/gtk+-2.0/gtk+-2.0.metadata |    9 +++
 2 files changed, 50 insertions(+), 49 deletions(-)
---
diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index c9f4f58..2b72bea 100644
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -332,13 +332,6 @@ namespace Gtk {
                public virtual signal void accel_changed (uint keyval, Gdk.ModifierType modifier, 
GLib.Closure accel_closure);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       [Compact]
-       public class AccelGroupEntry {
-               public GLib.Quark accel_path_quark;
-               public weak GLib.Closure closure;
-               public Gtk.AccelKey key;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class AccelLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable {
                public weak Gtk.AccelGroup accel_group;
                public uint accel_padding;
@@ -2985,12 +2978,6 @@ namespace Gtk {
                public unowned Gdk.Pixmap get_pixmap ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       [Compact]
-       public class PageRange {
-               public int end;
-               public int start;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class PageSetup : GLib.Object {
                [CCode (has_construct_function = false)]
                public PageSetup ();
@@ -3568,17 +3555,6 @@ namespace Gtk {
                public Gtk.RecentFilterFlags get_needed ();
                public void set_name (string name);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       [Compact]
-       public class RecentFilterInfo {
-               public int age;
-               public weak string applications;
-               public Gtk.RecentFilterFlags contains;
-               public weak string display_name;
-               public weak string groups;
-               public weak string mime_type;
-               public weak string uri;
-       }
        [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_recent_info_ref", type_id = 
"gtk_recent_info_get_type ()", unref_function = "gtk_recent_info_unref")]
        [Compact]
        public class RecentInfo {
@@ -3964,12 +3940,6 @@ namespace Gtk {
        public class SettingsPropertyValue {
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       [Compact]
-       public class SettingsValue {
-               public weak string origin;
-               public GLib.Value value;
-       }
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public class SizeGroup : GLib.Object, Gtk.Buildable {
                public uint have_height;
                public uint have_width;
@@ -4379,25 +4349,6 @@ namespace Gtk {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public TearoffMenuItem ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       [Compact]
-       public class TextAppearance {
-               public Gdk.Color bg_color;
-               public weak Gdk.Bitmap bg_stipple;
-               public uint draw_bg;
-               public Gdk.Color fg_color;
-               public weak Gdk.Bitmap fg_stipple;
-               public uint inside_selection;
-               public uint is_text;
-               public uint pad1;
-               public uint pad2;
-               public uint pad3;
-               public uint pad4;
-               public void* padding1;
-               public int rise;
-               public uint strikethrough;
-               public uint underline;
-       }
        [CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_text_attributes_ref", type_id = 
"gtk_text_attributes_get_type ()", unref_function = "gtk_text_attributes_unref")]
        [Compact]
        public class TextAttributes {
@@ -6370,6 +6321,12 @@ namespace Gtk {
                public signal void sort_column_changed ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public struct AccelGroupEntry {
+               public Gtk.AccelKey key;
+               public weak GLib.Closure closure;
+               public GLib.Quark accel_path_quark;
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public struct AccelKey {
                public uint accel_key;
                public Gdk.ModifierType accel_mods;
@@ -6397,6 +6354,11 @@ namespace Gtk {
                public weak string default_locales;
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public struct PageRange {
+               public int start;
+               public int end;
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public struct RadioActionEntry {
                public weak string name;
                public weak string stock_id;
@@ -6417,6 +6379,18 @@ namespace Gtk {
                public bool is_private;
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public struct RecentFilterInfo {
+               public Gtk.RecentFilterFlags contains;
+               public weak string uri;
+               public weak string display_name;
+               public weak string mime_type;
+               [CCode (array_length = false, array_null_terminated = true)]
+               public weak string[] applications;
+               [CCode (array_length = false, array_null_terminated = true)]
+               public weak string[] groups;
+               public int age;
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public struct Requisition {
                public int width;
                public int height;
@@ -6424,6 +6398,11 @@ namespace Gtk {
                public void free ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public struct SettingsValue {
+               public weak string origin;
+               public GLib.Value value;
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public struct StockItem {
                public weak string stock_id;
                public weak string label;
@@ -6440,6 +6419,19 @@ namespace Gtk {
                public uint info;
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public struct TextAppearance {
+               public Gdk.Color bg_color;
+               public Gdk.Color fg_color;
+               public weak Gdk.Bitmap bg_stipple;
+               public weak Gdk.Bitmap fg_stipple;
+               public int rise;
+               public uint underline;
+               public uint strikethrough;
+               public uint draw_bg;
+               public uint inside_selection;
+               public uint is_text;
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public struct TextIter {
                public bool backward_char ();
                public bool backward_chars (int count);
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 839807b..8596159 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -20,6 +20,7 @@ gtk_accel_group_connect_by_path.closure type_name="AccelGroupActivate" transfer_
 gtk_accel_group_find hidden="1"
 gtk_accel_group_query is_array="1" array_length_pos="2.1" array_length_cname="n_entries"
 gtk_accel_group_query.n_entries hidden="1"
+GtkAccelGroupEntry is_value_type="1"
 GtkAccelKey is_value_type="1"
 gtk_accel_label_get_accel.accelerator_key is_out="1"
 gtk_accel_label_get_accel.accelerator_mods is_out="1"
@@ -456,6 +457,7 @@ gtk_notebook_page_num hidden="1"
 gtk_offscreen_window_get_pixbuf transfer_ownership="1"
 GtkObject::destroy has_emitter="1"
 gtk_page_setup_copy transfer_ownership="1"
+GtkPageRange is_value_type="1"
 gtk_parse_args.argv is_array="1"
 gtk_paint_arrow.area nullable="1"
 gtk_paint_arrow.widget nullable="1"
@@ -598,6 +600,10 @@ GtkRecentData.groups is_array="1" weak="0" array_null_terminated="1"
 gtk_recent_filter_add_custom.func transfer_ownership="1"
 gtk_recent_filter_add_custom.data hidden="1"
 gtk_recent_filter_add_custom.data_destroy hidden="1"
+GtkRecentFilterInfo is_value_type="1"
+GtkRecentFilterInfo.applications is_array="1" array_null_terminated="1" nullable="1"
+GtkRecentFilterInfo.groups is_array="1" array_null_terminated="1" nullable="1"
+GtkRequestedSize is_value_type="1"
 GtkRequisition is_value_type="1"
 gtk_rc_get_style_by_paths nullable="1"
 gtk_rc_get_style_by_paths.widget_path nullable="1"
@@ -633,6 +639,7 @@ gtk_selection_data_set.length hidden="1"
 gtk_selection_data_set_uris.uris is_array="1" no_array_length="1" array_null_terminated="1"
 GtkSettings.queued_settings hidden="1"
 GtkSettings:color-hash type_arguments="string,Gdk.Color"
+GtkSettingsValue is_value_type="1"
 gtk_show_about_dialog ellipsis="1"
 gtk_show_about_dialog.parent nullable="1"
 gtk_show_uri.screen nullable="1"
@@ -703,6 +710,8 @@ gtk_test_init.argcp hidden="1"
 gtk_test_init.argvp is_array="1" is_ref="1" array_length_pos="0.9"
 gtk_test_display_button_window ellipsis="1"
 gtk_text_attributes_copy transfer_ownership="1"
+GtkTextAppearance is_value_type="1"
+GtkTextAppearance.pad* hidden="1"
 GtkTextAttributes.appearance weak="0"
 GtkTextAttributes.language weak="0"
 gtk_text_buffer_delete.start is_ref="1"