bindings: update GIR-based GNOME bindings from jhbuild

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index f60a22c7a6c36422079134b6759f3498e0a1f372..0347dd68f08b31cd1b83e7a7433ab0069ca8d06f 100644 (file)
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -428,7 +428,7 @@ atk:
        $(GENVAPI) --library $(srcdir)/atk --metadatadir $(METADATADIR) $(METADATADIR)/Atk-1.0-custom.vala $(GIRDIR)/Atk-1.0.gir
 
 atspi-2:
-       $(GENVAPI) --library $(srcdir)/atspi-2 --metadatadir $(METADATADIR) $(GIRDIR)/Atspi-2.0.gir
+       $(GENVAPI) --library $(srcdir)/atspi-2 --metadatadir $(METADATADIR) $(METADATADIR)/Atspi-2.0-custom.vala $(GIRDIR)/Atspi-2.0.gir
 
 clutter-1.0:
        $(GENVAPI) --library $(srcdir)/clutter-1.0 --metadatadir $(METADATADIR) $(METADATADIR)/Clutter-1.0-custom.vala --pkg atk --pkg cairo --pkg pango --pkg cogl-1.0 --pkg cogl-pango-1.0 --pkg json-glib-1.0 $(GIRDIR)/Clutter-1.0.gir

diff --git a/vapi/atspi-2.vapi b/vapi/atspi-2.vapi
index 8085c213205758c897e84b2c7b6ced2b989078b1..6148478ff625f281b2c8f7a961a36932633c1225 100644 (file)
--- a/vapi/atspi-2.vapi
+++ b/vapi/atspi-2.vapi
@@ -423,6 +423,7 @@ namespace Atspi {
        [CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_CACHE_", type_id = "atspi_cache_get_type ()")]
        [Flags]
        public enum Cache {
+               INTERFACES,
                NONE,
                PARENT,
                CHILDREN,
@@ -430,7 +431,6 @@ namespace Atspi {
                DESCRIPTION,
                STATES,
                ROLE,
-               INTERFACES,
                ATTRIBUTES,
                ALL,
                DEFAULT,

diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index 63ae59f10ae85c42298a97710970574539e5e568..f73e71299c454f49934f23d8a78c18dde627cd95 100644 (file)
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -5833,6 +5833,7 @@ namespace Clutter {
                public unowned Clutter.InputDevice get_source_device ();
                public unowned Clutter.Stage get_stage ();
                public Clutter.ModifierType get_state ();
+               public void get_state_full (out Clutter.ModifierType button_state, out Clutter.ModifierType base_state, out Clutter.ModifierType latched_state, out Clutter.ModifierType locked_state, out Clutter.ModifierType effective_state);
                public uint32 get_time ();
                [CCode (cname = "clutter_event_type")]
                public Clutter.EventType get_type ();
@@ -5990,6 +5991,7 @@ namespace Clutter {
                public unowned Clutter.Actor get_grabbed_actor ();
                public bool get_has_cursor ();
                public bool get_key (uint index_, out uint keyval, out Clutter.ModifierType modifiers);
+               public Clutter.ModifierType get_modifier_state ();
                public uint get_n_axes ();
                public uint get_n_keys ();
                public unowned Clutter.Actor get_pointer_actor ();
@@ -8176,6 +8178,8 @@ namespace Clutter {
        [Deprecated (since = "1.8")]
        public static void set_motion_events_enabled (bool enable);
        [CCode (cheader_filename = "clutter/clutter.h")]
+       public static void set_windowing_backend (string backend_type);
+       [CCode (cheader_filename = "clutter/clutter.h")]
        [Deprecated (replacement = "Threads.add_repaint_func", since = "vala-0.14")]
        public static uint threads_add_repaint_func (GLib.SourceFunc func, void* data, GLib.DestroyNotify notify);
        [CCode (cheader_filename = "clutter/clutter.h")]

diff --git a/vapi/cogl-1.0.vapi b/vapi/cogl-1.0.vapi
index 6e6b51c145169db047b171ec2254abb79df63597..20c636f936ba7f4bd4ffce3019d83b5d0657b338 100644 (file)
--- a/vapi/cogl-1.0.vapi
+++ b/vapi/cogl-1.0.vapi
@@ -274,6 +274,12 @@ namespace Cogl {
                public Cogl.Fixed sin ();
                public Cogl.Fixed tan ();
        }
+       [BooleanType]
+       [CCode (cheader_filename = "cogl/cogl.h")]
+       [GIR (name = "Bool")]
+       [SimpleType]
+       public struct Bool : bool {
+       }
        [CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
        public struct Color {
                public uchar red;

diff --git a/vapi/cogl-pango-1.0.vapi b/vapi/cogl-pango-1.0.vapi
index 4b2599cc053ce9ef9fabdda97def353664ab2a82..20e0ae51eef3b473ddb2573b3e8d4d0ab6aa6184 100644 (file)
--- a/vapi/cogl-pango-1.0.vapi
+++ b/vapi/cogl-pango-1.0.vapi
@@ -6,25 +6,29 @@ namespace CoglPango {
        public class FontMap : Pango.FontMap {
                [CCode (has_construct_function = false)]
                protected FontMap ();
-               public static void clear_glyph_cache (Pango.CairoFontMap fm);
-               public static Pango.Context create_context (Pango.CairoFontMap fm);
-               public static unowned Pango.Renderer get_renderer (Pango.CairoFontMap fm);
-               public static bool get_use_mipmapping (Pango.CairoFontMap fm);
+               public static void clear_glyph_cache (Pango.CairoFontMap font_map);
+               public static Pango.Context create_context (Pango.CairoFontMap font_map);
+               public static unowned Pango.Renderer get_renderer (Pango.CairoFontMap font_map);
+               public static Cogl.Bool get_use_mipmapping (Pango.CairoFontMap font_map);
                public static Pango.FontMap @new ();
                public static void set_resolution (Pango.CairoFontMap font_map, double dpi);
-               public static void set_use_mipmapping (Pango.CairoFontMap fm, bool value);
+               public static void set_use_mipmapping (Pango.CairoFontMap font_map, Cogl.Bool value);
        }
        [CCode (cheader_filename = "cogl-pango/cogl-pango.h", type_id = "cogl_pango_renderer_get_type ()")]
        public class Renderer : Pango.Renderer {
                [CCode (has_construct_function = false)]
                protected Renderer ();
+               public void* context { construct; }
        }
        [CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
        public static void ensure_glyph_cache_for_layout (Pango.Layout layout);
        [CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
+       [Deprecated (since = "1.16")]
        public static void render_layout (Pango.Layout layout, int x, int y, Cogl.Color color, int flags);
        [CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
+       [Deprecated (since = "1.16")]
        public static void render_layout_line (Pango.LayoutLine line, int x, int y, Cogl.Color color);
        [CCode (cheader_filename = "cogl-pango/cogl-pango.h")]
+       [Deprecated (since = "1.16")]
        public static void render_layout_subpixel (Pango.Layout layout, int x, int y, Cogl.Color color, int flags);
 }

diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index f7794f6d49177f58a99be380f74ccd0ce7361c7b..aa8bd533c3ecc3e92b0b5ac006ed7a35fb00d089 100644 (file)
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -4784,6 +4784,7 @@ namespace Gdk {
                public unowned Gdk.Device get_source_device ();
                public bool get_state (out Gdk.ModifierType state);
                public uint32 get_time ();
+               public unowned Gdk.Window get_window ();
                public static void handler_set (owned Gdk.EventFunc func);
                public static Gdk.Event peek ();
                public void put ();

diff --git a/vapi/gdl-3.0.vapi b/vapi/gdl-3.0.vapi
index 5ab8d2356aaa0df3035bd11343b89172ae0c07ca..8488adb72539582b3bbfab9153eff1cd9b346555 100644 (file)
--- a/vapi/gdl-3.0.vapi
+++ b/vapi/gdl-3.0.vapi
@@ -166,6 +166,10 @@ namespace Gdl {
                public int locked { get; set; }
                [NoAccessorMethod]
                public Gdl.SwitcherStyle switcher_style { get; set; }
+               [NoAccessorMethod]
+               public Gtk.PositionType tab_pos { get; set; }
+               [NoAccessorMethod]
+               public bool tab_reorderable { get; set; }
                public virtual signal void layout_changed ();
        }
        [CCode (cheader_filename = "gdl/gdl.h", type_id = "gdl_dock_notebook_get_type ()")]
@@ -285,6 +289,10 @@ namespace Gdl {
                public int insert_page (Gtk.Widget page, Gtk.Widget tab_widget, string label, string tooltips, string stock_id, Gdk.Pixbuf pixbuf_icon, int position);
                [NoAccessorMethod]
                public Gdl.SwitcherStyle switcher_style { get; set; }
+               [NoAccessorMethod]
+               public Gtk.PositionType tab_pos { get; set; }
+               [NoAccessorMethod]
+               public bool tab_reorderable { get; set; }
        }
        [CCode (cheader_filename = "gdl/gdl.h", has_type_id = false)]
        public struct DockRequest {

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 414d432d2a2fc4622a4fe094db1f56bfc0b8fb73..4688fba78a73fb8db68dc0be3171b864a11299ef 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -1465,8 +1465,6 @@ namespace GLib {
                [NoWrapper]
                public virtual void get_item_attributes (int item_index, [CCode (type = "GHashTable**")] out GLib.HashTable<string,GLib.Variant>? attributes);
                public virtual GLib.MenuModel get_item_link (int item_index, string link);
-               [NoWrapper]
-               public virtual void get_item_links (int item_index, [CCode (type = "GHashTable**")] out GLib.HashTable<string,GLib.MenuModel>? links);
                public virtual int get_n_items ();
                public virtual bool is_mutable ();
                public virtual GLib.MenuAttributeIter iterate_item_attributes (int item_index);
@@ -2534,6 +2532,7 @@ namespace GLib {
                public abstract async bool make_directory_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error;
                public bool make_directory_with_parents (GLib.Cancellable? cancellable = null) throws GLib.Error;
                public abstract bool make_symbolic_link (string symlink_value, GLib.Cancellable? cancellable = null) throws GLib.Error;
+               public abstract bool measure_disk_usage_finish (GLib.AsyncResult result, out uint64 disk_usage, out uint64 num_dirs, out uint64 num_files) throws GLib.Error;
                public GLib.FileMonitor monitor (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable = null) throws GLib.Error;
                [CCode (vfunc_name = "monitor_dir")]
                public abstract GLib.FileMonitor monitor_directory (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable = null) throws GLib.IOError;
@@ -3090,6 +3089,14 @@ namespace GLib {
                PRIVATE,
                REPLACE_DESTINATION
        }
+       [CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_MEASURE_", type_id = "g_file_measure_flags_get_type ()")]
+       [Flags]
+       public enum FileMeasureFlags {
+               NONE,
+               REPORT_ANY_ERROR,
+               APPARENT_SIZE,
+               NO_XDEV
+       }
        [CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_MONITOR_EVENT_", type_id = "g_file_monitor_event_get_type ()")]
        public enum FileMonitorEvent {
                CHANGED,
@@ -3484,6 +3491,8 @@ namespace GLib {
        public delegate string[] DBusSubtreeEnumerateFunc (GLib.DBusConnection connection, string sender, string object_path);
        [CCode (cheader_filename = "gio/gio.h", instance_pos = 4.9)]
        public delegate GLib.DBusInterfaceInfo DBusSubtreeIntrospectFunc (GLib.DBusConnection connection, string sender, string object_path, string node);
+       [CCode (cheader_filename = "gio/gio.h", instance_pos = 4.9)]
+       public delegate void FileMeasureProgressCallback (bool reporting, uint64 current_size, uint64 num_dirs, uint64 num_files);
        [CCode (cheader_filename = "gio/gio.h", instance_pos = 2.9)]
        public delegate void FileProgressCallback (int64 current_num_bytes, int64 total_num_bytes);
        [CCode (cheader_filename = "gio/gio.h", has_target = false)]

diff --git a/vapi/gobject-introspection-1.0.vapi b/vapi/gobject-introspection-1.0.vapi
index 3a85a7b0581d8e77f32da747087a2553a46456db..c5c6ad9a95c468bbbac8d4ce1ffaa50c6e8b51d4 100644 (file)
--- a/vapi/gobject-introspection-1.0.vapi
+++ b/vapi/gobject-introspection-1.0.vapi
@@ -193,6 +193,7 @@ namespace GI {
                public unowned string get_version (string namespace_);
                public bool is_registered (string namespace_, string? version);
                public unowned string load_typelib (GI.Typelib typelib, GI.RepositoryLoadFlags flags) throws GLib.Error;
+               public static void prepend_library_path (string directory);
                public static void prepend_search_path (string directory);
                public unowned GI.Typelib require (string namespace_, string? version, GI.RepositoryLoadFlags flags) throws GLib.Error;
                public unowned GI.Typelib require_private (string typelib_dir, string namespace_, string? version, GI.RepositoryLoadFlags flags) throws GLib.Error;

diff --git a/vapi/gstreamer-rtsp-server-1.0.vapi b/vapi/gstreamer-rtsp-server-1.0.vapi
index a0a3cb1a804fb844b67750de214b709a454c2388..f46a655c0c70694f92e5ffdc284ba8c649326b01 100644 (file)
--- a/vapi/gstreamer-rtsp-server-1.0.vapi
+++ b/vapi/gstreamer-rtsp-server-1.0.vapi
@@ -2,6 +2,31 @@
 
 [CCode (cprefix = "Gst", gir_namespace = "GstRtspServer", gir_version = "1.0", lower_case_cprefix = "gst_")]
 namespace Gst {
+       [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gst_rtsp_address_get_type ()")]
+       [Compact]
+       public class RTSPAddress {
+               public weak string address;
+               public int n_ports;
+               public weak Gst.RTSPAddressPool pool;
+               public uint16 port;
+               public void* priv;
+               public uint8 ttl;
+               public Gst.RTSPAddress copy ();
+               public void free ();
+       }
+       [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h")]
+       [Compact]
+       public class RTSPAddressClass {
+       }
+       [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_address_pool_get_type ()")]
+       public class RTSPAddressPool : GLib.Object {
+               [CCode (has_construct_function = false)]
+               public RTSPAddressPool ();
+               public Gst.RTSPAddress acquire_address (Gst.RTSPAddressFlags flags, int n_ports);
+               public bool add_range (string min_address, string max_address, uint16 min_port, uint16 max_port, uint8 ttl);
+               public void clear ();
+               public void dump ();
+       }
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_auth_get_type ()")]
        public class RTSPAuth : GLib.Object {
                [CCode (has_construct_function = false)]
@@ -15,32 +40,22 @@ namespace Gst {
        }
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_client_get_type ()")]
        public class RTSPClient : GLib.Object {
-               public weak Gst.RTSPAuth auth;
-               public weak Gst.RTSP.Connection connection;
-               public bool is_ipv6;
-               public weak Gst.RTSPMedia media;
-               public weak Gst.RTSPServer server;
-               public weak string server_ip;
-               public weak GLib.List<void*> sessions;
-               public weak GLib.List<void*> transports;
-               public weak Gst.RTSP.Url uri;
-               public weak Gst.RTSP.Watch watch;
-               public uint watchid;
                [CCode (has_construct_function = false)]
                public RTSPClient ();
                public bool accept (GLib.Socket socket, GLib.Cancellable? cancellable = null) throws GLib.Error;
-               public bool create_from_socket (GLib.Socket socket, string ip, int port, string initial_buffer) throws GLib.Error;
+               public uint attach (GLib.MainContext? context);
                public Gst.RTSPAuth get_auth ();
-               public Gst.RTSPMediaMapping get_media_mapping ();
-               public Gst.RTSPServer get_server ();
+               public Gst.RTSPMountPoints get_mount_points ();
                public Gst.RTSPSessionPool get_session_pool ();
                public bool get_use_client_settings ();
+               public Gst.RTSP.Result handle_message (Gst.RTSP.Message message);
                public void set_auth (Gst.RTSPAuth auth);
-               public void set_media_mapping (Gst.RTSPMediaMapping mapping);
-               public void set_server (Gst.RTSPServer server);
+               public void set_mount_points (Gst.RTSPMountPoints mounts);
+               public void set_send_func (owned Gst.RTSPClientSendFunc func);
                public void set_session_pool (Gst.RTSPSessionPool pool);
                public void set_use_client_settings (bool use_client_settings);
-               public Gst.RTSPMediaMapping media_mapping { owned get; set; }
+               public bool use_socket (GLib.Socket socket, string ip, int port, string initial_buffer) throws GLib.Error;
+               public Gst.RTSPMountPoints mount_points { owned get; set; }
                public Gst.RTSPSessionPool session_pool { owned get; set; }
                public bool use_client_settings { get; set; }
                public virtual signal void closed ();
@@ -56,40 +71,19 @@ namespace Gst {
        }
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_media_get_type ()")]
        public class RTSPMedia : GLib.Object {
-               public bool adding;
-               public weak Gst.RTSPAuth auth;
-               public bool buffering;
-               public weak GLib.Cond cond;
-               public weak GLib.List<void*> @dynamic;
-               public weak Gst.Element element;
-               public weak Gst.Element fakesink;
-               public uint id;
-               public bool is_ipv6;
-               public bool is_live;
-               public weak GLib.Mutex @lock;
-               public int n_active;
-               public Gst.Element pipeline;
-               public Gst.RTSP.TimeRange range;
-               public bool reused;
-               public weak Gst.Element rtpbin;
-               public bool seekable;
-               public weak GLib.Source source;
-               public Gst.RTSPMediaStatus status;
-               public weak GLib.GenericArray<void*> streams;
-               public Gst.State target_state;
                [CCode (has_construct_function = false)]
-               public RTSPMedia ();
+               public RTSPMedia (owned Gst.Element element);
                public void collect_streams ();
                public unowned Gst.RTSPStream create_stream (Gst.Element payloader, Gst.Pad srcpad);
                [CCode (vfunc_name = "new_state")]
                [NoWrapper]
                public virtual bool emit_new_state (Gst.State state);
+               public Gst.RTSPAddressPool get_address_pool ();
                public Gst.RTSPAuth get_auth ();
                public uint get_buffer_size ();
-               public uint get_mtu ();
-               public string get_multicast_group ();
                public Gst.RTSP.LowerTrans get_protocols ();
                public string get_range_string (bool play);
+               public Gst.RTSPMediaStatus get_status ();
                public unowned Gst.RTSPStream get_stream (uint idx);
                [NoWrapper]
                public virtual bool handle_message (Gst.Message message);
@@ -99,36 +93,32 @@ namespace Gst {
                public uint n_streams ();
                public bool prepare ();
                public bool seek (Gst.RTSP.TimeRange range);
+               public void set_address_pool (Gst.RTSPAddressPool pool);
                public void set_auth (Gst.RTSPAuth auth);
                public void set_buffer_size (uint size);
                public void set_eos_shutdown (bool eos_shutdown);
-               public void set_mtu (uint mtu);
-               public void set_multicast_group (string mc);
                public void set_protocols (Gst.RTSP.LowerTrans protocols);
                public void set_reusable (bool reusable);
                public void set_shared (bool shared);
-               public bool set_state (Gst.State state, GLib.GenericArray<void*> transports);
+               public void take_pipeline (Gst.Pipeline pipeline);
                public virtual bool unprepare ();
                public uint buffer_size { get; set; }
                [NoAccessorMethod]
+               public Gst.Element element { owned get; construct; }
+               [NoAccessorMethod]
                public bool eos_shutdown { get; set; }
-               public uint mtu { get; set; }
-               public string multicast_group { owned get; set; }
                public Gst.RTSP.LowerTrans protocols { get; set; }
                [NoAccessorMethod]
                public bool reusable { get; set; }
                [NoAccessorMethod]
                public bool shared { get; set; }
                public virtual signal void new_state ();
+               public virtual signal void new_stream (Gst.RTSPStream stream);
                public virtual signal void prepared ();
                public virtual signal void unprepared ();
        }
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_media_factory_get_type ()")]
        public class RTSPMediaFactory : GLib.Object {
-               public weak Gst.RTSPAuth auth;
-               public weak GLib.Mutex @lock;
-               public weak GLib.HashTable<void*,void*> medias;
-               public weak GLib.Mutex medias_lock;
                [CCode (has_construct_function = false)]
                public RTSPMediaFactory ();
                [NoWrapper]
@@ -137,25 +127,24 @@ namespace Gst {
                public virtual unowned Gst.Element create_element (Gst.RTSP.Url url);
                [NoWrapper]
                public virtual string gen_key (Gst.RTSP.Url url);
+               public Gst.RTSPAddressPool get_address_pool ();
                public Gst.RTSPAuth get_auth ();
                public uint get_buffer_size ();
                public string get_launch ();
-               public string get_multicast_group ();
                public Gst.RTSP.LowerTrans get_protocols ();
                public bool is_eos_shutdown ();
                public bool is_shared ();
+               public void set_address_pool (Gst.RTSPAddressPool pool);
                public void set_auth (Gst.RTSPAuth auth);
                public void set_buffer_size (uint size);
                public void set_eos_shutdown (bool eos_shutdown);
                public void set_launch (string launch);
-               public void set_multicast_group (string mc);
                public void set_protocols (Gst.RTSP.LowerTrans protocols);
                public void set_shared (bool shared);
                public uint buffer_size { get; set; }
                [NoAccessorMethod]
                public bool eos_shutdown { get; set; }
                public string launch { owned get; set; }
-               public string multicast_group { owned get; set; }
                public Gst.RTSP.LowerTrans protocols { get; set; }
                [NoAccessorMethod]
                public bool shared { get; set; }
@@ -164,11 +153,6 @@ namespace Gst {
        }
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_media_factory_uri_get_type ()")]
        public class RTSPMediaFactoryURI : Gst.RTSPMediaFactory {
-               public weak GLib.List<void*> decoders;
-               public weak GLib.List<void*> demuxers;
-               public weak GLib.List<void*> payloaders;
-               public weak Gst.Caps raw_acaps;
-               public weak Gst.Caps raw_vcaps;
                [CCode (has_construct_function = false)]
                public RTSPMediaFactoryURI ();
                public string get_uri ();
@@ -177,21 +161,16 @@ namespace Gst {
                [NoAccessorMethod]
                public bool use_gstpay { get; set; }
        }
-       [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_media_mapping_get_type ()")]
-       public class RTSPMediaMapping : GLib.Object {
-               public weak GLib.HashTable<void*,void*> mappings;
+       [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_mount_points_get_type ()")]
+       public class RTSPMountPoints : GLib.Object {
                [CCode (has_construct_function = false)]
-               public RTSPMediaMapping ();
+               public RTSPMountPoints ();
                public void add_factory (string path, owned Gst.RTSPMediaFactory factory);
-               public virtual Gst.RTSPMediaFactory? find_factory (Gst.RTSP.Url url);
+               public virtual Gst.RTSPMediaFactory find_factory (Gst.RTSP.Url url);
                public void remove_factory (string path);
        }
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_server_get_type ()")]
        public class RTSPServer : GLib.Object {
-               public weak Gst.RTSPAuth auth;
-               public weak GLib.List<void*> clients;
-               public weak GLib.Mutex @lock;
-               public weak GLib.Socket socket;
                [CCode (has_construct_function = false)]
                public RTSPServer ();
                [NoWrapper]
@@ -203,34 +182,35 @@ namespace Gst {
                public Gst.RTSPAuth get_auth ();
                public int get_backlog ();
                public int get_bound_port ();
-               public Gst.RTSPMediaMapping get_media_mapping ();
+               public int get_max_threads ();
+               public Gst.RTSPMountPoints get_mount_points ();
                public string get_service ();
                public Gst.RTSPSessionPool get_session_pool ();
                public static bool io_func (GLib.Socket socket, GLib.IOCondition condition, Gst.RTSPServer server);
                public void set_address (string address);
                public void set_auth (Gst.RTSPAuth auth);
                public void set_backlog (int backlog);
-               public void set_media_mapping (Gst.RTSPMediaMapping mapping);
+               public void set_max_threads (int max_threads);
+               public void set_mount_points (Gst.RTSPMountPoints mounts);
                public void set_service (string service);
                public void set_session_pool (Gst.RTSPSessionPool pool);
                public bool transfer_connection (GLib.Socket socket, string ip, int port, string initial_buffer);
                public string address { owned get; set; }
                public int backlog { get; set; }
                public int bound_port { get; }
-               public Gst.RTSPMediaMapping media_mapping { owned get; set; }
+               public int max_threads { get; set; }
+               public Gst.RTSPMountPoints mount_points { owned get; set; }
                public string service { owned get; set; }
                public Gst.RTSPSessionPool session_pool { owned get; set; }
                public virtual signal void client_connected (Gst.RTSPClient client);
        }
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_session_get_type ()")]
        public class RTSPSession : GLib.Object {
-               public GLib.TimeVal create_time;
-               public int expire_count;
-               public GLib.TimeVal last_access;
-               public weak GLib.List<void*> medias;
                [CCode (has_construct_function = false)]
                public RTSPSession (string sessionid);
                public void allow_expire ();
+               public GLib.List<Gst.RTSPSessionMedia> filter (Gst.RTSPSessionFilterFunc func);
+               public string get_header ();
                public unowned Gst.RTSPSessionMedia get_media (Gst.RTSP.Url url);
                public unowned string get_sessionid ();
                public uint get_timeout ();
@@ -246,22 +226,19 @@ namespace Gst {
        }
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_session_media_get_type ()")]
        public class RTSPSessionMedia : GLib.Object {
-               public uint counter;
-               public weak Gst.RTSPMedia media;
-               public Gst.RTSP.State state;
-               public weak GLib.GenericArray<void*> transports;
-               public weak Gst.RTSP.Url url;
                [CCode (has_construct_function = false)]
                public RTSPSessionMedia (Gst.RTSP.Url url, Gst.RTSPMedia media);
                public bool alloc_channels (Gst.RTSP.Range range);
+               public unowned Gst.RTSPMedia get_media ();
+               public Gst.RTSP.State get_rtsp_state ();
                public unowned Gst.RTSPStreamTransport get_transport (uint idx);
+               public bool matches_url (Gst.RTSP.Url url);
+               public void set_rtsp_state (Gst.RTSP.State state);
                public bool set_state (Gst.State state);
                public unowned Gst.RTSPStreamTransport set_transport (Gst.RTSPStream stream, Gst.RTSP.Transport tr);
        }
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_session_pool_get_type ()")]
        public class RTSPSessionPool : GLib.Object {
-               public weak GLib.Mutex @lock;
-               public weak GLib.HashTable<void*,void*> sessions;
                [CCode (has_construct_function = false)]
                public RTSPSessionPool ();
                public uint cleanup ();
@@ -269,7 +246,7 @@ namespace Gst {
                [NoWrapper]
                public virtual string create_session_id ();
                public GLib.Source create_watch ();
-               public GLib.List<Gst.RTSPSession> filter (Gst.RTSPSessionFilterFunc func);
+               public GLib.List<Gst.RTSPSession> filter (Gst.RTSPSessionPoolFilterFunc func);
                public Gst.RTSPSession find (string sessionid);
                public uint get_max_sessions ();
                public uint get_n_sessions ();
@@ -279,67 +256,39 @@ namespace Gst {
        }
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_stream_get_type ()")]
        public class RTSPStream : GLib.Object {
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gst.Element[] appqueue;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gst.Element[] appsink;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gst.Element[] appsrc;
-               public uint buffer_size;
-               public weak Gst.Caps caps;
-               public ulong caps_sig;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gst.Element[] funnel;
-               public uint idx;
-               public bool is_ipv6;
-               public bool is_joined;
-               public uint n_active;
-               public weak Gst.Element payloader;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gst.Pad[] recv_sink;
-               public weak Gst.Pad send_rtp_sink;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gst.Pad[] send_src;
-               public Gst.RTSP.Range server_port;
-               public weak GLib.Object session;
-               public weak Gst.Pad srcpad;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gst.Element[] tee;
-               public weak GLib.List<void*> transports;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gst.Element[] udpsink;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gst.Element[] udpsrc;
                [CCode (has_construct_function = false)]
                public RTSPStream (uint idx, Gst.Element payloader, Gst.Pad srcpad);
                public bool add_transport (Gst.RTSPStreamTransport trans);
+               public Gst.RTSPAddress get_address ();
+               public Gst.RTSPAddressPool get_address_pool ();
+               public Gst.Caps get_caps ();
+               public uint get_index ();
                public uint get_mtu ();
                public bool get_rtpinfo (uint rtptime, uint seq);
+               public Gst.RTSP.Range get_server_port ();
+               public void get_ssrc (out uint ssrc);
                public bool join_bin (Gst.Bin bin, Gst.Element rtpbin, Gst.State state);
                public bool leave_bin (Gst.Bin bin, Gst.Element rtpbin);
                public Gst.FlowReturn recv_rtcp (owned Gst.Buffer buffer);
                public Gst.FlowReturn recv_rtp (owned Gst.Buffer buffer);
                public bool remove_transport (Gst.RTSPStreamTransport trans);
+               public void set_address_pool (Gst.RTSPAddressPool pool);
                public void set_mtu (uint mtu);
        }
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", type_id = "gst_rtsp_stream_transport_get_type ()")]
        public class RTSPStreamTransport : GLib.Object {
-               public bool active;
-               public weak GLib.DestroyNotify ka_notify;
-               public void* ka_user_data;
-               public weak Gst.RTSPKeepAliveFunc keep_alive;
-               public weak GLib.DestroyNotify notify;
-               public weak GLib.Object rtpsource;
-               public weak Gst.RTSPSendFunc send_rtcp;
-               public weak Gst.RTSPSendFunc send_rtp;
-               public weak Gst.RTSPStream stream;
-               public bool timeout;
-               public Gst.RTSP.Transport transport;
-               public void* user_data;
                [CCode (has_construct_function = false)]
                public RTSPStreamTransport (Gst.RTSPStream stream, owned Gst.RTSP.Transport tr);
+               public unowned Gst.RTSPStream get_stream ();
+               public unowned Gst.RTSP.Transport? get_transport ();
+               public bool is_timed_out ();
+               public void keep_alive ();
+               public bool send_rtcp (Gst.Buffer buffer);
+               public bool send_rtp (Gst.Buffer buffer);
+               public bool set_active (bool active);
                public void set_callbacks (Gst.RTSPSendFunc send_rtp, owned Gst.RTSPSendFunc send_rtcp);
                public void set_keepalive (owned Gst.RTSPKeepAliveFunc keep_alive);
+               public void set_timed_out (bool timedout);
                public void set_transport (owned Gst.RTSP.Transport tr);
        }
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", has_type_id = false)]
@@ -359,6 +308,14 @@ namespace Gst {
                public weak string server_proto;
                public weak string server_ip;
        }
+       [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", cprefix = "GST_RTSP_ADDRESS_FLAG_", has_type_id = false)]
+       [Flags]
+       public enum RTSPAddressFlags {
+               NONE,
+               IPV4,
+               IPV6,
+               EVEN_PORT
+       }
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", cprefix = "GST_RTSP_FILTER_", has_type_id = false)]
        public enum RTSPFilterResult {
                REMOVE,
@@ -373,12 +330,16 @@ namespace Gst {
                PREPARED,
                ERROR
        }
+       [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", instance_pos = 3.9)]
+       public delegate bool RTSPClientSendFunc (Gst.RTSPClient client, Gst.RTSP.Message message, bool close);
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", instance_pos = 0.9)]
        public delegate void RTSPKeepAliveFunc ();
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", instance_pos = 2.9)]
        public delegate bool RTSPSendFunc (Gst.Buffer buffer, uint8 channel);
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", instance_pos = 2.9)]
-       public delegate Gst.RTSPFilterResult RTSPSessionFilterFunc (Gst.RTSPSessionPool pool, Gst.RTSPSession session);
+       public delegate Gst.RTSPFilterResult RTSPSessionFilterFunc (Gst.RTSPSession sess, Gst.RTSPSessionMedia media);
+       [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", instance_pos = 2.9)]
+       public delegate Gst.RTSPFilterResult RTSPSessionPoolFilterFunc (Gst.RTSPSessionPool pool, Gst.RTSPSession session);
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h", instance_pos = 1.9)]
        public delegate bool RTSPSessionPoolFunc (Gst.RTSPSessionPool pool);
        [CCode (cheader_filename = "gst/rtsp-server/rtsp-server.h")]

diff --git a/vapi/gtksourceview-3.0.vapi b/vapi/gtksourceview-3.0.vapi
index eb1470cfbfed18f34495b09425669f1581ad6f67..18ccb00673ccec79e800c2ca380be704674389f3 100644 (file)
--- a/vapi/gtksourceview-3.0.vapi
+++ b/vapi/gtksourceview-3.0.vapi
@@ -505,12 +505,6 @@ namespace Gtk {
                [NoAccessorMethod]
                public bool underline_set { get; construct; }
        }
-       [CCode (cheader_filename = "gtksourceview/gtksource.h")]
-       [GIR (name = "StyleClass")]
-       public class SourceStyleClass : GLib.ObjectClass {
-               [CCode (has_construct_function = false)]
-               protected SourceStyleClass ();
-       }
        [CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_style_scheme_get_type ()")]
        [GIR (name = "StyleScheme")]
        public class SourceStyleScheme : GLib.Object {

diff --git a/vapi/libgdata.vapi b/vapi/libgdata.vapi
index 1c540b7e24bb476dace600b475cce7e64ed060fe..5d78cd9fc8cd6abf2fa3e5654a9255b989973c9e 100644 (file)
--- a/vapi/libgdata.vapi
+++ b/vapi/libgdata.vapi
@@ -1175,14 +1175,22 @@ namespace GData {
                [CCode (has_construct_function = false)]
                protected Parsable ();
                [CCode (has_construct_function = false)]
+               public Parsable.from_json (GLib.Type parsable_type, string json, int length) throws GLib.Error;
+               [CCode (has_construct_function = false)]
                public Parsable.from_xml (GLib.Type parsable_type, string xml, int length) throws GLib.Error;
                [NoWrapper]
+               public virtual void get_json (Json.Builder builder);
+               [NoWrapper]
                public virtual void get_namespaces (GLib.HashTable<void*,void*> namespaces);
                [NoWrapper]
                public virtual void get_xml (GLib.StringBuilder xml_string);
                [NoWrapper]
+               public virtual bool parse_json (Json.Reader reader) throws GLib.Error;
+               [NoWrapper]
                public virtual bool parse_xml (Xml.Doc doc, Xml.Node node) throws GLib.Error;
                [NoWrapper]
+               public virtual bool post_parse_json () throws GLib.Error;
+               [NoWrapper]
                public virtual bool post_parse_xml () throws GLib.Error;
                [NoWrapper]
                public virtual void pre_get_xml (GLib.StringBuilder xml_string);
@@ -1831,7 +1839,8 @@ namespace GData {
        [CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_SERVICE_ERROR_")]
        public errordomain YouTubeServiceError {
                API_QUOTA_EXCEEDED,
-               ENTRY_QUOTA_EXCEEDED
+               ENTRY_QUOTA_EXCEEDED,
+               CHANNEL_REQUIRED
        }
        [CCode (cheader_filename = "gdata/gdata.h", instance_pos = 4.9)]
        public delegate void BatchOperationCallback (uint operation_id, GData.BatchOperationType operation_type, GData.Entry entry, GLib.Error error);

diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index 6a5a97f99599b3ba5edfc397a747c284dc8132e6..3916d2bcb936ba928afc159bc9fc712c716191e0 100644 (file)
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -607,6 +607,12 @@ namespace Soup {
                public void run_async ();
                public void unpause_message (Soup.Message msg);
                public GLib.MainContext async_context { get; owned construct; }
+               [CCode (array_length = false, array_null_terminated = true)]
+               [NoAccessorMethod]
+               public string[] http_aliases { owned get; set; }
+               [CCode (array_length = false, array_null_terminated = true)]
+               [NoAccessorMethod]
+               public string[] https_aliases { owned get; set; }
                [NoAccessorMethod]
                public Soup.Address @interface { owned get; construct; }
                public uint port { get; construct; }
@@ -1349,6 +1355,10 @@ namespace Soup {
        public const string SERVER_ASYNC_CONTEXT;
        [CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_H")]
        public const int SERVER_H;
+       [CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_HTTPS_ALIASES")]
+       public const string SERVER_HTTPS_ALIASES;
+       [CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_HTTP_ALIASES")]
+       public const string SERVER_HTTP_ALIASES;
        [CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_INTERFACE")]
        public const string SERVER_INTERFACE;
        [CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_PORT")]

diff --git a/vapi/metadata/Atspi-2.0-custom.vala b/vapi/metadata/Atspi-2.0-custom.vala
new file mode 100644 (file)
index 0000000..d8e9e12
--- /dev/null
+++ b/vapi/metadata/Atspi-2.0-custom.vala
@@ -0,0 +1,7 @@
+namespace Atspi {
+       [CCode (cheader_filename = "atspi/atspi.h", cprefix = "ATSPI_CACHE_", type_id = "atspi_cache_get_type ()")]
+       [Flags]
+       public enum Cache {
+               INTERFACES
+       }
+}

diff --git a/vapi/metadata/Atspi-2.0.metadata b/vapi/metadata/Atspi-2.0.metadata
index c1a82a567597ec98a42a23308f70e18fa90f89b6..aba682eb33447a0e58a14f861cbd0727dfafafa1 100644 (file)
--- a/vapi/metadata/Atspi-2.0.metadata
+++ b/vapi/metadata/Atspi-2.0.metadata
@@ -1,3 +1,5 @@
+Cache.interfaces skip
+
 DeviceListener
        .new_simple skip=false
 

diff --git a/vapi/metadata/Gdl-3.metadata b/vapi/metadata/Gdl-3.metadata
new file mode 100644 (file)
index 0000000..d3dbdcb
--- /dev/null
+++ b/vapi/metadata/Gdl-3.metadata
@@ -0,0 +1,2 @@
+DockItem.dock_drag_motion skip
+DockItem.dock_drag_motion#signal skip=false
\ No newline at end of file

diff --git a/vapi/packagekit-glib2.vapi b/vapi/packagekit-glib2.vapi
index 0c62c824bcdb85b91f4ff53138fe3820ac7e21b9..e5a4ef4d9488eb29e19dc4b44d24ece373f9dbd5 100644 (file)
--- a/vapi/packagekit-glib2.vapi
+++ b/vapi/packagekit-glib2.vapi
@@ -327,6 +327,7 @@ namespace Pk {
                public static string[] ids_remove_id (string package_ids, string package_id);
                public static void ids_test (void* user_data);
                public static string ids_to_string (string package_ids);
+               public bool parse (string data) throws GLib.Error;
                public void print ();
                public bool set_id (string package_id) throws GLib.Error;
                public static void test (void* user_data);
@@ -657,6 +658,16 @@ namespace Pk {
        public class TransactionPast : Pk.Source {
                [CCode (has_construct_function = false)]
                public TransactionPast ();
+               public unowned string get_cmdline ();
+               public unowned string get_data ();
+               public GLib.DateTime get_datetime ();
+               public uint get_duration ();
+               public unowned string get_id ();
+               public Pk.Role get_role ();
+               public bool get_succeeded ();
+               public unowned string get_timespec ();
+               public int64 get_timestamp ();
+               public uint get_uid ();
                [NoAccessorMethod]
                public string cmdline { owned get; set; }
                [NoAccessorMethod]

diff --git a/vapi/packages/cogl-1.0/cogl-1.0-custom.vala b/vapi/packages/cogl-1.0/cogl-1.0-custom.vala
index e894be46f6bfa24602f3ff827e0efe733c3f82b7..1211268fa3eade93510abd0d10ac118c7dd5dd07 100644 (file)
--- a/vapi/packages/cogl-1.0/cogl-1.0-custom.vala
+++ b/vapi/packages/cogl-1.0/cogl-1.0-custom.vala
@@ -194,4 +194,10 @@ namespace Cogl {
                [CCode (cname = "cogl_matrix_multiply")]
                public Matrix.multiply (Cogl.Matrix a, Cogl.Matrix b);
        }
+
+       [SimpleType]
+       [GIR (name = "Bool")]
+       [BooleanType]
+       public struct Bool : bool {
+       }
 }

diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index 8ae455aeb2443686c1db124d5a8883c106636f23..8d704a197aa36ad44d5a5f463bc4b537caf24cc0 100644 (file)
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -235,6 +235,7 @@ namespace Pango {
        public abstract class FontMap : GLib.Object {
                [CCode (has_construct_function = false)]
                protected FontMap ();
+               public void changed ();
                public Pango.Context create_context ();
                public uint get_serial ();
                public void list_families ([CCode (array_length_cname = "n_families", array_length_pos = 1.1)] out Pango.FontFamily[] families);
@@ -365,7 +366,7 @@ namespace Pango {
                public bool is_wrapped ();
                public void move_cursor_visually (bool strong, int old_index, int old_trailing, int direction, out int new_index, out int new_trailing);
                public void set_alignment (Pango.Alignment alignment);
-               public void set_attributes (owned Pango.AttrList? attrs);
+               public void set_attributes (Pango.AttrList? attrs);
                public void set_auto_dir (bool auto_dir);
                public void set_ellipsize (Pango.EllipsizeMode ellipsize);
                public void set_font_description (Pango.FontDescription? desc);

diff --git a/vapi/udisks2.vapi b/vapi/udisks2.vapi
index 130cf011f239c1abeb1c1daa068f0ffd5ccbf1d7..b01b3643d815e51f5181c6756a3d7330f480d06f 100644 (file)
--- a/vapi/udisks2.vapi
+++ b/vapi/udisks2.vapi
@@ -50,6 +50,7 @@ namespace UDisks {
                [CCode (array_length = false, array_null_terminated = true)]
                public string[] get_partition_table_subtypes (string partition_table_type);
                public unowned string get_partition_table_type_for_display (string partition_table_type);
+               public unowned string get_partition_type_and_subtype_for_display (string partition_table_type, string partition_table_subtype, string partition_type);
                public unowned string get_partition_type_for_display (string partition_table_type, string partition_type);
                public GLib.List<UDisks.PartitionTypeInfo> get_partition_type_infos (string partition_table_type, string? partition_table_subtype);
                public GLib.List<UDisks.Partition> get_partitions (UDisks.PartitionTable table);