[vala] vapi: Update GIR-based bindings



commit 15a9addd97e004c6529fd47f9a1a14ad46bc8b95
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Wed Dec 17 17:52:00 2014 +0100

    vapi: Update GIR-based bindings

 vapi/atspi-2.vapi                      |    2 +-
 vapi/clutter-1.0.vapi                  |   77 ++++++++-----------------------
 vapi/gio-2.0.vapi                      |   11 +++++
 vapi/webkit2gtk-4.0.vapi               |   31 +++++++++++++
 vapi/webkit2gtk-web-extension-4.0.vapi |   18 +++++---
 5 files changed, 75 insertions(+), 64 deletions(-)
---
diff --git a/vapi/atspi-2.vapi b/vapi/atspi-2.vapi
index 0bde155..29014bd 100644
--- a/vapi/atspi-2.vapi
+++ b/vapi/atspi-2.vapi
@@ -327,7 +327,7 @@ namespace Atspi {
        public interface TableCell : GLib.Object {
                public GLib.GenericArray<Atspi.Accessible> get_column_header_cells () throws GLib.Error;
                public int get_column_index () throws GLib.Error;
-               public int get_column_span (GLib.Error error);
+               public int get_column_span () throws GLib.Error;
                public void get_row_column_span (out int row, out int column, out int row_span, out int 
column_span) throws GLib.Error;
                public GLib.GenericArray<Atspi.Accessible> get_row_header_cells () throws GLib.Error;
                public int get_row_index () throws GLib.Error;
diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index 4ce9e09..41f2373 100644
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -5130,100 +5130,62 @@ namespace Clutter {
                public Clutter.Actor source { get; set construct; }
        }
        [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_alpha_get_type ()")]
+       [Deprecated (since = "1.12")]
        public class Alpha : GLib.InitiallyUnowned, Clutter.Scriptable {
                [CCode (has_construct_function = false)]
-               [Deprecated (since = "1.12")]
                public Alpha ();
                [CCode (has_construct_function = false)]
-               [Deprecated (since = "1.12")]
                public Alpha.full (Clutter.Timeline timeline, ulong mode);
-               [Deprecated (since = "1.12")]
                public double get_alpha ();
-               [Deprecated (since = "1.12")]
                public ulong get_mode ();
-               [Deprecated (since = "1.12")]
                public unowned Clutter.Timeline get_timeline ();
-               [Deprecated (since = "1.12")]
                public static ulong register_closure (GLib.Closure closure);
-               [Deprecated (since = "1.12")]
                public static ulong register_func (Clutter.AlphaFunc func);
-               [Deprecated (since = "1.12")]
                public void set_closure (GLib.Closure closure);
-               [Deprecated (since = "1.12")]
                public void set_func (owned Clutter.AlphaFunc func);
-               [Deprecated (since = "1.12")]
                public void set_mode (ulong mode);
-               [Deprecated (since = "1.12")]
                public void set_timeline (Clutter.Timeline timeline);
                [CCode (has_construct_function = false)]
-               [Deprecated (since = "1.12")]
                public Alpha.with_func (Clutter.Timeline timeline, owned Clutter.AlphaFunc func);
-               [Deprecated (since = "1.12")]
                public double alpha { get; }
-               [Deprecated (since = "1.12")]
                public ulong mode { get; set construct; }
-               [Deprecated (since = "1.12")]
                public Clutter.Timeline timeline { get; set; }
        }
        [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_animation_get_type ()")]
+       [Deprecated (since = "1.12")]
        public class Animation : GLib.Object, Clutter.Scriptable {
                [CCode (has_construct_function = false)]
-               [Deprecated (since = "1.12")]
                public Animation ();
-               [Deprecated (since = "1.12")]
                public unowned Clutter.Animation bind (string property_name, GLib.Value final);
-               [Deprecated (since = "1.12")]
                public unowned Clutter.Animation bind_interval (string property_name, owned Clutter.Interval 
interval);
                [Deprecated (since = "1.10")]
                public unowned Clutter.Alpha get_alpha ();
-               [Deprecated (since = "1.12")]
                public uint get_duration ();
-               [Deprecated (since = "1.12")]
                public unowned Clutter.Interval get_interval (string property_name);
-               [Deprecated (since = "1.12")]
                public bool get_loop ();
-               [Deprecated (since = "1.12")]
                public ulong get_mode ();
-               [Deprecated (since = "1.12")]
                public unowned GLib.Object get_object ();
-               [Deprecated (since = "1.12")]
                public unowned Clutter.Timeline get_timeline ();
-               [Deprecated (since = "1.12")]
                public bool has_property (string property_name);
                [Deprecated (since = "1.10")]
                public void set_alpha (Clutter.Alpha alpha);
-               [Deprecated (since = "1.12")]
                public void set_duration (uint msecs);
-               [Deprecated (since = "1.12")]
                public void set_loop (bool loop);
-               [Deprecated (since = "1.12")]
                public void set_mode (ulong mode);
-               [Deprecated (since = "1.12")]
                public void set_object (GLib.Object object);
-               [Deprecated (since = "1.12")]
                public void set_timeline (Clutter.Timeline? timeline);
-               [Deprecated (since = "1.12")]
                public void unbind_property (string property_name);
-               [Deprecated (since = "1.12")]
                public unowned Clutter.Animation update (string property_name, GLib.Value final);
-               [Deprecated (since = "1.12")]
                public void update_interval (string property_name, Clutter.Interval interval);
                [Deprecated (since = "1.10")]
                public Clutter.Alpha alpha { get; set; }
-               [Deprecated (since = "1.12")]
                public uint duration { get; set; }
-               [Deprecated (since = "1.12")]
                public bool loop { get; set; }
-               [Deprecated (since = "1.12")]
                public ulong mode { get; set; }
-               [Deprecated (since = "1.12")]
                public GLib.Object object { get; set; }
-               [Deprecated (since = "1.12")]
                public Clutter.Timeline timeline { get; set; }
-               [Deprecated (since = "1.12")]
                [HasEmitter]
                public virtual signal void completed ();
-               [Deprecated (since = "1.12")]
                public virtual signal void started ();
        }
        [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_animator_get_type ()")]
@@ -5250,18 +5212,13 @@ namespace Clutter {
        }
        [CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = 
"g_boxed_free", type_id = "clutter_animator_key_get_type ()")]
        [Compact]
+       [Deprecated (since = "1.12")]
        public class AnimatorKey {
-               [Deprecated (since = "1.12")]
                public ulong get_mode ();
-               [Deprecated (since = "1.12")]
                public unowned GLib.Object get_object ();
-               [Deprecated (since = "1.12")]
                public double get_progress ();
-               [Deprecated (since = "1.12")]
                public unowned string get_property_name ();
-               [Deprecated (since = "1.12")]
                public GLib.Type get_property_type ();
-               [Deprecated (since = "1.12")]
                public bool get_value (GLib.Value value);
        }
        [CCode (cheader_filename = "clutter/clutter.h")]
@@ -5700,6 +5657,8 @@ namespace Clutter {
                protected Constraint ();
                [NoWrapper]
                public virtual void update_allocation (Clutter.Actor actor, Clutter.ActorBox allocation);
+               [NoWrapper]
+               public virtual void update_preferred_size (Clutter.Actor actor, Clutter.Orientation 
direction, float for_size, float minimum_size, float natural_size);
        }
        [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_deform_effect_get_type ()")]
        public abstract class DeformEffect : Clutter.OffscreenEffect {
@@ -6523,7 +6482,6 @@ namespace Clutter {
                [CCode (has_construct_function = false)]
                public Shader ();
                public bool compile () throws GLib.Error;
-               public static GLib.Quark error_quark ();
                public unowned Cogl.Handle get_cogl_fragment_shader ();
                public unowned Cogl.Handle get_cogl_program ();
                public unowned Cogl.Handle get_cogl_vertex_shader ();
@@ -7945,7 +7903,8 @@ namespace Clutter {
        [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REQUEST_", type_id = 
"clutter_request_mode_get_type ()")]
        public enum RequestMode {
                HEIGHT_FOR_WIDTH,
-               WIDTH_FOR_HEIGHT
+               WIDTH_FOR_HEIGHT,
+               CONTENT_SIZE
        }
        [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = 
"clutter_rotate_axis_get_type ()")]
        public enum RotateAxis {
@@ -7980,13 +7939,6 @@ namespace Clutter {
                VERTICALLY,
                BOTH
        }
-       [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SHADER_ERROR_", has_type_id = 
false)]
-       [Deprecated (since = "1.8")]
-       public enum ShaderError {
-               NO_ASM,
-               NO_GLSL,
-               COMPILE
-       }
        [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = 
"clutter_shader_type_get_type ()")]
        public enum ShaderType {
                VERTEX_SHADER,
@@ -8139,6 +8091,14 @@ namespace Clutter {
                VALUE;
                public static GLib.Quark quark ();
        }
+       [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SHADER_ERROR_")]
+       [Deprecated (since = "1.8")]
+       public errordomain ShaderError {
+               NO_ASM,
+               NO_GLSL,
+               COMPILE;
+               public static GLib.Quark quark ();
+       }
        [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_ERROR_")]
        public errordomain TextureError {
                OUT_OF_MEMORY,
@@ -8147,6 +8107,7 @@ namespace Clutter {
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
+       [Deprecated (since = "1.12")]
        public delegate double AlphaFunc (Clutter.Alpha alpha);
        [CCode (cheader_filename = "clutter/clutter.h", instance_pos = 2.9)]
        [Deprecated (since = "1.6")]
@@ -8286,9 +8247,11 @@ namespace Clutter {
        [CCode (cheader_filename = "clutter/clutter.h")]
        public static void test_add_data_full (string test_path, owned GLib.TestDataFunc test_func);
        [CCode (cheader_filename = "clutter/clutter.h")]
-       public static bool test_check_actor_at_point (Clutter.Actor stage, Clutter.Point point, Clutter.Actor 
actor, Clutter.Actor result);
+       public static bool test_check_actor_at_point (Clutter.Actor stage, Clutter.Point point, Clutter.Actor 
actor, out Clutter.Actor? result);
+       [CCode (cheader_filename = "clutter/clutter.h")]
+       public static bool test_check_color_at_point (Clutter.Actor stage, Clutter.Point point, Clutter.Color 
color, out Clutter.Color result);
        [CCode (cheader_filename = "clutter/clutter.h")]
-       public static bool test_check_color_at_point (Clutter.Actor stage, Clutter.Point point, Clutter.Color 
color, Clutter.Color result);
+       public static unowned Clutter.Actor test_get_stage ();
        [CCode (cheader_filename = "clutter/clutter.h")]
        public static void test_init (int argc, string argv);
        [CCode (cheader_filename = "clutter/clutter.h")]
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 57769a9..873749e 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -1955,6 +1955,7 @@ namespace GLib {
                public ssize_t receive_with_blocking ([CCode (array_length_cname = "size", array_length_pos = 
1.5, array_length_type = "gsize")] uint8[] buffer, bool blocking, GLib.Cancellable? cancellable = null) 
throws GLib.Error;
                public ssize_t send ([CCode (array_length_cname = "size", array_length_pos = 1.5, 
array_length_type = "gsize")] uint8[] buffer, GLib.Cancellable? cancellable = null) throws GLib.Error;
                public ssize_t send_message (GLib.SocketAddress? address, [CCode (array_length_cname = 
"num_vectors", array_length_pos = 2.5)] GLib.OutputVector[] vectors, [CCode (array_length_cname = 
"num_messages", array_length_pos = 3.5)] GLib.SocketControlMessage[]? messages, int flags, GLib.Cancellable? 
cancellable = null) throws GLib.Error;
+               public int send_messages ([CCode (array_length_cname = "num_messages", array_length_pos = 
1.5, array_length_type = "guint")] GLib.OutputMessage[] messages, int flags, GLib.Cancellable? cancellable = 
null) throws GLib.Error;
                public ssize_t send_to (GLib.SocketAddress? address, [CCode (array_length_cname = "size", 
array_length_pos = 2.5, array_length_type = "gsize")] uint8[] buffer, GLib.Cancellable? cancellable = null) 
throws GLib.Error;
                public ssize_t send_with_blocking ([CCode (array_length_cname = "size", array_length_pos = 
1.5, array_length_type = "gsize")] uint8[] buffer, bool blocking, GLib.Cancellable? cancellable = null) 
throws GLib.Error;
                public void set_blocking (bool blocking);
@@ -2948,6 +2949,16 @@ namespace GLib {
                public size_t size;
        }
        [CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
+       public struct OutputMessage {
+               public weak GLib.SocketAddress address;
+               public GLib.OutputVector vectors;
+               public uint num_vectors;
+               public uint bytes_sent;
+               [CCode (array_length = false, array_null_terminated = true)]
+               public weak GLib.SocketControlMessage[] control_messages;
+               public uint num_control_messages;
+       }
+       [CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
        public struct OutputVector {
                public void* buffer;
                public size_t size;
diff --git a/vapi/webkit2gtk-4.0.vapi b/vapi/webkit2gtk-4.0.vapi
index d6a4ff8..9a49fd4 100644
--- a/vapi/webkit2gtk-4.0.vapi
+++ b/vapi/webkit2gtk-4.0.vapi
@@ -267,6 +267,22 @@ namespace WebKit {
                [Deprecated (since = "2.6")]
                public WebKit.URIRequest request { get; }
        }
+       [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_notification_get_type ()")]
+       public class Notification : GLib.Object {
+               [CCode (has_construct_function = false)]
+               protected Notification ();
+               public unowned string get_body ();
+               public uint64 get_id ();
+               public unowned string get_title ();
+               public string body { get; }
+               public uint64 id { get; }
+               public string title { get; }
+       }
+       [CCode (cheader_filename = "webkit2/webkit2.h", type_id = 
"webkit_notification_permission_request_get_type ()")]
+       public class NotificationPermissionRequest : GLib.Object, WebKit.PermissionRequest {
+               [CCode (has_construct_function = false)]
+               protected NotificationPermissionRequest ();
+       }
        [CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_plugin_get_type ()")]
        public class Plugin : GLib.Object {
                [CCode (has_construct_function = false)]
@@ -536,6 +552,15 @@ namespace WebKit {
                public void unregister_script_message_handler (string name);
                public signal void script_message_received (WebKit.JavascriptResult js_result);
        }
+       [CCode (cheader_filename = "webkit2/webkit2.h", type_id = 
"webkit_user_media_permission_request_get_type ()")]
+       public class UserMediaPermissionRequest : GLib.Object, WebKit.PermissionRequest {
+               [CCode (has_construct_function = false)]
+               protected UserMediaPermissionRequest ();
+               [NoAccessorMethod]
+               public bool is_for_audio_device { get; }
+               [NoAccessorMethod]
+               public bool is_for_video_device { get; }
+       }
        [CCode (cheader_filename = "webkit2/webkit2.h", ref_function = "webkit_user_script_ref", type_id = 
"webkit_user_script_get_type ()", unref_function = "webkit_user_script_unref")]
        [Compact]
        public class UserScript {
@@ -693,6 +718,7 @@ namespace WebKit {
                public double zoom_level { get; set; }
                public virtual signal bool authenticate (WebKit.AuthenticationRequest request);
                public virtual signal void close ();
+               public virtual signal bool close_notification (WebKit.Notification notification);
                public virtual signal bool context_menu (WebKit.ContextMenu context_menu, Gdk.Event event, 
WebKit.HitTestResult hit_test_result);
                public virtual signal void context_menu_dismissed ();
                public signal Gtk.Widget create (WebKit.NavigationAction navigation_action);
@@ -711,6 +737,7 @@ namespace WebKit {
                public virtual signal void run_as_modal ();
                public virtual signal bool run_file_chooser (WebKit.FileChooserRequest request);
                public virtual signal bool script_dialog (WebKit.ScriptDialog dialog);
+               public virtual signal bool show_notification (WebKit.Notification notification);
                public virtual signal void submit_form (WebKit.FormSubmissionRequest request);
                public virtual signal bool web_process_crashed ();
        }
@@ -1012,4 +1039,8 @@ namespace WebKit {
        public static uint get_micro_version ();
        [CCode (cheader_filename = "webkit2/webkit2.h")]
        public static uint get_minor_version ();
+       [CCode (cheader_filename = "webkit2/webkit2.h")]
+       public static bool user_media_permission_is_for_audio_device (WebKit.UserMediaPermissionRequest 
request);
+       [CCode (cheader_filename = "webkit2/webkit2.h")]
+       public static bool user_media_permission_is_for_video_device (WebKit.UserMediaPermissionRequest 
request);
 }
diff --git a/vapi/webkit2gtk-web-extension-4.0.vapi b/vapi/webkit2gtk-web-extension-4.0.vapi
index fb8159b..ef9b8f5 100644
--- a/vapi/webkit2gtk-web-extension-4.0.vapi
+++ b/vapi/webkit2gtk-web-extension-4.0.vapi
@@ -381,6 +381,7 @@ namespace WebKit {
                        public unowned WebKit.DOM.NodeList get_elements_by_tag_name_ns (string namespaceURI, 
string localName);
                        public unowned WebKit.DOM.Element get_first_element_child ();
                        public string get_id ();
+                       public string get_inner_html ();
                        public unowned WebKit.DOM.Element get_last_element_child ();
                        public unowned WebKit.DOM.Element get_next_element_sibling ();
                        public double get_offset_height ();
@@ -388,6 +389,7 @@ namespace WebKit {
                        public unowned WebKit.DOM.Element get_offset_parent ();
                        public double get_offset_top ();
                        public double get_offset_width ();
+                       public string get_outer_html ();
                        public unowned WebKit.DOM.Element get_previous_element_sibling ();
                        public long get_scroll_height ();
                        public long get_scroll_left ();
@@ -413,6 +415,8 @@ namespace WebKit {
                        public void set_attribute_ns (string? namespaceURI, string qualifiedName, string 
value) throws GLib.Error;
                        public void set_class_name (string value);
                        public void set_id (string value);
+                       public void set_inner_html (string value) throws GLib.Error;
+                       public void set_outer_html (string value) throws GLib.Error;
                        public void set_scroll_left (long value);
                        public void set_scroll_top (long value);
                        public WebKit.DOM.NamedNodeMap attributes { get; }
@@ -424,6 +428,7 @@ namespace WebKit {
                        public double client_width { get; }
                        public WebKit.DOM.Element first_element_child { get; }
                        public string id { owned get; set; }
+                       public string inner_html { owned get; set; }
                        public WebKit.DOM.Element last_element_child { get; }
                        public WebKit.DOM.Element next_element_sibling { get; }
                        public double offset_height { get; }
@@ -431,6 +436,7 @@ namespace WebKit {
                        public WebKit.DOM.Element offset_parent { get; }
                        public double offset_top { get; }
                        public double offset_width { get; }
+                       public string outer_html { owned get; set; }
                        public WebKit.DOM.Element previous_element_sibling { get; }
                        public long scroll_height { get; }
                        public long scroll_left { get; set; }
@@ -848,10 +854,12 @@ namespace WebKit {
                        public unowned WebKit.DOM.HTMLCollection get_children ();
                        public string get_content_editable ();
                        public string get_dir ();
+                       [Deprecated (since = "2.8")]
                        public string get_inner_html ();
                        public string get_inner_text ();
                        public bool get_is_content_editable ();
                        public string get_lang ();
+                       [Deprecated (since = "2.8")]
                        public string get_outer_html ();
                        public string get_outer_text ();
                        public long get_tab_index ();
@@ -859,10 +867,12 @@ namespace WebKit {
                        public void set_access_key (string value);
                        public void set_content_editable (string value) throws GLib.Error;
                        public void set_dir (string value);
-                       public void set_inner_html (string value) throws GLib.Error;
+                       [Deprecated (since = "2.8")]
+                       public void set_inner_html (string contents) throws GLib.Error;
                        public void set_inner_text (string value) throws GLib.Error;
                        public void set_lang (string value);
-                       public void set_outer_html (string value) throws GLib.Error;
+                       [Deprecated (since = "2.8")]
+                       public void set_outer_html (string contents) throws GLib.Error;
                        public void set_outer_text (string value) throws GLib.Error;
                        public void set_tab_index (long value);
                        public void set_title (string value);
@@ -874,11 +884,9 @@ namespace WebKit {
                        public bool draggable { get; set; }
                        [NoAccessorMethod]
                        public bool hidden { get; set; }
-                       public string inner_html { owned get; set; }
                        public string inner_text { owned get; set; }
                        public bool is_content_editable { get; }
                        public string lang { owned get; set; }
-                       public string outer_html { owned get; set; }
                        public string outer_text { owned get; set; }
                        [NoAccessorMethod]
                        public bool spellcheck { get; set; }
@@ -2562,8 +2570,6 @@ namespace WebKit {
                public const int _NODE_FILTER_SHOW_TEXT;
                [CCode (cheader_filename = "webkit2/webkit-web-extension.h", cname = 
"WEBKIT_DOM_NODE_FILTER_SKIP")]
                public const int _NODE_FILTER_SKIP;
-               [CCode (cheader_filename = "webkit2/webkit-web-extension.h", cname = 
"WEBKIT_DOM_NODE_NOTATION_NODE")]
-               public const int _NODE_NOTATION_NODE;
                [CCode (cheader_filename = "webkit2/webkit-web-extension.h", cname = 
"WEBKIT_DOM_NODE_PROCESSING_INSTRUCTION_NODE")]
                public const int _NODE_PROCESSING_INSTRUCTION_NODE;
                [CCode (cheader_filename = "webkit2/webkit-web-extension.h", cname = 
"WEBKIT_DOM_NODE_TEXT_NODE")]


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]