[vala] gio-2.0: Various error type fixes

[Jürg Billeter <juergbi src gnome org>]

commit b3e59381773877b6618a9500fd162f80a0fd51c6
Author: Jürg Billeter <j bitron ch>
Date:   Mon Oct 25 14:14:28 2010 +0200

    gio-2.0: Various error type fixes

 vapi/gio-2.0.vapi                      |   74 ++++++++++++++++----------------
 vapi/packages/gio-2.0/gio-2.0.metadata |   30 +++++++++---
 2 files changed, 59 insertions(+), 45 deletions(-)
---
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index c9fe08e..48aac82 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -485,19 +485,19 @@ namespace GLib {
 		public DataInputStream (GLib.InputStream base_stream);
 		public GLib.DataStreamByteOrder get_byte_order ();
 		public GLib.DataStreamNewlineType get_newline_type ();
-		public uchar read_byte (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public int16 read_int16 (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public int32 read_int32 (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public int64 read_int64 (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public string? read_line (out size_t length, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public async string? read_line_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null, out size_t? length = null) throws GLib.Error;
-		public uint16 read_uint16 (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public uint32 read_uint32 (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public uint64 read_uint64 (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public string? read_until (string stop_chars, out size_t length, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public async string? read_until_async (string stop_chars, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null, out size_t? length = null) throws GLib.Error;
-		public string? read_upto (string stop_chars, ssize_t stop_chars_len, out size_t length, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public async string? read_upto_async (string stop_chars, ssize_t stop_chars_len, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null, out size_t? length = null) throws GLib.Error;
+		public uchar read_byte (GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public int16 read_int16 (GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public int32 read_int32 (GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public int64 read_int64 (GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public string? read_line (out size_t length, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public async string? read_line_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null, out size_t? length = null) throws GLib.IOError;
+		public uint16 read_uint16 (GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public uint32 read_uint32 (GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public uint64 read_uint64 (GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public string? read_until (string stop_chars, out size_t length, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public async string? read_until_async (string stop_chars, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null, out size_t? length = null) throws GLib.IOError;
+		public string? read_upto (string stop_chars, ssize_t stop_chars_len, out size_t length, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public async string? read_upto_async (string stop_chars, ssize_t stop_chars_len, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null, out size_t? length = null) throws GLib.IOError;
 		public void set_byte_order (GLib.DataStreamByteOrder order);
 		public void set_newline_type (GLib.DataStreamNewlineType type);
 		public GLib.DataStreamByteOrder byte_order { get; set; }
@@ -508,14 +508,14 @@ namespace GLib {
 		[CCode (has_construct_function = false)]
 		public DataOutputStream (GLib.OutputStream base_stream);
 		public GLib.DataStreamByteOrder get_byte_order ();
-		public bool put_byte (uchar data, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public bool put_int16 (int16 data, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public bool put_int32 (int32 data, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public bool put_int64 (int64 data, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public bool put_string (string str, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public bool put_uint16 (uint16 data, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public bool put_uint32 (uint32 data, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public bool put_uint64 (uint64 data, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public bool put_byte (uchar data, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public bool put_int16 (int16 data, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public bool put_int32 (int32 data, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public bool put_int64 (int64 data, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public bool put_string (string str, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public bool put_uint16 (uint16 data, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public bool put_uint32 (uint32 data, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public bool put_uint64 (uint64 data, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 		public void set_byte_order (GLib.DataStreamByteOrder order);
 		public GLib.DataStreamByteOrder byte_order { get; set; }
 	}
@@ -803,8 +803,8 @@ namespace GLib {
 		[CCode (has_construct_function = false)]
 		protected IOStream ();
 		public void clear_pending ();
-		public bool close (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public virtual async bool close_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public bool close (GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public virtual async bool close_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 		[NoWrapper]
 		public virtual bool close_fn (GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public virtual unowned GLib.InputStream get_input_stream ();
@@ -872,19 +872,19 @@ namespace GLib {
 		[CCode (has_construct_function = false)]
 		protected InputStream ();
 		public void clear_pending ();
-		public bool close (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public virtual async bool close_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public bool close (GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public virtual async bool close_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 		[NoWrapper]
 		public virtual bool close_fn (GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public bool has_pending ();
 		public bool is_closed ();
 		[CCode (vfunc_name = "read_fn")]
-		public virtual ssize_t read ([CCode (array_length_type = "gsize")] uint8[] buffer, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public bool read_all ([CCode (array_length_type = "gsize")] uint8[] buffer, out size_t bytes_read, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public virtual async ssize_t read_async ([CCode (array_length_type = "gsize")] uint8[] buffer, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public virtual ssize_t read ([CCode (array_length_type = "gsize")] uint8[] buffer, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public bool read_all ([CCode (array_length_type = "gsize")] uint8[] buffer, out size_t bytes_read, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public virtual async ssize_t read_async ([CCode (array_length_type = "gsize")] uint8[] buffer, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 		public bool set_pending () throws GLib.Error;
-		public virtual ssize_t skip (size_t count, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public virtual async ssize_t skip_async (size_t count, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public virtual ssize_t skip (size_t count, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public virtual async ssize_t skip_async (size_t count, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -986,8 +986,8 @@ namespace GLib {
 		[CCode (has_construct_function = false)]
 		protected OutputStream ();
 		public void clear_pending ();
-		public bool close (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public virtual async bool close_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public bool close (GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public virtual async bool close_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 		[NoWrapper]
 		public virtual bool close_fn (GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public virtual bool flush (GLib.Cancellable? cancellable = null) throws GLib.Error;
@@ -996,12 +996,12 @@ namespace GLib {
 		public bool is_closed ();
 		public bool is_closing ();
 		public bool set_pending () throws GLib.Error;
-		public virtual ssize_t splice (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public virtual async ssize_t splice_async (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public virtual ssize_t splice (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public virtual async ssize_t splice_async (GLib.InputStream source, GLib.OutputStreamSpliceFlags flags, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 		[CCode (vfunc_name = "write_fn")]
-		public virtual ssize_t write ([CCode (array_length_type = "gsize")] uint8[] buffer, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public bool write_all ([CCode (array_length_type = "gsize")] uint8[] buffer, out size_t bytes_written, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public virtual async ssize_t write_async ([CCode (array_length_type = "gsize")] uint8[] buffer, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public virtual ssize_t write ([CCode (array_length_type = "gsize")] uint8[] buffer, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public bool write_all ([CCode (array_length_type = "gsize")] uint8[] buffer, out size_t bytes_written, GLib.Cancellable? cancellable = null) throws GLib.IOError;
+		public virtual async ssize_t write_async ([CCode (array_length_type = "gsize")] uint8[] buffer, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 	}
 	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata
index 91b1fef..7a0eb78 100644
--- a/vapi/packages/gio-2.0/gio-2.0.metadata
+++ b/vapi/packages/gio-2.0/gio-2.0.metadata
@@ -32,19 +32,23 @@ g_converter_convert.outbuf type_name="uint8" is_array="1" array_length_type="gsi
 g_converter_convert.outbuf_size hidden="1"
 g_converter_convert.bytes_read is_out="1"
 g_converter_convert.bytes_written is_out="1"
-g_data_input_stream_read_line nullable="1" transfer_ownership="1"
+g_data_input_stream_read_byte error_types="IOError"
+g_data_input_stream_read_int* error_types="IOError"
+g_data_input_stream_read_uint* error_types="IOError"
+g_data_input_stream_read_line nullable="1" transfer_ownership="1" error_types="IOError"
 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 nullable="1" transfer_ownership="1" error_types="IOError"
 g_data_input_stream_read_line_finish.length nullable="1" transfer_ownership="1" default_value="null" is_out="1"
 g_data_input_stream_read_line_async.length default_value="null"
-g_data_input_stream_read_until nullable="1" transfer_ownership="1"
+g_data_input_stream_read_until nullable="1" transfer_ownership="1" error_types="IOError"
 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 nullable="1" transfer_ownership="1" error_types="IOError"
 g_data_input_stream_read_until_finish.length nullable="1" transfer_ownership="1" default_value="null" is_out="1"
-g_data_input_stream_read_upto nullable="1" transfer_ownership="1"
+g_data_input_stream_read_upto nullable="1" transfer_ownership="1" error_types="IOError"
 g_data_input_stream_read_upto.length is_out="1"
-g_data_input_stream_read_upto_finish nullable="1" transfer_ownership="1"
+g_data_input_stream_read_upto_finish nullable="1" transfer_ownership="1" error_types="IOError"
 g_data_input_stream_read_upto_finish.length nullable="1" transfer_ownership="1" default_value="null" is_out="1"
+g_data_output_stream_put_* error_types="IOError"
 g_dbus_address_get_stream async="1"
 g_dbus_connection_call async="1"
 g_dbus_connection_call_finish transfer_ownership="1"
@@ -130,11 +134,15 @@ g_icon_to_string transfer_ownership="1"
 g_inet_address_to_string transfer_ownership="1"
 g_inet_address_to_bytes type_name="uint8" is_array="1" no_array_length="1"
 g_initable_new.cancellable nullable="1"
-g_input_stream_read virtual="1" vfunc_name="read_fn"
+g_input_stream_read virtual="1" vfunc_name="read_fn" error_types="IOError"
 g_input_stream_read_fn hidden="1"
 g_input_stream_read*.buffer type_name="uint8" is_array="1" array_length_type="gsize"
 g_input_stream_read*.count hidden="1"
+g_input_stream_read_all error_types="IOError"
 g_input_stream_read_all.bytes_read is_out="1"
+g_input_stream_read_finish error_types="IOError"
+g_input_stream_skip error_types="IOError"
+g_input_stream_skip_finish error_types="IOError"
 GInputVector.buffer type_name="uint8" is_array="1" weak="0" array_length_type="gsize" array_length_cname="size"
 GInputVector.size hidden="1"
 GIOErrorEnum rename_to="IOError" errordomain="1"
@@ -156,11 +164,15 @@ g_mount_remount async="1"
 g_mount_unmount async="1"
 g_mount_unmount_with_operation async="1"
 GMountOperation::reply has_emitter="1"
-g_output_stream_write virtual="1" vfunc_name="write_fn"
+g_output_stream_splice error_types="IOError"
+g_output_stream_splice_finish error_types="IOError"
+g_output_stream_write virtual="1" vfunc_name="write_fn" error_types="IOError"
 g_output_stream_write*.buffer type_name="uint8" is_array="1" array_length_type="gsize"
 g_output_stream_write*.count hidden="1"
 g_output_stream_write_fn hidden="1"
+g_output_stream_write_all error_types="IOError"
 g_output_stream_write_all.bytes_written is_out="1"
+g_output_stream_write_finish error_types="IOError"
 GOutputVector.buffer type_name="uint8" is_array="1" weak="0" array_length_type="gsize" array_length_cname="size"
 GOutputVector.size hidden="1"
 g_resolver_free_addresses hidden="1"
@@ -202,6 +214,8 @@ g_file_*.progress_callback nullable="1" default_value="null"
 g_io_scheduler_*.notify nullable="1"
 g_memory_input_stream_*.destroy nullable="1"
 g_memory_output_stream_*.destroy_function nullable="1"
+g_*_stream_close error_types="IOError"
+g_*_stream_close_finish error_types="IOError"
 
 g_application_new.argc hidden="1"
 g_application_new.argv is_array="1" is_ref="1" array_length_pos="1.9" nullable="1" default_value="null"