From: Jürg Billeter <j@bitron.ch>
Date: Sun, 20 Dec 2009 15:43:12 +0000 (+0100)
Subject: gio-2.0: Fix g_data_input_stream_read_* bindings
X-Git-Tag: 0.7.10~146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d51ce5d195bcbddc2d99e345cb9672a5f0832a77;p=thirdparty%2Fvala.git

gio-2.0: Fix g_data_input_stream_read_* bindings

Fixes bug 605066.
---

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 4ba0f45c2..260f495dc 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -67,15 +67,15 @@ namespace GLib {
 		public int16 read_int16 (GLib.Cancellable? cancellable) throws GLib.Error;
 		public int32 read_int32 (GLib.Cancellable? cancellable) throws GLib.Error;
 		public int64 read_int64 (GLib.Cancellable? cancellable) throws GLib.Error;
-		public unowned string? read_line (out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
-		public async unowned string read_line_async (int io_priority, GLib.Cancellable? cancellable, out size_t length) throws GLib.Error;
-		public unowned string read_line_finish (GLib.AsyncResult _result, out unowned size_t length) throws GLib.Error;
+		public string? read_line (out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
+		public async string? read_line_async (int io_priority, GLib.Cancellable? cancellable, out size_t length) throws GLib.Error;
+		public string? read_line_finish (GLib.AsyncResult _result, out unowned size_t length) throws GLib.Error;
 		public uint16 read_uint16 (GLib.Cancellable? cancellable) throws GLib.Error;
 		public uint32 read_uint32 (GLib.Cancellable? cancellable) throws GLib.Error;
 		public uint64 read_uint64 (GLib.Cancellable? cancellable) throws GLib.Error;
-		public unowned string? read_until (string stop_chars, out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
-		public async unowned string read_until_async (string stop_chars, int io_priority, GLib.Cancellable? cancellable, out size_t length) throws GLib.Error;
-		public unowned string read_until_finish (GLib.AsyncResult _result, out unowned size_t length) throws GLib.Error;
+		public string? read_until (string stop_chars, out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
+		public async string? read_until_async (string stop_chars, int io_priority, GLib.Cancellable? cancellable, out size_t length) throws GLib.Error;
+		public string? read_until_finish (GLib.AsyncResult _result, out unowned size_t length) throws GLib.Error;
 		public void set_byte_order (GLib.DataStreamByteOrder order);
 		public void set_newline_type (GLib.DataStreamNewlineType type);
 		public GLib.DataStreamByteOrder byte_order { get; set; }
diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata
index 54cb45dcf..868600e93 100644
--- a/vapi/packages/gio-2.0/gio-2.0.metadata
+++ b/vapi/packages/gio-2.0/gio-2.0.metadata
@@ -6,11 +6,13 @@ g_app_info_launch_uris.envp is_array="1"
 GAsyncReadyCallback.source_object nullable="1"
 g_content_type_guess.data_size hidden="1"
 g_content_type_guess.result_uncertain is_out="1"
-g_data_input_stream_read_line nullable="1"
+g_data_input_stream_read_line nullable="1" transfer_ownership="1"
 g_data_input_stream_read_line.length is_out="1"
+g_data_input_stream_read_line_finish nullable="1" transfer_ownership="1"
 g_data_input_stream_read_line_finish.length is_out="1"
-g_data_input_stream_read_until nullable="1"
+g_data_input_stream_read_until nullable="1" transfer_ownership="1"
 g_data_input_stream_read_until.length is_out="1"
+g_data_input_stream_read_until_finish nullable="1" transfer_ownership="1"
 g_data_input_stream_read_until_finish.length is_out="1"
 g_drive_eject async="1"
 g_drive_eject_with_operation async="1"