From 9c836f4cd6ba53af70a8ebd09abfc82090220710 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sun, 22 Sep 2019 22:14:18 +0200 Subject: [PATCH] gio-unix-2.0: Fix DesktopAppInfo.get_string(), UnixFDMessage.steal_fds() ... and DesktopAppInfoLookup.get_default_for_uri_scheme() Additionally adjust some header references. --- vapi/gio-unix-2.0.vapi | 12 ++++++------ vapi/packages/gio-unix-2.0/gio-unix-2.0.metadata | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/vapi/gio-unix-2.0.vapi b/vapi/gio-unix-2.0.vapi index 00865774e..e4589676d 100644 --- a/vapi/gio-unix-2.0.vapi +++ b/vapi/gio-unix-2.0.vapi @@ -23,7 +23,7 @@ namespace GLib { public bool get_nodisplay (); public bool get_show_in (string desktop_env); public unowned string get_startup_wm_class (); - public unowned string get_string (string key); + public string get_string (string key); [CCode (array_length_type = "gsize")] public string[] get_string_list (string key); public bool has_key (string key); @@ -64,7 +64,7 @@ namespace GLib { public UnixFDMessage (); public bool append_fd (int fd) throws GLib.Error; public unowned GLib.UnixFDList get_fd_list (); - public int steal_fds (int length); + public int[] steal_fds (); [CCode (has_construct_function = false, type = "GSocketControlMessage*")] public UnixFDMessage.with_fd_list (GLib.UnixFDList fd_list); public GLib.UnixFDList fd_list { get; construct; } @@ -164,17 +164,17 @@ namespace GLib { [NoAccessorMethod] public GLib.ByteArray path_as_array { owned get; construct; } } - [CCode (cheader_filename = "gio/gunixmounts.h")] + [CCode (cheader_filename = "gio/gdesktopappinfo.h")] public interface DesktopAppInfoLookup : GLib.Object { - public abstract unowned GLib.AppInfo get_default_for_uri_scheme (string uri_scheme); + public abstract GLib.AppInfo get_default_for_uri_scheme (string uri_scheme); } [CCode (cheader_filename = "gio/gfiledescriptorbased.h")] public interface FileDescriptorBased : GLib.Object { public abstract int get_fd (); } - [CCode (cheader_filename = "gio/gunixmounts.h")] + [CCode (cheader_filename = "gio/gdesktopappinfo.h")] public delegate void DesktopAppLaunchCallback (GLib.DesktopAppInfo appinfo, GLib.Pid pid); - [CCode (cheader_filename = "gio/gunixmounts.h")] + [CCode (cheader_filename = "gio/gdesktopappinfo.h")] public const string DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME; [CCode (cheader_filename = "gio/gunixmounts.h", cname = "g_unix_is_mount_path_system_internal")] public static bool is_mount_path_system_internal (string mount_path); diff --git a/vapi/packages/gio-unix-2.0/gio-unix-2.0.metadata b/vapi/packages/gio-unix-2.0/gio-unix-2.0.metadata index c01700a81..95bde44e9 100644 --- a/vapi/packages/gio-unix-2.0/gio-unix-2.0.metadata +++ b/vapi/packages/gio-unix-2.0/gio-unix-2.0.metadata @@ -1,9 +1,13 @@ GLib cprefix="G" lower_case_cprefix="g_" cheader_filename="gio/gunixmounts.h" GDesktopAppInfo cheader_filename="gio/gdesktopappinfo.h" +GDesktopAppInfoLookup cheader_filename="gio/gdesktopappinfo.h" +GDesktopAppLaunchCallback cheader_filename="gio/gdesktopappinfo.h" +G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME cheader_filename="gio/gdesktopappinfo.h" g_desktop_app_info_get_action_name transfer_ownership="1" g_desktop_app_info_get_implementations transfer_ownership="1" type_name="GLib.List" g_desktop_app_info_get_keywords type_name="string[]" no_array_length="1" array_null_terminated="1" g_desktop_app_info_get_locale_string transfer_ownership="1" nullable="1" +g_desktop_app_info_get_string transfer_ownership="1" g_desktop_app_info_get_string_list is_array="1" array_length_idx=1 array_length_type="gsize" transfer_ownership="1" g_desktop_app_info_get_string_list.length hidden="1" g_desktop_app_info_list_actions type_name="string[]" no_array_length="1" array_null_terminated="1" @@ -23,12 +27,15 @@ g_desktop_app_info_launch_uris_as_manager_with_fds.stdin_fd default_value="-1" g_desktop_app_info_launch_uris_as_manager_with_fds.stdout_fd default_value="-1" g_desktop_app_info_launch_uris_as_manager_with_fds.stderr_fd default_value="-1" g_desktop_app_info_search type_name="string**[]" transfer_ownership="1" no_array_length="1" array_null_terminated="1" +g_desktop_app_info_lookup_get_default_for_uri_scheme transfer_ownership="1" GFileDescriptorBased cheader_filename="gio/gfiledescriptorbased.h" GUnixConnection cheader_filename="gio/gunixconnection.h" g_unix_connection_receive_credentials transfer_ownership="1" g_unix_connection_receive_credentials_finish transfer_ownership="1" GUnixCredentialsMessage cheader_filename="gio/gunixcredentialsmessage.h" GUnixFDMessage cheader_filename="gio/gunixfdmessage.h" +g_unix_fd_message_steal_fds is_array="1" transfer_ownership="1" +g_unix_fd_message_steal_fds.length hidden="1" GUnixInputStream cheader_filename="gio/gunixinputstream.h" g_unix_is_mount_path_system_internal name="is_mount_path_system_internal" g_unix_is_system_device_path name="is_system_device_path" -- 2.47.2