From: Rico Tzschichholz Date: Thu, 23 Apr 2015 10:27:42 +0000 (+0200) Subject: vapi: Update GIR-based bindings X-Git-Tag: 0.29.1~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbdd9edf6cdb38b8a99dd68e31e8ca06581eec1f;p=thirdparty%2Fvala.git vapi: Update GIR-based bindings --- diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi index c3788bb00..559f98a64 100644 --- a/vapi/gdk-3.0.vapi +++ b/vapi/gdk-3.0.vapi @@ -5318,7 +5318,7 @@ namespace Gdk { public void set_keep_below (bool setting); public void set_modal_hint (bool modal); public void set_opacity (double opacity); - public void set_opaque_region (Cairo.Region region); + public void set_opaque_region (Cairo.Region? region); public void set_override_redirect (bool override_redirect); public void set_role (string role); public void set_shadow_width (int left, int right, int top, int bottom); diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 53817ef68..2ca74a316 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -1134,6 +1134,7 @@ namespace GLib { public void set_rate_limit (int limit_msecs); [NoAccessorMethod] public bool cancelled { get; } + [Deprecated (since = "2.46")] public GLib.MainContext context { construct; } [NoAccessorMethod] public int rate_limit { get; set; } @@ -1884,33 +1885,50 @@ namespace GLib { public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult, GLib.AsyncResult { [CCode (has_construct_function = false)] public SimpleAsyncResult (GLib.Object? source_object, void* source_tag); + [Deprecated (since = "2.46")] public void complete (); + [Deprecated (since = "2.46")] public void complete_in_idle (); [CCode (has_construct_function = false)] [PrintfFormat] public SimpleAsyncResult.error (GLib.Object? source_object, GLib.Quark domain, int code, string format, ...); [CCode (has_construct_function = false)] public SimpleAsyncResult.from_error (GLib.Object? source_object, GLib.Error error); + [Deprecated (since = "2.46")] public bool get_op_res_gboolean (); [CCode (simple_generics = true)] public unowned T get_op_res_gpointer (); + [Deprecated (since = "2.46")] public ssize_t get_op_res_gssize (); + [Deprecated (since = "2.46.")] public void* get_source_tag (); + [Deprecated (since = "2.46")] public static bool is_valid (GLib.AsyncResult result, GLib.Object? source, void* source_tag); + [Deprecated (since = "2.46")] public bool propagate_error () throws GLib.Error; [CCode (cheader_filename = "gio/gio.h", cname = "g_simple_async_report_gerror_in_idle")] + [Deprecated (since = "2.46")] public static async void report_gerror_in_idle (GLib.Object? object, GLib.Error error); + [Deprecated (since = "2.46")] public void run_in_thread (GLib.SimpleAsyncThreadFunc func, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null); + [Deprecated (since = "2.46")] public void set_check_cancellable (GLib.Cancellable? check_cancellable); + [Deprecated (since = "2.46")] [PrintfFormat] public void set_error (GLib.Quark domain, int code, string format, ...); + [Deprecated (since = "2.46")] public void set_error_va (GLib.Quark domain, int code, string format, va_list args); + [Deprecated (since = "2.46")] public void set_from_error (GLib.Error error); + [Deprecated (since = "2.46")] public void set_handle_cancellation (bool handle_cancellation); + [Deprecated (since = "2.46")] public void set_op_res_gboolean (bool op_res); [CCode (simple_generics = true)] public void set_op_res_gpointer (owned T op_res); + [Deprecated (since = "2.46")] public void set_op_res_gssize (ssize_t op_res); + [Deprecated (since = "2.46")] public void take_error (GLib.Error error); } [CCode (cheader_filename = "gio/gio.h", type_id = "g_simple_io_stream_get_type ()")] @@ -2120,6 +2138,7 @@ namespace GLib { public void set_backlog (int listen_backlog); [NoAccessorMethod] public int listen_backlog { get; set construct; } + public virtual signal void event (GLib.SocketListenerEvent event, GLib.Socket socket); } [CCode (cheader_filename = "gio/gio.h", type_id = "g_socket_service_get_type ()")] public class SocketService : GLib.SocketListener { @@ -2893,6 +2912,7 @@ namespace GLib { } [CCode (cheader_filename = "gio/gio.h", type_cname = "GTlsClientConnectionInterface", type_id = "g_tls_client_connection_get_type ()")] public interface TlsClientConnection : GLib.TlsConnection { + public abstract void copy_session_state (GLib.TlsClientConnection source); public GLib.List get_accepted_cas (); public unowned GLib.SocketConnectable get_server_identity (); public bool get_use_ssl3 (); @@ -3290,7 +3310,10 @@ namespace GLib { ATTRIBUTE_CHANGED, PRE_UNMOUNT, UNMOUNTED, - MOVED + MOVED, + RENAMED, + MOVED_IN, + MOVED_OUT } [CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_MONITOR_", type_id = "g_file_monitor_flags_get_type ()")] [Flags] @@ -3298,7 +3321,8 @@ namespace GLib { NONE, WATCH_MOUNTS, SEND_MOVED, - WATCH_HARD_LINKS + WATCH_HARD_LINKS, + WATCH_MOVES } [CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_QUERY_INFO_", type_id = "g_file_query_info_flags_get_type ()")] [Flags] @@ -3427,6 +3451,13 @@ namespace GLib { IPV4, IPV6 } + [CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_LISTENER_", type_id = "g_socket_listener_event_get_type ()")] + public enum SocketListenerEvent { + BINDING, + BOUND, + LISTENING, + LISTENED + } [CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_MSG_", type_id = "g_socket_msg_flags_get_type ()")] [Flags] public enum SocketMsgFlags { diff --git a/vapi/libgdata.vapi b/vapi/libgdata.vapi index 7e3e57419..6da69c3b2 100644 --- a/vapi/libgdata.vapi +++ b/vapi/libgdata.vapi @@ -1748,47 +1748,69 @@ namespace GData { public string parent_comment_uri { get; set; } } [CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_content", type_id = "gdata_youtube_content_get_type ()")] + [Deprecated] public class YouTubeContent : GData.MediaContent { [CCode (has_construct_function = false)] protected YouTubeContent (); + [Deprecated] public GData.YouTubeFormat get_format (); + [Deprecated] public GData.YouTubeFormat format { get; } } [CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_credit", type_id = "gdata_youtube_credit_get_type ()")] + [Deprecated] public class YouTubeCredit : GData.MediaCredit { [CCode (has_construct_function = false)] protected YouTubeCredit (); + [Deprecated] public unowned string get_entity_type (); + [Deprecated] public string entity_type { get; } } + [CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_feed", type_id = "gdata_youtube_feed_get_type ()")] + public class YouTubeFeed : GData.Feed { + [CCode (has_construct_function = false)] + protected YouTubeFeed (); + } [CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_query", type_id = "gdata_youtube_query_get_type ()")] public class YouTubeQuery : GData.Query { [CCode (has_construct_function = false)] public YouTubeQuery (string? q); public GData.YouTubeAge get_age (); + [Deprecated] public GData.YouTubeFormat get_format (); + [Deprecated] public unowned string get_language (); public unowned string get_license (); public void get_location (out double latitude, out double longitude, out double radius, out bool has_location); public unowned string get_order_by (); public unowned string get_restriction (); public GData.YouTubeSafeSearch get_safe_search (); + [Deprecated] public GData.YouTubeSortOrder get_sort_order (); + [Deprecated] public GData.YouTubeUploader get_uploader (); public void set_age (GData.YouTubeAge age); + [Deprecated] public void set_format (GData.YouTubeFormat format); + [Deprecated] public void set_language (string? language); public void set_license (string? license); public void set_location (double latitude, double longitude, double radius, bool has_location); public void set_order_by (string? order_by); public void set_restriction (string? restriction); public void set_safe_search (GData.YouTubeSafeSearch safe_search); + [Deprecated] public void set_sort_order (GData.YouTubeSortOrder sort_order); + [Deprecated] public void set_uploader (GData.YouTubeUploader uploader); public GData.YouTubeAge age { get; set; } + [Deprecated] public GData.YouTubeFormat format { get; set; } + [Deprecated] [NoAccessorMethod] public bool has_location { get; set; } + [Deprecated] public string language { get; set; } [NoAccessorMethod] public double latitude { get; set; } @@ -1800,7 +1822,9 @@ namespace GData { public string order_by { get; set; } public string restriction { get; set; } public GData.YouTubeSafeSearch safe_search { get; set; } + [Deprecated] public GData.YouTubeSortOrder sort_order { get; set; } + [Deprecated] public GData.YouTubeUploader uploader { get; set; } } [CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_service", type_id = "gdata_youtube_service_get_type ()")] @@ -1843,6 +1867,7 @@ namespace GData { public unowned string get_aspect_ratio (); public unowned GData.MediaCategory get_category (); public void get_coordinates (out double latitude, out double longitude); + [Deprecated] public unowned GData.YouTubeCredit get_credit (); public unowned string get_description (); public uint get_duration (); @@ -1857,16 +1882,19 @@ namespace GData { public unowned GData.YouTubeState get_state (); public unowned GLib.List get_thumbnails (); public int64 get_uploaded (); + [Deprecated] public unowned string get_video_id (); public static string get_video_id_from_uri (string video_uri); public uint get_view_count (); public bool is_restricted_in_country (string country); + [Deprecated] public unowned GData.YouTubeContent look_up_content (string type); public void set_access_control (string action, GData.YouTubePermission permission); public void set_aspect_ratio (string? aspect_ratio); public void set_category (GData.MediaCategory category); public void set_coordinates (double latitude, double longitude); public void set_description (string? description); + [Deprecated] public void set_is_draft (bool is_draft); public void set_is_private (bool is_private); public void set_keywords ([CCode (array_length = false, array_null_terminated = true)] string[] keywords); @@ -1876,10 +1904,12 @@ namespace GData { [NoAccessorMethod] public double average_rating { get; } public GData.MediaCategory category { get; set; } + [Deprecated] public GData.YouTubeCredit credit { get; } public string description { get; set; } public uint duration { get; } public uint favorite_count { get; } + [Deprecated] [NoAccessorMethod] public bool is_draft { get; set; } [NoAccessorMethod] @@ -1901,6 +1931,7 @@ namespace GData { public int64 recorded { get; set; } public GData.YouTubeState state { get; } public int64 uploaded { get; } + [Deprecated] public string video_id { get; } public uint view_count { get; } } @@ -2001,6 +2032,7 @@ namespace GData { THIS_MONTH } [CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_FORMAT_", type_id = "gdata_youtube_format_get_type ()")] + [Deprecated] public enum YouTubeFormat { UNKNOWN, RTSP_H263_AMR, @@ -2020,6 +2052,7 @@ namespace GData { STRICT } [CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_SORT_", type_id = "gdata_youtube_sort_order_get_type ()")] + [Deprecated] public enum YouTubeSortOrder { NONE, ASCENDING, @@ -2039,6 +2072,7 @@ namespace GData { WATCH_ON_MOBILE_FEED } [CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_UPLOADER_", type_id = "gdata_youtube_uploader_get_type ()")] + [Deprecated] public enum YouTubeUploader { ALL, PARTNER @@ -2388,6 +2422,7 @@ namespace GData { [CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_ASPECT_RATIO_WIDESCREEN")] public const string YOUTUBE_ASPECT_RATIO_WIDESCREEN; [CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_CREDIT_ENTITY_PARTNER")] + [Deprecated] public const string YOUTUBE_CREDIT_ENTITY_PARTNER; [CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_LICENSE_CC")] public const string YOUTUBE_LICENSE_CC; @@ -2396,6 +2431,7 @@ namespace GData { [CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_RATING_TYPE_MPAA")] public const string YOUTUBE_RATING_TYPE_MPAA; [CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_RATING_TYPE_SIMPLE")] + [Deprecated] public const string YOUTUBE_RATING_TYPE_SIMPLE; [CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_RATING_TYPE_V_CHIP")] public const string YOUTUBE_RATING_TYPE_V_CHIP; diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala index 0d6ecbe42..a4aad872c 100644 --- a/vapi/metadata/Gio-2.0-custom.vala +++ b/vapi/metadata/Gio-2.0-custom.vala @@ -72,6 +72,12 @@ namespace GLib { public async string? read_line_utf8_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null, out size_t length) throws GLib.IOError, GLib.IOError; } + [CCode (cheader_filename = "gio/gio.h", type_id = "g_file_monitor_get_type ()")] + public abstract class FileMonitor : GLib.Object { + [Deprecated (since = "2.46")] + public GLib.MainContext context { construct; } + } + [Compact] public class IOModuleScope { [CCode (has_construct_function = false)] diff --git a/vapi/metadata/Pango-1.0.metadata b/vapi/metadata/Pango-1.0.metadata index 2e04689ad..09e036896 100644 --- a/vapi/metadata/Pango-1.0.metadata +++ b/vapi/metadata/Pango-1.0.metadata @@ -50,6 +50,7 @@ Font .get_font_map nullable Layout .get_font_description nullable +config_key_get* nullable // Variadic TabArray diff --git a/vapi/pango.vapi b/vapi/pango.vapi index b6604bc79..f3c2bca99 100644 --- a/vapi/pango.vapi +++ b/vapi/pango.vapi @@ -158,11 +158,13 @@ namespace Pango { public void unref (); } [CCode (cheader_filename = "pango/pango.h", type_id = "pango_engine_get_type ()")] + [Deprecated (since = "1.37")] public abstract class Engine : GLib.Object { [CCode (has_construct_function = false)] protected Engine (); } [CCode (cheader_filename = "pango/pango.h", type_id = "pango_engine_lang_get_type ()")] + [Deprecated (since = "1.37")] public abstract class EngineLang : Pango.Engine { [CCode (has_construct_function = false)] protected EngineLang (); @@ -170,6 +172,7 @@ namespace Pango { public virtual void script_break (string text, int len, Pango.Analysis analysis, Pango.LogAttr attrs, int attrs_len); } [CCode (cheader_filename = "pango/pango.h", type_id = "pango_engine_shape_get_type ()")] + [Deprecated (since = "1.37")] public abstract class EngineShape : Pango.Engine { [CCode (has_construct_function = false)] protected EngineShape (); @@ -253,6 +256,7 @@ namespace Pango { public virtual void changed (); public Pango.Context create_context (); public virtual uint get_serial (); + [Deprecated (since = "1.37")] public unowned string get_shape_engine_type (); public virtual void list_families ([CCode (array_length_cname = "n_families", array_length_pos = 1.1)] out Pango.FontFamily[] families); public virtual Pango.Font? load_font (Pango.Context context, Pango.FontDescription desc); @@ -552,6 +556,7 @@ namespace Pango { public string to_string (); } [CCode (cheader_filename = "pango/pango.h", has_type_id = false)] + [Deprecated (since = "1.37")] public struct EngineInfo { public weak string id; public weak string engine_type; @@ -560,6 +565,7 @@ namespace Pango { public int n_scripts; } [CCode (cheader_filename = "pango/pango.h", has_type_id = false)] + [Deprecated (since = "1.37")] public struct EngineScriptInfo { public Pango.Script script; public weak string langs; @@ -935,8 +941,10 @@ namespace Pango { [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_ATTR_INDEX_FROM_TEXT_BEGINNING")] public const int ATTR_INDEX_FROM_TEXT_BEGINNING; [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_ENGINE_TYPE_LANG")] + [Deprecated (since = "1.37")] public const string ENGINE_TYPE_LANG; [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_ENGINE_TYPE_SHAPE")] + [Deprecated (since = "1.37")] public const string ENGINE_TYPE_SHAPE; [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_GLYPH_EMPTY")] public const Pango.Glyph GLYPH_EMPTY; @@ -945,6 +953,7 @@ namespace Pango { [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_GLYPH_UNKNOWN_FLAG")] public const Pango.Glyph GLYPH_UNKNOWN_FLAG; [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_RENDER_TYPE_NONE")] + [Deprecated (since = "1.37")] public const string RENDER_TYPE_NONE; [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_SCALE")] public const int SCALE; @@ -1006,8 +1015,10 @@ namespace Pango { [CCode (cheader_filename = "pango/pango.h")] public static void @break (string text, int length, Pango.Analysis analysis, [CCode (array_length_cname = "attrs_len", array_length_pos = 4.1)] Pango.LogAttr[] attrs); [CCode (cheader_filename = "pango/pango.h")] + [Deprecated (since = "1.37")] public static string? config_key_get (string key); [CCode (cheader_filename = "pango/pango.h")] + [Deprecated (since = "1.37")] public static string? config_key_get_system (string key); [CCode (cheader_filename = "pango/pango.h")] public static void default_break (string text, int length, Pango.Analysis? analysis, Pango.LogAttr attrs, int attrs_len); @@ -1018,12 +1029,14 @@ namespace Pango { [CCode (cheader_filename = "pango/pango.h")] public static void find_paragraph_boundary (string text, int length, out int paragraph_delimiter_index, out int next_paragraph_start); [CCode (cheader_filename = "pango/pango.h")] + [Deprecated (since = "1.37")] public static unowned string get_lib_subdirectory (); [CCode (cheader_filename = "pango/pango.h")] public static void get_log_attrs (string text, int length, int level, Pango.Language language, [CCode (array_length_cname = "attrs_len", array_length_pos = 5.1)] Pango.LogAttr[] log_attrs); [CCode (cheader_filename = "pango/pango.h")] public static bool get_mirror_char (unichar ch, unichar mirrored_ch); [CCode (cheader_filename = "pango/pango.h")] + [Deprecated (since = "1.37")] public static unowned string get_sysconf_subdirectory (); [CCode (cheader_filename = "pango/pango.h")] [Deprecated (replacement = "Pango.Gravity.get_for_matrix", since = "vala-0.18")] diff --git a/vapi/rest-0.7.vapi b/vapi/rest-0.7.vapi index 8a5f617a1..5b385650d 100644 --- a/vapi/rest-0.7.vapi +++ b/vapi/rest-0.7.vapi @@ -127,6 +127,7 @@ namespace Rest { public class ProxyAuth : GLib.Object { [CCode (has_construct_function = false)] protected ProxyAuth (); + public void cancel (); public void pause (); public void unpause (); }