vapi: Regenerate GIR-based bindings to fix unsupported type-arguments

diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index c3080c2e23c76e8744fe3dd953f90ee3e8e28b62..4531a74fc59adf6dcffc5d6d41db59479a4d1536 100644 (file)
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -6883,7 +6883,7 @@ namespace Clutter {
                public uint get_length ();
                public uint get_n_nodes ();
                public Clutter.PathNode get_node (uint index_);
-               public GLib.SList<weak Clutter.PathNode> get_nodes ();
+               public GLib.SList<weak Clutter.PathNode?> get_nodes ();
                public uint get_position (double progress, out Clutter.Knot position);
                public void insert_node (int index_, Clutter.PathNode node);
                public void remove_node (uint index_);

diff --git a/vapi/clutter-gst-3.0.vapi b/vapi/clutter-gst-3.0.vapi
index 999f260c0d45d2f89ebf43a4e95ad7333ad30dd6..540f381927198de06b4d65ccf1f6832ecc61c814 100644 (file)
--- a/vapi/clutter-gst-3.0.vapi
+++ b/vapi/clutter-gst-3.0.vapi
@@ -89,7 +89,7 @@ namespace ClutterGst {
                public void get_capture_resolution (out int width, out int height);
                public unowned string get_name ();
                public unowned string get_node ();
-               public unowned GLib.GenericArray<ClutterGst.VideoResolution> get_supported_resolutions ();
+               public unowned GLib.GenericArray<ClutterGst.VideoResolution?> get_supported_resolutions ();
                public void set_capture_resolution (int width, int height);
                [NoAccessorMethod]
                public Gst.ElementFactory element_factory { owned get; construct; }

diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index 3bc75dae6ce09786d83240fbd78fac320008d111..4655d3aa2aa5cd53aaf46b0f0c6850ef118b737e 100644 (file)
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -4670,7 +4670,7 @@ namespace Gdk {
                [Version (deprecated = true, deprecated_since = "3.20.", since = "3.0")]
                public Gdk.GrabStatus grab (Gdk.Window window, Gdk.GrabOwnership grab_ownership, bool owner_events, Gdk.EventMask event_mask, Gdk.Cursor? cursor, uint32 time_);
                [Version (since = "3.0")]
-               public GLib.List<weak Gdk.Atom> list_axes ();
+               public GLib.List<weak Gdk.Atom?> list_axes ();
                public GLib.List<weak Gdk.Device>? list_slave_devices ();
                public void set_axis_use (uint index_, Gdk.AxisUse use);
                public void set_key (uint index_, uint keyval, Gdk.ModifierType modifiers);
@@ -4898,7 +4898,7 @@ namespace Gdk {
                [Version (since = "2.22")]
                public Gdk.DragAction get_suggested_action ();
                [Version (since = "2.22")]
-               public unowned GLib.List<Gdk.Atom> list_targets ();
+               public unowned GLib.List<Gdk.Atom?> list_targets ();
                [Version (since = "3.20")]
                public bool manage_dnd (Gdk.Window ipc_window, Gdk.DragAction actions);
                public void set_device (Gdk.Device device);
@@ -6699,12 +6699,12 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static void drag_abort (Gdk.DragContext context, uint32 time_);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static Gdk.DragContext drag_begin (Gdk.Window window, GLib.List<Gdk.Atom> targets);
+       public static Gdk.DragContext drag_begin (Gdk.Window window, GLib.List<Gdk.Atom?> targets);
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public static Gdk.DragContext drag_begin_for_device (Gdk.Window window, Gdk.Device device, GLib.List<Gdk.Atom> targets);
+       public static Gdk.DragContext drag_begin_for_device (Gdk.Window window, Gdk.Device device, GLib.List<Gdk.Atom?> targets);
        [CCode (cheader_filename = "gdk/gdk.h")]
        [Version (since = "3.20")]
-       public static Gdk.DragContext drag_begin_from_point (Gdk.Window window, Gdk.Device device, GLib.List<Gdk.Atom> targets, int x_root, int y_root);
+       public static Gdk.DragContext drag_begin_from_point (Gdk.Window window, Gdk.Device device, GLib.List<Gdk.Atom?> targets, int x_root, int y_root);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static void drag_drop (Gdk.DragContext context, uint32 time_);
        [CCode (cheader_filename = "gdk/gdk.h")]

diff --git a/vapi/geocode-glib-1.0.vapi b/vapi/geocode-glib-1.0.vapi
index 8de842105b8d58ec5eb556058a08027119a3f00a..6b3e5a7c5caa2805e39adbe2b70a59fa9488cdd9 100644 (file)
--- a/vapi/geocode-glib-1.0.vapi
+++ b/vapi/geocode-glib-1.0.vapi
@@ -92,7 +92,7 @@ namespace Geocode {
                public void add_forward_result (GLib.HashTable<string,GLib.Value?> @params, GLib.List<Geocode.Place>? results, GLib.Error? error);
                public void add_reverse_result (GLib.HashTable<string,GLib.Value?> @params, GLib.List<Geocode.Place>? results, GLib.Error? error);
                public void clear ();
-               public unowned GLib.GenericArray<Geocode.MockBackendQuery> get_query_log ();
+               public unowned GLib.GenericArray<Geocode.MockBackendQuery?> get_query_log ();
        }
        [CCode (cheader_filename = "geocode-glib/geocode-glib.h", type_id = "geocode_nominatim_get_type ()")]
        [Version (since = "3.23.1")]

diff --git a/vapi/gobject-2.0.vapi b/vapi/gobject-2.0.vapi
index 892a139b97c709df15ad067690948c8d68e533d7..2b8c5ca60eca43a4b2f52853fdfed3cb999b07f2 100644 (file)
--- a/vapi/gobject-2.0.vapi
+++ b/vapi/gobject-2.0.vapi
@@ -479,8 +479,8 @@ namespace GLib {
                public void insert (uint index_, GLib.Value value);
                public void prepend (GLib.Value value);
                public void remove (uint index_);
-               public void sort (GLib.CompareFunc<GLib.Value> compare_func);
-               public void sort_with_data (GLib.CompareDataFunc<GLib.Value> compare_func);
+               public void sort (GLib.CompareFunc<GLib.Value?> compare_func);
+               public void sort_with_data (GLib.CompareDataFunc<GLib.Value?> compare_func);
        }
        [CCode (cheader_filename = "glib-object.h", lower_case_csuffix = "type_plugin", type_id = "g_type_plugin_get_type ()")]
        public interface TypePlugin {

diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi
index 1fec5fe8cb09ce4310835e62b27517587b161127..dda2edd9665351ac1ebfda4ce83cebff62160a6b 100644 (file)
--- a/vapi/gstreamer-1.0.vapi
+++ b/vapi/gstreamer-1.0.vapi
@@ -29,7 +29,7 @@ namespace Gst {
                [CCode (cheader_filename = "gst/gst.h")]
                public static int construct_win_color (uint colorinfo);
                [CCode (cheader_filename = "gst/gst.h")]
-               public static GLib.SList<weak Gst.DebugCategory> get_all_categories ();
+               public static GLib.SList<weak Gst.DebugCategory?> get_all_categories ();
                [CCode (cheader_filename = "gst/gst.h")]
                [Version (since = "1.2")]
                public static Gst.DebugColorMode get_color_mode ();
@@ -1515,9 +1515,9 @@ namespace Gst {
                public uint size;
                public GLib.Type type;
                [CCode (simple_generics = true)]
-               public Gst.Iterator filter<T> ([CCode (type = "GCompareFunc")] GLib.SearchFunc<GLib.Value,T> func, T user_data);
+               public Gst.Iterator filter<T> ([CCode (type = "GCompareFunc")] GLib.SearchFunc<GLib.Value?,T> func, T user_data);
                [CCode (simple_generics = true)]
-               public bool find_custom<T> ([CCode (type = "GCompareFunc")] GLib.SearchFunc<GLib.Value,T> func, out GLib.Value elem, T user_data);
+               public bool find_custom<T> ([CCode (type = "GCompareFunc")] GLib.SearchFunc<GLib.Value?,T> func, out GLib.Value elem, T user_data);
                public Gst.IteratorResult fold ([CCode (delegate_target_pos = 2.1)] Gst.IteratorFoldFunction func, GLib.Value ret);
                public Gst.IteratorResult @foreach (Gst.IteratorForeachFunction func);
                public void free ();

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 04a9a9870fe47444beab11ed84a892f7fe577832..774d9274dd3adf4b63195372ee81f26a0d6d2650 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -6785,7 +6785,7 @@ namespace Gtk {
                public void set_string_property (string name, string v_string, string origin);
                [NoAccessorMethod]
                [Version (deprecated = true, deprecated_since = "3.8", since = "2.10")]
-               public GLib.HashTable<string,Gdk.Color> color_hash { owned get; }
+               public GLib.HashTable<string,Gdk.Color?> color_hash { owned get; }
                [NoAccessorMethod]
                public bool gtk_alternative_button_order { get; set; }
                [NoAccessorMethod]

diff --git a/vapi/gtk+-4.0.vapi b/vapi/gtk+-4.0.vapi
index 59520d8d1aba4f890cb6477b9e436a3390c62fa3..71e84f18f83a0f65cd1767d11ab1c2d50bff14aa 100644 (file)
--- a/vapi/gtk+-4.0.vapi
+++ b/vapi/gtk+-4.0.vapi
@@ -5069,7 +5069,7 @@ namespace Gdk {
                public bool get_key_is_modifier (out bool is_modifier);
                public bool get_keycode (out uint16 keycode);
                public bool get_keyval (out uint keyval);
-               public GLib.List<weak Gdk.TimeCoord>? get_motion_history ();
+               public GLib.List<weak Gdk.TimeCoord?>? get_motion_history ();
                public bool get_pad_axis_value (out uint index, out double value);
                public bool get_pad_button (out uint button);
                public bool get_pad_group_mode (out uint group, out uint mode);

diff --git a/vapi/libgsf-1.vapi b/vapi/libgsf-1.vapi
index 907dd8ec4d7131021eb854a9f015b11013a1d247..f2e1894aa0f93d9cb73fa1db7ab6dd89990b735a 100644 (file)
--- a/vapi/libgsf-1.vapi
+++ b/vapi/libgsf-1.vapi
@@ -83,8 +83,8 @@ namespace Gsf {
        public class InfileMSVBA : Gsf.Infile {
                [CCode (has_construct_function = false, type = "GsfInfile*")]
                public InfileMSVBA (Gsf.Infile source) throws GLib.Error;
-               public unowned GLib.HashTable<string,uint8[]?> get_modules ();
-               public GLib.HashTable<string,uint8[]?> steal_modules ();
+               public unowned GLib.HashTable<string,void*> get_modules ();
+               public GLib.HashTable<string,void*> steal_modules ();
        }
        [CCode (cheader_filename = "gsf/gsf.h", type_id = "gsf_infile_stdio_get_type ()")]
        public class InfileStdio : Gsf.Infile {

diff --git a/vapi/metadata/Gsf-1.metadata b/vapi/metadata/Gsf-1.metadata
index d930da5f6776b702758cfb0b8bd2313eca713f47..c5a2c8aefb614864f4d7c01f780bdda10fc441cf 100644 (file)
--- a/vapi/metadata/Gsf-1.metadata
+++ b/vapi/metadata/Gsf-1.metadata
@@ -11,8 +11,8 @@ Infile
   .child_by_vaname skip=false
 
 InfileMSVBA
-  .get_modules type="unowned GLib.HashTable<string,uint8[]?>"
-  .steal_modules type="GLib.HashTable<string,uint8[]?>"
+  .get_modules type="unowned GLib.HashTable<string,void*>"
+  .steal_modules type="GLib.HashTable<string,void*>"
 
 Input
   .* skip=false

diff --git a/vapi/metadata/Gst-1.0-custom.vala b/vapi/metadata/Gst-1.0-custom.vala
index f5518ac9522ddf90776bf4f61237809f86c1df64..a101f7c19349a5459f4e36c8b8194dc096970a61 100644 (file)
--- a/vapi/metadata/Gst-1.0-custom.vala
+++ b/vapi/metadata/Gst-1.0-custom.vala
@@ -62,9 +62,9 @@ namespace Gst {
        [Compact, CCode (copy_function = "gst_iterator_copy", free_function = "gst_iterator_free", type_id = "gst_iterator_get_type ()")]
        public class Iterator {
                [CCode (simple_generics = true)]
-               public Gst.Iterator filter<T> ([CCode (type = "GCompareFunc")] GLib.SearchFunc<GLib.Value,T> func, T user_data);
+               public Gst.Iterator filter<T> ([CCode (type = "GCompareFunc")] GLib.SearchFunc<GLib.Value?,T> func, T user_data);
                [CCode (simple_generics = true)]
-               public bool find_custom<T> ([CCode (type = "GCompareFunc")] GLib.SearchFunc<GLib.Value,T> func, out GLib.Value elem, T user_data);
+               public bool find_custom<T> ([CCode (type = "GCompareFunc")] GLib.SearchFunc<GLib.Value?,T> func, out GLib.Value elem, T user_data);
        }
 
        [Compact, CCode (ref_function = "gst_mini_object_ref", unref_function = "gst_mini_object_unref", get_value_function = "g_value_get_boxed", set_value_function = "g_value_set_boxed", take_value_function = "g_value_take_boxed")]

diff --git a/vapi/metadata/Gtk-3.0.metadata b/vapi/metadata/Gtk-3.0.metadata
index 4e36d12f5b9662cc5a90df3725e789c95387c436..d06320656213c324c1e8eef79df1f76514ad692b 100644 (file)
--- a/vapi/metadata/Gtk-3.0.metadata
+++ b/vapi/metadata/Gtk-3.0.metadata
@@ -358,7 +358,7 @@ RecentFilterInfo
   .groups nullable
 
 // Bug #: element-type properties
-Settings.color_hash type="GLib.HashTable<string,Gdk.Color>"
+Settings.color_hash type="GLib.HashTable<string,Gdk.Color?>"
 
 // Bug #: confused girparser
 Radio*.group#property no_accessor_method

diff --git a/vapi/metadata/Poppler-0.18.metadata b/vapi/metadata/Poppler-0.18.metadata
index 0f01088e3aa256640632ce13aef1c91de8af39dd..caf75ac4897e5ff77468ed97dfd6271f50cb1214 100644 (file)
--- a/vapi/metadata/Poppler-0.18.metadata
+++ b/vapi/metadata/Poppler-0.18.metadata
@@ -12,5 +12,5 @@ ActionLayer.layers unowned
 
 ANNOT_TEXT_ICON_* parent="Poppler.AnnotTextIcon" name="ANNOT_TEXT_ICON_(.+)"
 
-ActionLayer.layers type_arguments="Poppler.ActionLayer"
-ActionOCGState.state_list type_arguments="Poppler.ActionLayer"
+ActionLayer.layers type_arguments="Poppler.ActionLayer?"
+ActionOCGState.state_list type_arguments="Poppler.ActionLayer?"

diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi
index ad55004ccf6689c59771f1f2c89a030926d0a068..b41a2c5f2ea534812114253fa82ee6da180de711 100644 (file)
--- a/vapi/poppler-glib.vapi
+++ b/vapi/poppler-glib.vapi
@@ -529,9 +529,9 @@ namespace Poppler {
                protected Page ();
                [Version (since = "0.16")]
                public void add_annot (Poppler.Annot annot);
-               public GLib.List<Poppler.Rectangle> find_text (string text);
+               public GLib.List<Poppler.Rectangle?> find_text (string text);
                [Version (since = "0.22")]
-               public GLib.List<Poppler.Rectangle> find_text_with_options (string text, Poppler.FindFlags options);
+               public GLib.List<Poppler.Rectangle?> find_text_with_options (string text, Poppler.FindFlags options);
                public static void free_annot_mapping (GLib.List<Poppler.AnnotMapping> list);
                public static void free_form_field_mapping (GLib.List<Poppler.FormFieldMapping> list);
                public static void free_image_mapping (GLib.List<Poppler.ImageMapping> list);
@@ -553,7 +553,7 @@ namespace Poppler {
                [Version (since = "0.16")]
                public string get_selected_text (Poppler.SelectionStyle style, Poppler.Rectangle selection);
                [Version (deprecated = true, deprecated_since = "0.16")]
-               public GLib.List<Poppler.Rectangle> get_selection_region (double scale, Poppler.SelectionStyle style, Poppler.Rectangle selection);
+               public GLib.List<Poppler.Rectangle?> get_selection_region (double scale, Poppler.SelectionStyle style, Poppler.Rectangle selection);
                public void get_size (out double width, out double height);
                [Version (since = "0.16")]
                public string get_text ();
@@ -579,7 +579,7 @@ namespace Poppler {
                public void render_selection ([CCode (type = "cairo_t*")] Cairo.Context cairo, Poppler.Rectangle selection, Poppler.Rectangle old_selection, Poppler.SelectionStyle style, Poppler.Color glyph_color, Poppler.Color background_color);
                public void render_to_ps (Poppler.PSFile ps_file);
                [Version (deprecated = true, deprecated_since = "0.16")]
-               public static void selection_region_free (GLib.List<Poppler.Rectangle> region);
+               public static void selection_region_free (GLib.List<Poppler.Rectangle?> region);
                public string label { owned get; }
        }
        [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_page_transition_get_type ()")]
@@ -830,7 +830,7 @@ namespace Poppler {
        [CCode (cheader_filename = "poppler.h", has_type_id = false)]
        public struct ActionLayer {
                public Poppler.ActionLayerAction action;
-               public weak GLib.List<Poppler.ActionLayer> layers;
+               public weak GLib.List<Poppler.ActionLayer?> layers;
        }
        [CCode (cheader_filename = "poppler.h", has_type_id = false)]
        public struct ActionMovie {
@@ -849,7 +849,7 @@ namespace Poppler {
        public struct ActionOCGState {
                public Poppler.ActionType type;
                public string title;
-               public GLib.List<Poppler.ActionLayer> state_list;
+               public GLib.List<Poppler.ActionLayer?> state_list;
        }
        [CCode (cheader_filename = "poppler.h", has_type_id = false)]
        public struct ActionRendition {

diff --git a/vapi/vte-2.90.vapi b/vapi/vte-2.90.vapi
index 7bb47c401b381f62495231a2958290d45bca3ad5..b2ea7b6ebb8c03bf31c89086334d9ae36fcaa284 100644 (file)
--- a/vapi/vte-2.90.vapi
+++ b/vapi/vte-2.90.vapi
@@ -61,10 +61,10 @@ namespace Vte {
                public unowned Vte.Pty get_pty_object ();
                public long get_row_count ();
                public unowned string get_status_line ();
-               public string get_text ([CCode (delegate_target_pos = 1.5)] Vte.SelectionFunc? is_selected, out GLib.Array<Vte.CharAttributes> attributes);
+               public string get_text ([CCode (delegate_target_pos = 1.5)] Vte.SelectionFunc? is_selected, out GLib.Array<Vte.CharAttributes?> attributes);
                [Version (since = "0.11.11")]
-               public string get_text_include_trailing_spaces ([CCode (delegate_target_pos = 1.5)] Vte.SelectionFunc? is_selected, out GLib.Array<Vte.CharAttributes> attributes);
-               public string get_text_range (long start_row, long start_col, long end_row, long end_col, [CCode (delegate_target_pos = 5.5)] Vte.SelectionFunc? is_selected, out GLib.Array<Vte.CharAttributes> attributes);
+               public string get_text_include_trailing_spaces ([CCode (delegate_target_pos = 1.5)] Vte.SelectionFunc? is_selected, out GLib.Array<Vte.CharAttributes?> attributes);
+               public string get_text_range (long start_row, long start_col, long end_row, long end_col, [CCode (delegate_target_pos = 5.5)] Vte.SelectionFunc? is_selected, out GLib.Array<Vte.CharAttributes?> attributes);
                public bool get_visible_bell ();
                public unowned string get_window_title ();
                public void im_append_menuitems (Gtk.MenuShell menushell);