gio-2.0: Fix the GIcon and GLoadableIcon bindings

Fixes bug 655154.

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 989873ccc93da38f298d4134d72a1022d10c9ec8..2bba09a77e019a392929b5793f3df6c22e99c44c 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -1956,12 +1956,12 @@ namespace GLib {
        public interface Icon : GLib.Object {
                public abstract bool equal (GLib.Icon icon2);
                [NoWrapper]
-               public abstract unowned GLib.Icon from_tokens (string tokens, int num_tokens, int version) throws GLib.Error;
-               public abstract uint hash (void* icon);
+               public virtual GLib.Icon? from_tokens (string[] tokens, int version) throws GLib.Error;
+               public abstract uint hash ();
                public static GLib.Icon? new_for_string (string str) throws GLib.Error;
-               public string to_string ();
+               public string? to_string ();
                [NoWrapper]
-               public abstract bool to_tokens (GLib.GenericArray tokens, int out_version);
+               public virtual bool to_tokens (GLib.GenericArray tokens, out int out_version);
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public interface Initable : GLib.Object {
@@ -1972,8 +1972,8 @@ namespace GLib {
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public interface LoadableIcon : GLib.Icon, GLib.Object {
-               public abstract unowned GLib.InputStream load (int size, out unowned string? type, GLib.Cancellable? cancellable = null) throws GLib.Error;
-               public abstract async unowned GLib.InputStream load_async (int size, GLib.Cancellable? cancellable, out unowned string? type) throws GLib.Error;
+               public abstract GLib.InputStream load (int size, out string? type, GLib.Cancellable? cancellable = null) throws GLib.Error;
+               public abstract async GLib.InputStream load_async (int size, GLib.Cancellable? cancellable, out string? type) throws GLib.Error;
        }
        [CCode (cheader_filename = "gio/gio.h")]
        public interface Mount : GLib.Object {

diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata
index 7f6a7cab21ae519fdf23c5fa0d7330006fa1d99d..32d0e6c3e321baf4f62668c3afcb95453bbf0f7d 100644 (file)
--- a/vapi/packages/gio-2.0/gio-2.0.metadata
+++ b/vapi/packages/gio-2.0/gio-2.0.metadata
@@ -182,7 +182,13 @@ g_file_stop_mountable async="1"
 g_file_unmount_mountable async="1"
 g_file_unmount_mountable_with_operation async="1"
 g_icon_new_for_string transfer_ownership="1" nullable="1"
-g_icon_to_string transfer_ownership="1"
+g_icon_from_tokens transfer_ownership="1" nullable="1" virtual="1"
+g_icon_from_tokens.tokens type_name="string" is_array="1" array_length_cname="num_tokens"
+g_icon_from_tokens.num_tokens hidden="1"
+g_icon_to_tokens virtual="1"
+g_icon_to_tokens.out_version is_out="1"
+g_icon_hash.icon hidden="1"
+g_icon_to_string transfer_ownership="1" nullable="1"
 g_inet_address_new_from_bytes.bytes type_name="uint8" is_array="1" no_array_length="1"
 g_inet_address_to_string transfer_ownership="1"
 g_inet_address_to_bytes type_name="uint8" is_array="1" no_array_length="1"
@@ -208,7 +214,11 @@ g_io_scheduler_job_send_to_mainloop_async.func transfer_ownership="1"
 g_io_scheduler_job_send_to_mainloop_async.notify hidden="1"
 g_io_scheduler_push_job.job_func transfer_ownership="1"
 g_io_scheduler_push_job.notify hidden="1"
+g_loadable_icon_load transfer_ownership="1"
+g_loadable_icon_load.type nullable="1" transfer_ownership="1"
 g_loadable_icon_load_async.cancellable nullable="1"
+g_loadable_icon_load_finish.type nullable="1" transfer_ownership="1"
+g_loadable_icon_load_finish transfer_ownership="1"
 g_memory_input_stream_*_data.data type_name="uint8" is_array="1" transfer_ownership="1" array_length_type="gsize"
 g_memory_input_stream_*_data.len hidden="1"
 g_memory_input_stream_*_data.destroy nullable="1"
@@ -353,9 +363,6 @@ g_app_info_create_from_commandline.app_name nullable="1"
 g_app_info_launch.files nullable="1" type_arguments="File"
 g_app_info_launch_uris.uris nullable="1" type_arguments="string"
 
-g_loadable_icon_load.type nullable="1"
-g_loadable_icon_load_finish.type nullable="1"
-
 g_srv_target_copy transfer_ownership="1"
 
 GSettings::changes has_emitter="1"