diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2014-09-19 17:36:19 +0200 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2014-09-19 17:36:19 +0200 |
commit | 25e3827d3076c49170ec2602531854b2f3782486 (patch) | |
tree | 07434a0a8c123d6860195807a0821a09e8f22148 | |
parent | c08dd2c82dcfe42f2f6fb23333eadf63ed2d7f22 (diff) | |
download | vala-25e3827d3076c49170ec2602531854b2f3782486.tar.gz |
bindings: Update GIR-based bindings
-rw-r--r-- | vapi/clutter-1.0.vapi | 2 | ||||
-rw-r--r-- | vapi/gio-2.0.vapi | 6 | ||||
-rw-r--r-- | vapi/gstreamer-1.0.vapi | 4 | ||||
-rw-r--r-- | vapi/gtksourceview-3.0.vapi | 2 | ||||
-rw-r--r-- | vapi/libgdata.vapi | 7 | ||||
-rw-r--r-- | vapi/metadata/Gio-2.0-custom.vala | 6 |
6 files changed, 12 insertions, 15 deletions
diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi index ace700bf5..4ce9e09bb 100644 --- a/vapi/clutter-1.0.vapi +++ b/vapi/clutter-1.0.vapi @@ -8290,8 +8290,6 @@ namespace Clutter { [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); [CCode (cheader_filename = "clutter/clutter.h")] - 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")] public static int test_run (); diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 5baa03495..5703ea85c 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -279,7 +279,7 @@ namespace GLib { public class Application : GLib.Object, GLib.ActionGroup, GLib.ActionMap { [CCode (has_construct_function = false)] public Application (string? application_id, GLib.ApplicationFlags flags); - public void add_main_option (string long_name, char short_name, int flags, GLib.OptionArg arg, string description, string? arg_description); + public void add_main_option (string long_name, char short_name, GLib.OptionFlags flags, GLib.OptionArg arg, string description, string? arg_description); public void add_main_option_entries ([CCode (array_length = false, array_null_terminated = true)] GLib.OptionEntry[] entries); public void add_option_group (GLib.OptionGroup group); [NoWrapper] @@ -321,7 +321,7 @@ namespace GLib { public void set_default (); public void set_flags (GLib.ApplicationFlags flags); public void set_inactivity_timeout (uint inactivity_timeout); - public void set_resource_base_path (string resource_base_path); + public void set_resource_base_path (string? resource_path); public void unmark_busy (); public void withdraw_notification (string id); public GLib.ActionGroup action_group { set; } @@ -1493,7 +1493,7 @@ namespace GLib { 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 void get_item_links (int item_index, 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); diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi index 003d7abea..73a42c924 100644 --- a/vapi/gstreamer-1.0.vapi +++ b/vapi/gstreamer-1.0.vapi @@ -1691,7 +1691,7 @@ namespace Gst { public Query.accept_caps (Gst.Caps caps); public void add_allocation_meta (GLib.Type api, Gst.Structure? @params); public void add_allocation_param (Gst.Allocator? allocator, Gst.AllocationParams? @params); - public void add_allocation_pool (Gst.BufferPool pool, uint size, uint min_buffers, uint max_buffers); + public void add_allocation_pool (Gst.BufferPool? pool, uint size, uint min_buffers, uint max_buffers); public bool add_buffering_range (int64 start, int64 stop); public void add_scheduling_mode (Gst.PadMode mode); [CCode (has_construct_function = false)] @@ -1774,7 +1774,7 @@ namespace Gst { public void set_formatsv ([CCode (array_length_cname = "n_formats", array_length_pos = 0.5)] Gst.Format[] formats); public void set_latency (bool live, Gst.ClockTime min_latency, Gst.ClockTime max_latency); public void set_nth_allocation_param (uint index, Gst.Allocator? allocator, Gst.AllocationParams? @params); - public void set_nth_allocation_pool (uint index, Gst.BufferPool pool, uint size, uint min_buffers, uint max_buffers); + public void set_nth_allocation_pool (uint index, Gst.BufferPool? pool, uint size, uint min_buffers, uint max_buffers); public void set_position (Gst.Format format, int64 cur); public void set_scheduling (Gst.SchedulingFlags flags, int minsize, int maxsize, int align); public void set_seeking (Gst.Format format, bool seekable, int64 segment_start, int64 segment_end); diff --git a/vapi/gtksourceview-3.0.vapi b/vapi/gtksourceview-3.0.vapi index c3a622bcd..5b0b9af6f 100644 --- a/vapi/gtksourceview-3.0.vapi +++ b/vapi/gtksourceview-3.0.vapi @@ -66,7 +66,7 @@ namespace Gtk { } [CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_completion_get_type ()")] [GIR (name = "Completion")] - public class SourceCompletion : GLib.Object { + public class SourceCompletion : GLib.Object, Gtk.Buildable { [CCode (has_construct_function = false)] protected SourceCompletion (); public bool add_provider (Gtk.SourceCompletionProvider provider) throws GLib.Error; diff --git a/vapi/libgdata.vapi b/vapi/libgdata.vapi index 32a3f0533..585b69e65 100644 --- a/vapi/libgdata.vapi +++ b/vapi/libgdata.vapi @@ -2054,7 +2054,8 @@ namespace GData { BAD_QUERY_PARAMETER, NETWORK_ERROR, PROXY_ERROR, - WITH_BATCH_OPERATION; + WITH_BATCH_OPERATION, + API_QUOTA_EXCEEDED; public static GLib.Quark quark (); } [CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_SERVICE_ERROR_")] @@ -2339,6 +2340,10 @@ namespace GData { public const string PICASAWEB_VIDEO_STATUS_PENDING; [CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_PICASAWEB_VIDEO_STATUS_READY")] public const string PICASAWEB_VIDEO_STATUS_READY; + [CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_TASKS_STATUS_COMPLETED")] + public const string TASKS_STATUS_COMPLETED; + [CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_TASKS_STATUS_NEEDS_ACTION")] + public const string TASKS_STATUS_NEEDS_ACTION; [CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_ACTION_COMMENT")] public const string YOUTUBE_ACTION_COMMENT; [CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_ACTION_COMMENT_VOTE")] diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala index 995f2b3b4..0d6ecbe42 100644 --- a/vapi/metadata/Gio-2.0-custom.vala +++ b/vapi/metadata/Gio-2.0-custom.vala @@ -28,12 +28,6 @@ namespace GLib { public void set_callback ([CCode (type = "GSourceFunc")] owned CancellableSourceFunc func); } - [CCode (cheader_filename = "gio/gio.h", type_id = "g_menu_model_get_type ()")] - public abstract class MenuModel : GLib.Object { - [NoWrapper] - public virtual void get_item_links (int item_index, [CCode (type = "GHashTable**")] out GLib.HashTable<string,GLib.MenuModel>? links); - } - public class DBusConnection : GLib.Object, GLib.AsyncInitable, GLib.Initable { [CCode (cname = "g_dbus_connection_new", finish_function = "g_dbus_connection_new_finish")] public static async GLib.DBusConnection @new (GLib.IOStream stream, string guid, GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver? observer = null, GLib.Cancellable? cancellable = null) throws GLib.Error; |