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

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 9e39035d0a7101e003bfe9f84c27a8c89e719ea7..a561e28bd6786f77f1c66f62ed39589cd7a5ac09 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -297,20 +297,14 @@ namespace Gtk {
                public bool get_is_locked ();
                public Gdk.ModifierType get_modifier_mask ();
                public void @lock ();
-               public unowned Gtk.AccelGroupEntry query (uint accel_key, Gdk.ModifierType accel_mods, uint n_entries);
+               [CCode (array_length_type = "guint")]
+               public unowned Gtk.AccelGroupEntry[] query (uint accel_key, Gdk.ModifierType accel_mods);
                public void unlock ();
                public bool is_locked { get; }
                public Gdk.ModifierType modifier_mask { get; }
                public virtual signal bool accel_activate (GLib.Object p0, uint p1, Gdk.ModifierType p2);
                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", type_id = "gtk_accel_label_get_type ()")]
        public class AccelLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
@@ -3584,12 +3578,6 @@ namespace Gtk {
                public void add_overlay (Gtk.Widget widget);
                public virtual signal bool get_child_position (Gtk.Widget widget, out Gdk.Rectangle allocation);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       [Compact]
-       public class PageRange {
-               public int end;
-               public int start;
-       }
        [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_page_setup_get_type ()")]
        public class PageSetup : GLib.Object {
                [CCode (has_construct_function = false)]
@@ -4192,17 +4180,6 @@ namespace Gtk {
                public bool filter (Gtk.RecentFilterInfo filter_info);
                public Gtk.RecentFilterFlags get_needed ();
        }
-       [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 {
@@ -4259,13 +4236,6 @@ namespace Gtk {
                [NoAccessorMethod]
                public Gtk.CellRenderer renderer { owned get; construct; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       [Compact]
-       public class RequestedSize {
-               public void* data;
-               public int minimum_size;
-               public int natural_size;
-       }
        [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_revealer_get_type ()")]
        public class Revealer : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
@@ -4629,12 +4599,6 @@ namespace Gtk {
                [NoAccessorMethod]
                public string gtk_xft_rgba { owned get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       [Compact]
-       public class SettingsValue {
-               public weak string origin;
-               public GLib.Value value;
-       }
        [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_size_group_get_type ()")]
        public class SizeGroup : GLib.Object, Gtk.Buildable {
                [CCode (has_construct_function = false)]
@@ -5181,20 +5145,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 uint draw_bg;
-               public Gdk.Color fg_color;
-               public uint inside_selection;
-               public uint is_text;
-               [CCode (array_length = false)]
-               public weak Gdk.RGBA[] rgba;
-               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 {
@@ -7381,6 +7331,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;
@@ -7425,6 +7381,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;
@@ -7445,6 +7406,24 @@ 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 RequestedSize {
+               public void* data;
+               public int minimum_size;
+               public int natural_size;
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public struct Requisition {
                public int width;
                public int height;
@@ -7452,6 +7431,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;
@@ -7472,6 +7456,19 @@ namespace Gtk {
                public void free ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
+       public struct TextAppearance {
+               public Gdk.Color bg_color;
+               public Gdk.Color fg_color;
+               public int rise;
+               public uint underline;
+               public uint strikethrough;
+               public uint draw_bg;
+               public uint inside_selection;
+               public uint is_text;
+               [CCode (array_length = false)]
+               public Gdk.RGBA[] rgba;
+       }
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public struct TextIter {
                public void* dummy1;
                public void* dummy2;

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 613241ebfa653e1c636bb0776126bccc943f409c..fb7a941fcc1c117de33786063bbfbbc3673ef344 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -19,6 +19,9 @@ GtkAccelGroupActivate has_target="1"
 gtk_accel_group_connect.closure type_name="AccelGroupActivate" transfer_ownership="1" ctype="GClosure*"
 gtk_accel_group_connect_by_path.closure type_name="AccelGroupActivate" transfer_ownership="1" ctype="GClosure*"
 gtk_accel_group_find hidden="1"
+gtk_accel_group_query is_array="1" array_length_pos="2.1" array_length_type="guint"
+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"
@@ -674,6 +677,7 @@ gtk_notebook_page_num hidden="1"
 gtk_offscreen_window_get_pixbuf transfer_ownership="1"
 GtkOverlay::get_child_position.allocation is_out="1"
 gtk_page_setup_copy transfer_ownership="1"
+GtkPageRange is_value_type="1"
 gtk_parse_args.argv is_array="1"
 gtk_paint_* deprecated_since="3.0"
 gtk_paint_arrow.area nullable="1"
@@ -845,6 +849,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_requisition_new hidden="1"
 GTK_RESIZE_IMMEDIATE deprecated="1"
@@ -887,6 +895,7 @@ gtk_selection_data_set_uris.uris is_array="1" no_array_length="1" array_null_ter
 GtkSettings.queued_settings hidden="1"
 GtkSettings:color-hash type_arguments="string,Gdk.Color"
 GtkSettings:gtk-touchscreen-mode deprecated_since="3.4" replacement="Gdk.Event.get_source_device"
+GtkSettingsValue is_value_type="1"
 gtk_show_about_dialog ellipsis="1"
 gtk_show_about_dialog.parent nullable="1"
 gtk_show_uri.screen nullable="1"
@@ -994,6 +1003,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.rgba weak="0"
 GtkTextAttributes.appearance weak="0"
 GtkTextAttributes.language weak="0"
 gtk_text_buffer_delete.start is_ref="1"