From: Rico Tzschichholz Date: Thu, 20 Sep 2018 13:43:06 +0000 (+0200) Subject: vapi: Update GIDL-based bindings to fix unsupported type-arguments X-Git-Tag: 0.43.1~226 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74e33e1213504ebd604dca6a3e8ffeabbd060c22;p=thirdparty%2Fvala.git vapi: Update GIDL-based bindings to fix unsupported type-arguments --- diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi index 4c57bd5d8..1bf77c186 100644 --- a/vapi/gdk-2.0.vapi +++ b/vapi/gdk-2.0.vapi @@ -5088,8 +5088,8 @@ namespace Gdk { public virtual signal void to_embedder (double p0, double p1, void* p2, void* p3); } [CCode (cheader_filename = "gdk/gdk.h")] - [SimpleType] - public struct Atom { + [IntegerType] + public struct Atom : uint { [CCode (cname = "GDK_NONE")] public static Gdk.Atom NONE; public static Gdk.Atom intern (string atom_name, bool only_if_exists); diff --git a/vapi/goocanvas.vapi b/vapi/goocanvas.vapi index 614cb45a6..a7591c810 100644 --- a/vapi/goocanvas.vapi +++ b/vapi/goocanvas.vapi @@ -29,7 +29,7 @@ namespace Goo { public void convert_to_pixels (ref double x, ref double y); public unowned Cairo.Context create_cairo_context (); public virtual unowned Goo.CanvasItem create_item (Goo.CanvasItemModel model); - public static void create_path (GLib.Array commands, Cairo.Context cr); + public static void create_path (GLib.Array commands, Cairo.Context cr); public void get_bounds (out unowned double? left, out unowned double? top, out unowned double? right, out unowned double? bottom); public double get_default_line_width (); public unowned Goo.CanvasItem? get_item (Goo.CanvasItemModel model); @@ -44,7 +44,7 @@ namespace Goo { public void grab_focus (Goo.CanvasItem item); public Gdk.GrabStatus keyboard_grab (Goo.CanvasItem item, bool owner_events, uint32 time); public void keyboard_ungrab (Goo.CanvasItem item, uint32 time); - public static GLib.Array parse_path_data (string path_data); + public static GLib.Array parse_path_data (string path_data); public Gdk.GrabStatus pointer_grab (Goo.CanvasItem item, Gdk.EventMask event_mask, Gdk.Cursor? cursor, uint32 time); public void pointer_ungrab (Goo.CanvasItem item, uint32 time); public void register_widget_item (Goo.CanvasWidget witem); @@ -630,7 +630,7 @@ namespace Goo { [CCode (cheader_filename = "goocanvas.h")] public class CanvasStyle : GLib.Object { public weak Goo.CanvasStyle? parent; - public weak GLib.Array properties; + public weak GLib.Array properties; [CCode (has_construct_function = false)] public CanvasStyle (); public Goo.CanvasStyle copy (); @@ -912,7 +912,7 @@ namespace Goo { [CCode (cheader_filename = "goocanvas.h")] public struct CanvasItemSimpleData { public Cairo.Matrix? transform; - public weak GLib.Array clip_path_commands; + public weak GLib.Array clip_path_commands; public weak Goo.CanvasStyle style; public weak string tooltip; public double visibility_threshold; diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index 8b9679e0c..0ed7c0b51 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -3795,7 +3795,7 @@ namespace Gtk { public void set_property_value (string name, Gtk.SettingsValue svalue); public void set_string_property (string name, string v_string, string origin); [NoAccessorMethod] - public GLib.HashTable color_hash { owned get; } + public GLib.HashTable color_hash { owned get; } [NoAccessorMethod] public bool gtk_alternative_button_order { get; set; } [NoAccessorMethod] diff --git a/vapi/packages/gdk-2.0/gdk-2.0-custom.vala b/vapi/packages/gdk-2.0/gdk-2.0-custom.vala index 8e6e9be3a..3028c0059 100644 --- a/vapi/packages/gdk-2.0/gdk-2.0-custom.vala +++ b/vapi/packages/gdk-2.0/gdk-2.0-custom.vala @@ -26,8 +26,8 @@ namespace Gdk { public const Atom SELECTION_CLIPBOARD; [CCode (cheader_filename = "gdk/gdk.h")] - [SimpleType] - public struct Atom { + [IntegerType] + public struct Atom : uint { [CCode (cname="GDK_NONE")] public static Atom NONE; } diff --git a/vapi/packages/goocanvas/goocanvas-custom.vala b/vapi/packages/goocanvas/goocanvas-custom.vala index e40de41ab..69befb7a0 100644 --- a/vapi/packages/goocanvas/goocanvas-custom.vala +++ b/vapi/packages/goocanvas/goocanvas-custom.vala @@ -41,8 +41,8 @@ namespace Goo { [CCode (has_construct_function = false)] public Canvas(); - public static void create_path(GLib.Array commands, Cairo.Context cr); - public static GLib.Array parse_path_data (string path_data); + public static void create_path(GLib.Array commands, Cairo.Context cr); + public static GLib.Array parse_path_data (string path_data); public GLib.List? get_items_at (double x, double y, bool is_pointer_event); public GLib.List? get_items_in_area (Goo.CanvasBounds area, bool inside_area, bool allow_overlaps, bool include_containers); } @@ -152,7 +152,7 @@ namespace Goo public class CanvasStyle { public unowned Goo.CanvasStyle? parent; - public unowned GLib.Array properties; + public unowned GLib.Array properties; } public class CanvasTable @@ -203,7 +203,7 @@ namespace Goo public struct CanvasItemSimpleData { public Cairo.Matrix? transform; - public weak GLib.Array clip_path_commands; + public weak GLib.Array clip_path_commands; } /* Trying to describe a C union with dummy structs */ diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index 3a82a1528..d9c6218a3 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -672,7 +672,7 @@ gtk_selection_data_get_uris is_array="1" transfer_ownership="1" array_null_termi 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" +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"