From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 12 Jan 2012 11:21:12 +0000 (+0100)
Subject: gio-2.0: Ultimate fixes
X-Git-Tag: 0.15.1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd756492f00db53ac6586c9693daa085e794aef2;p=thirdparty%2Fvala.git

gio-2.0: Ultimate fixes
---

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index cf40da679..4d2bc20ee 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -2150,7 +2150,7 @@ namespace GLib {
 	public interface ActionGroup : GLib.Object {
 		public abstract void activate_action (string action_name, GLib.Variant? parameter);
 		public abstract void change_action_state (string action_name, GLib.Variant value);
-		public abstract unowned bool? get_action_enabled (string action_name);
+		public abstract bool get_action_enabled (string action_name);
 		public abstract unowned GLib.VariantType? get_action_parameter_type (string action_name);
 		public abstract GLib.Variant? get_action_state (string action_name);
 		public abstract GLib.Variant? get_action_state_hint (string action_name);
@@ -2455,8 +2455,9 @@ namespace GLib {
 		public abstract bool can_poll ();
 		public abstract GLib.PollableSource create_source (GLib.Cancellable? cancellable = null);
 		public abstract bool is_readable ();
-		[CCode (vfunc_name = "read_nonblocking_fn")]
-		public abstract ssize_t read_nonblocking ([CCode (array_length_cname = "size", array_length_pos = 1.1, array_length_type = "gsize", type = "void*")] uint8[] buffer) throws GLib.Error;
+		public ssize_t read_nonblocking ([CCode (array_length_cname = "size", array_length_pos = 1.5, array_length_type = "gsize", type = "void*")] uint8[] buffer, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		[CCode (vfunc_name = "read_nonblocking")]
+		public abstract ssize_t read_nonblocking_fn ([CCode (array_length_cname = "size", array_length_pos = 1.1, array_length_type = "gsize", type = "void*")] uint8[] buffer) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gio/gio.h", type_cname = "GPollableOutputStreamInterface", type_id = "g_pollable_output_stream_get_type ()")]
 	public interface PollableOutputStream : GLib.OutputStream {
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 10faa0560..aec48913b 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -183,7 +183,7 @@ Initable
 PollableInputStream
   .create_source type="GLib.PollableSource"
   .read_nonblocking.buffer type="uint8[]" array_length_idx=1
-  .read_nonblocking#virtual_method vfunc_name="read_nonblocking_fn"
+  .read_nonblocking#virtual_method name="read_nonblocking_fn"
 PollableOutputStream
   .create_source type="GLib.PollableSource"
 TlsClientConnection
@@ -301,6 +301,7 @@ content_type_from_mime_type nullable
 content_type_get_mime_type nullable
 ActionGroup
   .get_action* nullable
+  .get_action_enabled nullable=false
   .get_action_state_type unowned
 ActionMap
   .add_action_entries.entries array array_length_idx=1