]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
gio-unix-2.0: Fix g_desktop_app_info_search binding
authorRico Tzschichholz <ricotz@ubuntu.com>
Tue, 2 Dec 2014 13:03:06 +0000 (14:03 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Tue, 2 Dec 2014 17:50:13 +0000 (18:50 +0100)
Add binding for g_strfreev in addition for conveniently free'ing the
returned array elements.

(cherry picked from commit b6a428723ef0ba6e32e15b58f490050fcf5af3cf)

vapi/gio-unix-2.0.vapi
vapi/glib-2.0.vapi
vapi/packages/gio-unix-2.0/gio-unix-2.0.metadata

index 8a709fc21d420a9205a06500b7ebb104439cb155..c4264913466bc14147620c84adb27a5440819a1e 100644 (file)
@@ -27,7 +27,8 @@ namespace GLib {
                public bool launch_uris_as_manager (GLib.List uris, GLib.AppLaunchContext launch_context, GLib.SpawnFlags spawn_flags, GLib.SpawnChildSetupFunc user_setup, void* user_setup_data, GLib.DesktopAppLaunchCallback pid_callback, void* pid_callback_data) throws GLib.Error;
                [CCode (array_length = false, array_null_terminated = true)]
                public unowned string[] list_actions ();
-               public static void*[] search (string search_string);
+               [CCode (array_length = false, array_null_terminated = true)]
+               public static string**[] search (string search_string);
                public static void set_desktop_env (string desktop_env);
                public string filename { get; construct; }
        }
index f91af2beda1c5b1b888013fd05f13da5b71b7c5b..c100473dcc1b7e2cf88f18ed522f37985b09d196 100644 (file)
@@ -2245,6 +2245,7 @@ namespace GLib {
 
        /* String Utility Functions */
 
+       public void strfreev (string** str_array);
        public uint strv_length ([CCode (array_length = false, array_null_terminated = true)] string[] str_array);
 
        [CCode (cname = "errno", cheader_filename = "errno.h")]
index 7f27d99c4d3be30b828cf9f14b036a9603c13b81..c4f3da3e840f5a56d586a1f42af28735a051fe4d 100644 (file)
@@ -4,7 +4,7 @@ g_desktop_app_info_get_action_name transfer_ownership="1"
 g_desktop_app_info_get_implementations transfer_ownership="1" type_name="GLib.List<GLib.DesktopAppInfo>"
 g_desktop_app_info_get_keywords type_name="string[]"
 g_desktop_app_info_list_actions type_name="string[]" no_array_length="1" array_null_terminated="1"
-g_desktop_app_info_search type_name="void*[]" transfer_ownership="1"
+g_desktop_app_info_search type_name="string**[]" transfer_ownership="1" no_array_length="1" array_null_terminated="1"
 GFileDescriptorBased cheader_filename="gio/gfiledescriptorbased.h"
 GUnixConnection cheader_filename="gio/gunixconnection.h"
 g_unix_connection_receive_credentials transfer_ownership="1"