gio-2.0: Fixed GLib.DataInputStream string-reading methods

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 9c591c9d66c639dea5d43857e1d709740c8810c9..6f4d7356d9f69914c72ab9bd975f4ee736518404 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -65,13 +65,13 @@ 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 unowned string? read_line (out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
                public void read_line_async (int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
                public unowned string read_line_finish (GLib.AsyncResult _result, 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 unowned string? read_until (string stop_chars, out size_t length, GLib.Cancellable? cancellable) throws GLib.Error;
                public void read_until_async (string stop_chars, int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
                public unowned string read_until_finish (GLib.AsyncResult _result, size_t length) throws GLib.Error;
                public void set_byte_order (GLib.DataStreamByteOrder order);
@@ -314,7 +314,6 @@ namespace GLib {
        public class IOExtension {
                public unowned string get_name ();
                public int get_priority ();
-               public GLib.Type get_type ();
                public unowned GLib.TypeClass ref_class ();
        }
        [Compact]

diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata
index aebc71be1e3971ee73541af4d9172594fe527b27..2ecc8ae70f835503ad3649feb687a91ae7dfa9cd 100644 (file)
--- a/vapi/packages/gio-2.0/gio-2.0.metadata
+++ b/vapi/packages/gio-2.0/gio-2.0.metadata
@@ -4,7 +4,9 @@ g_app_info_launch_default_for_uri.launch_context nullable="1"
 g_app_info_launch_uris.envp is_array="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.length is_out="1"
+g_data_input_stream_read_until nullable="1"
 g_data_input_stream_read_until.length is_out="1"
 g_file_append_to transfer_ownership="1"
 g_file_append_to_finish transfer_ownership="1"