From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 14 Nov 2013 08:05:04 +0000 (+0100)
Subject: gio-2.0, gio-unix-2.0: Update to 2.39.1
X-Git-Tag: 0.23.1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0e050cd0f23dc7df61546137983d6511378880a;p=thirdparty%2Fvala.git

gio-2.0, gio-unix-2.0: Update to 2.39.1
---

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 50384fdb0..92a29b5ce 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -254,6 +254,13 @@ namespace GLib {
 		[CCode (cheader_filename = "gio/gio.h", cname = "G_VOLUME_IDENTIFIER_KIND_UUID")]
 		public const string UUID;
 	}
+	[CCode (cheader_filename = "gio/gio.h", type_id = "g_app_info_monitor_get_type ()")]
+	public class AppInfoMonitor : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected AppInfoMonitor ();
+		public static GLib.AppInfoMonitor @get ();
+		public signal void changed ();
+	}
 	[CCode (cheader_filename = "gio/gio.h", type_id = "g_app_launch_context_get_type ()")]
 	public class AppLaunchContext : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -2629,7 +2636,8 @@ namespace GLib {
 		public abstract async bool make_directory_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public bool make_directory_with_parents (GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public abstract bool make_symbolic_link (string symlink_value, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public abstract bool measure_disk_usage_finish (GLib.AsyncResult result, out uint64 disk_usage, out uint64 num_dirs, out uint64 num_files) throws GLib.Error;
+		public abstract bool measure_disk_usage (GLib.FileMeasureFlags flags, GLib.Cancellable? cancellable, [CCode (delegate_target_pos = 3.5)] GLib.FileMeasureProgressCallback? progress_callback, out uint64 disk_usage, out uint64 num_dirs, out uint64 num_files) throws GLib.Error;
+		public abstract async bool measure_disk_usage_async (GLib.FileMeasureFlags flags, int io_priority, GLib.Cancellable? cancellable, GLib.FileMeasureProgressCallback? progress_callback, out uint64 disk_usage, out uint64 num_dirs, out uint64 num_files) throws GLib.Error;
 		public GLib.FileMonitor monitor (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		[CCode (vfunc_name = "monitor_dir")]
 		public abstract GLib.FileMonitor monitor_directory (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable = null) throws GLib.IOError;
diff --git a/vapi/gio-unix-2.0.vapi b/vapi/gio-unix-2.0.vapi
index cbd31a2d0..409995eac 100644
--- a/vapi/gio-unix-2.0.vapi
+++ b/vapi/gio-unix-2.0.vapi
@@ -25,6 +25,7 @@ namespace GLib {
 		public void launch_action (string action_name, GLib.AppLaunchContext launch_context);
 		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;
 		public unowned string[] list_actions ();
+		public static void*[] search (string search_string);
 		public static void set_desktop_env (string desktop_env);
 		public string filename { get; construct; }
 	}
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 3ae5ae295..0c2ecfba4 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -351,6 +351,13 @@ AsyncReadyCallback.source_object nullable
 DBusMessage
   .get_body unowned
 DBusSubtreeVTable.enumerate skip=false
+File
+  .measure_disk_usage skip=false
+  .measure_disk_usage_async skip=false
+  .measure_disk_usage_finish skip=false
+  .measure_disk_usage.* default=()
+  .measure_disk_usage_async.* default=()
+  .measure_disk_usage_finish.* default=()
 FileAttributeInfoList
   .infos array array_length_field="n_infos" unowned=false
 LoadableIcon
diff --git a/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi b/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi
index 1d8487e2f..99c16d841 100644
--- a/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi
+++ b/vapi/packages/gio-unix-2.0/gio-unix-2.0.gi
@@ -331,6 +331,12 @@
 					<parameter name="key_file" type="GKeyFile*"/>
 				</parameters>
 			</constructor>
+			<method name="search" symbol="g_desktop_app_info_search">
+				<return-type type="gchar***"/>
+				<parameters>
+					<parameter name="search_string" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="set_desktop_env" symbol="g_desktop_app_info_set_desktop_env">
 				<return-type type="void"/>
 				<parameters>
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 e75983384..55c3f7def 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
@@ -3,6 +3,7 @@ GDesktopAppInfo cheader_filename="gio/gdesktopappinfo.h"
 g_desktop_app_info_get_action_name transfer_ownership="1"
 g_desktop_app_info_get_keywords type_name="string[]"
 g_desktop_app_info_list_actions type_name="string[]"
+g_desktop_app_info_search type_name="void*[]" transfer_ownership="1"
 GFileDescriptorBased cheader_filename="gio/gfiledescriptorbased.h"
 GUnixConnection cheader_filename="gio/gunixconnection.h"
 g_unix_connection_receive_credentials transfer_ownership="1"