diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2014-12-02 14:03:06 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2014-12-02 18:50:13 +0100 |
| commit | ba44ef5ecd9007e974c8dfa4fd4a49e7fdc4bd49 (patch) | |
| tree | fb85febb4f79acd34abde6080fc8681f51208eb2 | |
| parent | ab0a982e78acd7ad36c1d7d68a2e0d8b394f871e (diff) | |
| download | vala-ba44ef5ecd9007e974c8dfa4fd4a49e7fdc4bd49.tar.gz | |
gio-unix-2.0: Fix g_desktop_app_info_search binding
Add binding for g_strfreev in addition for conveniently free'ing the
returned array elements.
(cherry picked from commit b6a428723ef0ba6e32e15b58f490050fcf5af3cf)
| -rw-r--r-- | vapi/gio-unix-2.0.vapi | 3 | ||||
| -rw-r--r-- | vapi/glib-2.0.vapi | 1 | ||||
| -rw-r--r-- | vapi/packages/gio-unix-2.0/gio-unix-2.0.metadata | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/vapi/gio-unix-2.0.vapi b/vapi/gio-unix-2.0.vapi index 8a709fc21..c42649134 100644 --- a/vapi/gio-unix-2.0.vapi +++ b/vapi/gio-unix-2.0.vapi @@ -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; } } diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi index f91af2bed..c100473dc 100644 --- a/vapi/glib-2.0.vapi +++ b/vapi/glib-2.0.vapi @@ -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")] 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 7f27d99c4..c4f3da3e8 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 @@ -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" |