gio-2.0: Make InputStream.read and OutputStream.write abstract

Based on patch by Paul Jakma.

Fixes bug 664734.

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 8176baf0ea461132298c956d2591d0b0c6e79c50..601b3c5245ab63674d09be216336b718d557df5f 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -1035,7 +1035,7 @@ namespace GLib {
                public uint port { get; construct; }
        }
        [CCode (cheader_filename = "gio/gio.h")]
-       public class InputStream : GLib.Object {
+       public abstract class InputStream : GLib.Object {
                [CCode (has_construct_function = false)]
                protected InputStream ();
                public void clear_pending ();
@@ -1046,7 +1046,7 @@ namespace GLib {
                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.IOError;
+               public abstract 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;
@@ -1149,7 +1149,7 @@ namespace GLib {
                public string service { get; construct; }
        }
        [CCode (cheader_filename = "gio/gio.h")]
-       public class OutputStream : GLib.Object {
+       public abstract class OutputStream : GLib.Object {
                [CCode (has_construct_function = false)]
                protected OutputStream ();
                public void clear_pending ();
@@ -1166,7 +1166,7 @@ namespace GLib {
                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.IOError;
+               public abstract 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;
        }

diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata
index 2bf3fac06919589af008bea93d5f05ac24f636e0..a6c1c2415f33e3e5d95760c820f0ae72ded6daba 100644 (file)
--- a/vapi/packages/gio-2.0/gio-2.0.metadata
+++ b/vapi/packages/gio-2.0/gio-2.0.metadata
@@ -220,7 +220,7 @@ g_inet_address_new_from_bytes.bytes type_name="uint8" is_array="1" no_array_leng
 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" error_types="IOError"
+g_input_stream_read abstract="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"
@@ -229,6 +229,7 @@ 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"
+GInputStream abstract="1"
 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"
@@ -269,13 +270,14 @@ GMountOperation::show_processes.processes type_arguments="Pid"
 GMountOperation::show_processes.choices no_array_length="1" array_null_terminated="1"
 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 abstract="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"
+GOutputStream abstract="1"
 GOutputVector.buffer type_name="uint8" is_array="1" weak="0" array_length_type="gsize" array_length_cname="size"
 GOutputVector.size hidden="1"
 g_periodic_add.callback transfer_ownership="1"