From: Rico Tzschichholz Date: Sun, 22 Jan 2017 14:02:28 +0000 (+0100) Subject: vapi: Update GIR-based bindings X-Git-Tag: 0.35.4~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc5bba3450ecd95d6dcd95feb16f18dda6daf0fe;p=thirdparty%2Fvala.git vapi: Update GIR-based bindings --- diff --git a/vapi/geocode-glib-1.0.vapi b/vapi/geocode-glib-1.0.vapi index 33e3b5510..d4dd698be 100644 --- a/vapi/geocode-glib-1.0.vapi +++ b/vapi/geocode-glib-1.0.vapi @@ -20,6 +20,7 @@ namespace Geocode { public class BoundingBox : GLib.Object { [CCode (has_construct_function = false)] public BoundingBox (double top, double bottom, double left, double right); + public bool equal (Geocode.BoundingBox b); public double get_bottom (); public double get_left (); public double get_right (); @@ -55,6 +56,7 @@ namespace Geocode { public class Location : GLib.Object { [CCode (has_construct_function = false)] public Location (double latitude, double longitude, double accuracy = LocationAccuracy.UNKNOWN); + public bool equal (Geocode.Location b); public double get_accuracy (); public double get_altitude (); public Geocode.LocationCRS get_crs (); @@ -80,6 +82,15 @@ namespace Geocode { public double longitude { get; set; } public uint64 timestamp { get; construct; } } + [CCode (cheader_filename = "geocode-glib/geocode-glib.h", type_id = "geocode_mock_backend_get_type ()")] + public class MockBackend : GLib.Object, Geocode.Backend { + [CCode (has_construct_function = false)] + public MockBackend (); + public void add_forward_result (GLib.HashTable @params, GLib.List? results, GLib.Error? error); + public void add_reverse_result (GLib.HashTable @params, GLib.List? results, GLib.Error? error); + public void clear (); + public unowned GLib.GenericArray get_query_log (); + } [CCode (cheader_filename = "geocode-glib/geocode-glib.h", type_id = "geocode_nominatim_get_type ()")] [Version (since = "3.23.1")] public class Nominatim : GLib.Object, Geocode.Backend { @@ -94,11 +105,14 @@ namespace Geocode { public string base_url { owned get; construct; } [NoAccessorMethod] public string maintainer_email_address { owned get; construct; } + [NoAccessorMethod] + public string user_agent { owned get; set; } } [CCode (cheader_filename = "geocode-glib/geocode-glib.h", type_id = "geocode_place_get_type ()")] public class Place : GLib.Object { [CCode (has_construct_function = false)] public Place (string name, Geocode.PlaceType place_type); + public bool equal (Geocode.Place b); public unowned string get_administrative_area (); public unowned string get_area (); public unowned Geocode.BoundingBox get_bounding_box (); @@ -176,6 +190,13 @@ namespace Geocode { public abstract GLib.List reverse_resolve (GLib.HashTable @params, GLib.Cancellable? cancellable = null) throws GLib.Error; public abstract async GLib.List reverse_resolve_async (GLib.HashTable @params, GLib.Cancellable? cancellable) throws GLib.Error; } + [CCode (cheader_filename = "geocode-glib/geocode-glib.h", has_type_id = false)] + public struct MockBackendQuery { + public weak GLib.HashTable @params; + public bool is_forward; + public weak GLib.List results; + public weak GLib.Error error; + } [CCode (cheader_filename = "geocode-glib/geocode-glib.h", cprefix = "GEOCODE_LOCATION_CRS_", type_id = "geocode_location_crs_get_type ()")] public enum LocationCRS { WGS84 diff --git a/vapi/gstreamer-player-1.0.vapi b/vapi/gstreamer-player-1.0.vapi index 5fa0de36a..a456090f9 100644 --- a/vapi/gstreamer-player-1.0.vapi +++ b/vapi/gstreamer-player-1.0.vapi @@ -13,6 +13,7 @@ namespace Gst { [Version (since = "1.12")] public void config_set_seek_accurate (bool accurate); public static void config_set_user_agent (Gst.Structure config, string agent); + public static unowned GLib.List get_audio_streams (Gst.PlayerMediaInfo info); public int64 get_audio_video_offset (); public double get_color_balance (Gst.PlayerColorBalanceType type); public Gst.Structure get_config (); @@ -30,8 +31,11 @@ namespace Gst { public Gst.Element get_pipeline (); public Gst.ClockTime get_position (); public double get_rate (); + public static unowned GLib.List get_subtitle_streams (Gst.PlayerMediaInfo info); public string get_subtitle_uri (); public string get_uri (); + public Gst.Sample get_video_snapshot (Gst.PlayerSnapshotFormat format, Gst.Structure? config); + public static unowned GLib.List get_video_streams (Gst.PlayerMediaInfo info); public double get_volume (); public bool has_color_balance (); public void pause (); @@ -171,8 +175,11 @@ namespace Gst { public void expose (); public void get_render_rectangle (out int x, out int y, out int width, out int height); public void* get_window_handle (); + public static Gst.PlayerVideoRenderer new_with_sink (void* window_handle, Gst.Element video_sink); public void set_render_rectangle (int x, int y, int width, int height); public void set_window_handle (void* window_handle); + [NoAccessorMethod] + public Gst.Element video_sink { owned get; set; } public void* window_handle { get; set construct; } } [CCode (cheader_filename = "gst/player/player.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gst_player_visualization_get_type ()")] @@ -201,6 +208,16 @@ namespace Gst { CONTRAST; public static unowned string get_name (Gst.PlayerColorBalanceType type); } + [CCode (cheader_filename = "gst/player/player.h", cprefix = "GST_PLAYER_THUMBNAIL_", has_type_id = false)] + public enum PlayerSnapshotFormat { + RAW_NATIVE, + [CCode (cname = "GST_PLAYER_THUMBNAIL_RAW_xRGB")] + RAW_XRGB, + [CCode (cname = "GST_PLAYER_THUMBNAIL_RAW_BGRx")] + RAW_BGRX, + JPG, + PNG + } [CCode (cheader_filename = "gst/player/player.h", cprefix = "GST_PLAYER_STATE_", type_id = "gst_player_state_get_type ()")] public enum PlayerState { STOPPED, diff --git a/vapi/gtk+-4.0.vapi b/vapi/gtk+-4.0.vapi index 55f2e5858..ffe6c0833 100644 --- a/vapi/gtk+-4.0.vapi +++ b/vapi/gtk+-4.0.vapi @@ -5772,9 +5772,6 @@ namespace Gdk { public abstract class VulkanContext : Gdk.DrawContext, GLib.Initable { [CCode (has_construct_function = false)] protected VulkanContext (); - public uint32 get_draw_index (); - public uint32 get_n_images (); - public uint32 get_queue_family_index (); public signal void images_updated (); } [CCode (cheader_filename = "gdk/gdk.h", type_id = "gdk_window_get_type ()")] @@ -6799,10 +6796,6 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdk.h")] public static bool get_show_events (); [CCode (cheader_filename = "gdk/gdk.h")] - public static void init ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[] argv); - [CCode (cheader_filename = "gdk/gdk.h")] - public static bool init_check ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[] argv); - [CCode (cheader_filename = "gdk/gdk.h")] public static void keyval_convert_case (uint symbol, out uint lower, out uint upper); [CCode (cheader_filename = "gdk/gdk.h")] public static uint keyval_from_name (string keyval_name); @@ -6835,9 +6828,6 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdk.h")] public static Cairo.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, int index_ranges, int n_ranges); [CCode (cheader_filename = "gdk/gdk.h")] - [Version (since = "2.2")] - public static void parse_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[] argv); - [CCode (cheader_filename = "gdk/gdk.h")] public static Gdk.Pixbuf? pixbuf_get_from_surface (Cairo.Surface surface, int src_x, int src_y, int width, int height); [CCode (cheader_filename = "gdk/gdk.h")] public static void property_change (Gdk.Window window, Gdk.Atom property, Gdk.Atom type, int format, Gdk.PropMode mode, [CCode (array_length = false, type = "const guchar*")] uint8[] data, int nelements); @@ -8593,10 +8583,6 @@ namespace Gtk { [Version (since = "2.4")] public void set_wrap_width (int width); [CCode (has_construct_function = false, type = "GtkWidget*")] - public ComboBox.with_area (Gtk.CellArea area); - [CCode (has_construct_function = false, type = "GtkWidget*")] - public ComboBox.with_area_and_entry (Gtk.CellArea area); - [CCode (has_construct_function = false, type = "GtkWidget*")] [Version (since = "2.24")] public ComboBox.with_entry (); [CCode (has_construct_function = false, type = "GtkWidget*")] @@ -8612,9 +8598,6 @@ namespace Gtk { public string? active_id { owned get; set; } [Version (since = "2.14")] public Gtk.SensitivityType button_sensitivity { get; set; } - [NoAccessorMethod] - [Version (since = "3.0")] - public Gtk.CellArea cell_area { owned get; construct; } [Version (since = "2.4")] public int column_span_column { get; set; } [Version (since = "2.24")] @@ -9297,7 +9280,7 @@ namespace Gtk { protected ExpanderAccessible (); } [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_file_chooser_button_get_type ()")] - public class FileChooserButton : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser, Gtk.Orientable { + public class FileChooserButton : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser { [CCode (has_construct_function = false, type = "GtkWidget*")] [Version (since = "2.6")] public FileChooserButton (string title, Gtk.FileChooserAction action); @@ -9520,7 +9503,7 @@ namespace Gtk { protected FlowBoxChildAccessible (); } [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_font_button_get_type ()")] - public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Actionable, Gtk.Buildable, Gtk.FontChooser { + public class FontButton : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.FontChooser { [CCode (has_construct_function = false, type = "GtkWidget*")] [Version (since = "2.4")] public FontButton (); @@ -12663,7 +12646,7 @@ namespace Gtk { public signal bool change_current_page (int object); } [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_shortcuts_shortcut_get_type ()")] - public class ShortcutsShortcut : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable { + public class ShortcutsShortcut : Gtk.Widget, Atk.Implementor, Gtk.Buildable { [CCode (has_construct_function = false)] protected ShortcutsShortcut (); [NoAccessorMethod] @@ -14451,8 +14434,6 @@ namespace Gtk { public Gdk.ModifierType get_modifier_mask (Gdk.ModifierIntent intent); [Version (since = "3.90")] public unowned Gtk.Widget? get_next_sibling (); - [Version (since = "2.4")] - public bool get_no_show_all (); [Version (since = "3.8")] public double get_opacity (); public unowned Pango.Context get_pango_context (); @@ -14618,8 +14599,6 @@ namespace Gtk { public void set_margin_start (int margin); [Version (since = "3.0")] public void set_margin_top (int margin); - [Version (since = "2.4")] - public void set_no_show_all (bool no_show_all); [Version (since = "3.8")] public void set_opacity (double opacity); public void set_parent (Gtk.Widget parent); @@ -14656,7 +14635,6 @@ namespace Gtk { public void set_window (owned Gdk.Window window); [Version (since = "3.0")] public void shape_combine_region (Cairo.Region? region); - public virtual void show_all (); public void show_now (); [Version (since = "3.10")] public void size_allocate_with_baseline (Gtk.Allocation allocation, int baseline); @@ -14713,7 +14691,6 @@ namespace Gtk { [Version (since = "3.0")] public int margin_top { get; set; } public string name { get; set; } - public bool no_show_all { get; set; } [Version (since = "3.8")] public double opacity { get; set; } public Gtk.Widget parent { get; set; } @@ -17475,9 +17452,6 @@ namespace Gtk { [Version (since = "3.0")] public static uint get_minor_version (); [CCode (cheader_filename = "gtk/gtk.h")] - [Version (since = "2.6")] - public static GLib.OptionGroup get_option_group (bool open_default_display); - [CCode (cheader_filename = "gtk/gtk.h")] public static void grab_add (Gtk.Widget widget); [CCode (cheader_filename = "gtk/gtk.h")] public static unowned Gtk.Widget? grab_get_current (); @@ -17487,12 +17461,9 @@ namespace Gtk { [Version (since = "2.14")] public static void hsv_to_rgb (double h, double s, double v, out double r, out double g, out double b); [CCode (cheader_filename = "gtk/gtk.h")] - public static void init ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv); - [CCode (cheader_filename = "gtk/gtk.h")] - public static bool init_check ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv); + public static void init (); [CCode (cheader_filename = "gtk/gtk.h")] - [Version (since = "2.6")] - public static bool init_with_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv, string? parameter_string, [CCode (array_length = false, array_null_terminated = true)] GLib.OptionEntry[] entries, string? translation_domain) throws GLib.Error; + public static bool init_check (); [CCode (cheader_filename = "gtk/gtk.h")] public static void main (); [CCode (cheader_filename = "gtk/gtk.h")] @@ -17506,8 +17477,6 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static void main_quit (); [CCode (cheader_filename = "gtk/gtk.h")] - public static bool parse_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[] argv); - [CCode (cheader_filename = "gtk/gtk.h")] [Version (since = "2.10")] public static Gtk.PageSetup print_run_page_setup_dialog (Gtk.Window? parent, Gtk.PageSetup? page_setup, Gtk.PrintSettings settings); [CCode (cheader_filename = "gtk/gtk.h")] diff --git a/vapi/libwnck-3.0.vapi b/vapi/libwnck-3.0.vapi index 4d57e41eb..b11f97307 100644 --- a/vapi/libwnck-3.0.vapi +++ b/vapi/libwnck-3.0.vapi @@ -87,7 +87,7 @@ namespace Wnck { public unowned Wnck.Window get_active_window (); public unowned Wnck.Workspace get_active_workspace (); public ulong get_background_pixmap (); - public static unowned Wnck.Screen get_default (); + public static unowned Wnck.Screen? get_default (); public static unowned Wnck.Screen get_for_root (ulong root_window_id); public int get_height (); [Version (since = "2.20")] diff --git a/vapi/metadata/Gdk-4.0.metadata b/vapi/metadata/Gdk-4.0.metadata index fa13f4833..40a0860e1 100644 --- a/vapi/metadata/Gdk-4.0.metadata +++ b/vapi/metadata/Gdk-4.0.metadata @@ -73,8 +73,6 @@ EventTouchpadSwipe struct=false base_type="Gdk.Event" type_id="gdk_event_get_typ EventVisibility struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()" EventWindowState struct=false base_type="Gdk.Event" type_id="gdk_event_get_type ()" FilterFunc.data closure=2 -init*.argv unowned -parse_args.argv unowned property_change.data array selection_property_get skip=false .data array diff --git a/vapi/metadata/Gtk-4.0.metadata b/vapi/metadata/Gtk-4.0.metadata index 19aaa4d4d..885a1e798 100644 --- a/vapi/metadata/Gtk-4.0.metadata +++ b/vapi/metadata/Gtk-4.0.metadata @@ -66,7 +66,6 @@ CellRenderer binding_set_by_class skip=false ContainerClass .find_child_property skip=false -get_option_group skip=false // G-I cannot handle variadic functions *.*_valist skip=false @@ -371,8 +370,6 @@ rc_property_parse_* skip show_about_dialog skip=false test_init skip=false -init*.argv unowned -parse_args.argv unowned test_init.argvp unowned // Forward upstream diff --git a/vapi/webkit2gtk-4.0.vapi b/vapi/webkit2gtk-4.0.vapi index 98d05e239..1d390df01 100644 --- a/vapi/webkit2gtk-4.0.vapi +++ b/vapi/webkit2gtk-4.0.vapi @@ -334,6 +334,19 @@ namespace WebKit { [Version (deprecated = true, deprecated_since = "2.6")] public WebKit.URIRequest request { get; } } + [CCode (cheader_filename = "webkit2/webkit2.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "webkit_network_proxy_settings_get_type ()")] + [Compact] + public class NetworkProxySettings { + [CCode (has_construct_function = false)] + [Version (since = "2.16")] + public NetworkProxySettings (string? default_proxy_uri, string? ignore_hosts); + [Version (since = "2.16")] + public void add_proxy_for_scheme (string scheme, string proxy_uri); + [Version (since = "2.16")] + public WebKit.NetworkProxySettings copy (); + [Version (since = "2.16")] + public void free (); + } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_notification_get_type ()")] public class Notification : GLib.Object { [CCode (has_construct_function = false)] @@ -344,12 +357,16 @@ namespace WebKit { public unowned string get_body (); [Version (since = "2.8")] public uint64 get_id (); + [Version (since = "2.16")] + public unowned string? get_tag (); [Version (since = "2.8")] public unowned string get_title (); [Version (since = "2.8")] public string body { get; } [Version (since = "2.8")] public uint64 id { get; } + [Version (since = "2.16")] + public string tag { get; } [Version (since = "2.8")] public string title { get; } [HasEmitter] @@ -434,6 +451,30 @@ namespace WebKit { public bool uri_scheme_is_no_access (string scheme); public bool uri_scheme_is_secure (string scheme); } + [CCode (cheader_filename = "webkit2/webkit2.h", ref_function = "webkit_security_origin_ref", type_id = "webkit_security_origin_get_type ()", unref_function = "webkit_security_origin_unref")] + [Compact] + public class SecurityOrigin { + [CCode (has_construct_function = false)] + [Version (since = "2.16")] + public SecurityOrigin (string protocol, string host, uint16 port); + [CCode (has_construct_function = false)] + [Version (since = "2.16")] + public SecurityOrigin.for_uri (string uri); + [Version (since = "2.16")] + public unowned string? get_host (); + [Version (since = "2.16")] + public uint16 get_port (); + [Version (since = "2.16")] + public unowned string get_protocol (); + [Version (since = "2.16")] + public bool is_opaque (); + [Version (since = "2.16")] + public unowned WebKit.SecurityOrigin @ref (); + [Version (since = "2.16")] + public string? to_string (); + [Version (since = "2.16")] + public void unref (); + } [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_settings_get_type ()")] public class Settings : GLib.Object { [CCode (has_construct_function = false)] @@ -737,6 +778,8 @@ namespace WebKit { [Version (deprecated = true, deprecated_since = "2.10.")] public void set_disk_cache_directory (string directory); public void set_favicon_database_directory (string? path); + [Version (since = "2.16")] + public void set_network_proxy_settings (WebKit.NetworkProxyMode proxy_mode, WebKit.NetworkProxySettings? proxy_settings); public void set_preferred_languages ([CCode (array_length = false, array_null_terminated = true)] string[]? languages); [Version (since = "2.4")] public void set_process_model (WebKit.ProcessModel process_model); @@ -757,6 +800,9 @@ namespace WebKit { [Version (since = "2.10")] public WebKit.WebsiteDataManager website_data_manager { get; construct; } public virtual signal void download_started (WebKit.Download download); + [HasEmitter] + [Version (since = "2.16")] + public virtual signal void initialize_notification_permissions (); [Version (since = "2.4")] public virtual signal void initialize_web_extensions (); } @@ -1139,6 +1185,13 @@ namespace WebKit { FORM_RESUBMITTED, OTHER } + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_NETWORK_PROXY_MODE_", type_id = "webkit_network_proxy_mode_get_type ()")] + [Version (since = "2.16")] + public enum NetworkProxyMode { + DEFAULT, + NO_PROXY, + CUSTOM + } [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_POLICY_DECISION_TYPE_", type_id = "webkit_policy_decision_type_get_type ()")] public enum PolicyDecisionType { NAVIGATION_ACTION,