From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sun, 16 Feb 2014 20:47:16 +0000 (+0100)
Subject: gio-2.0: Update to 2.39.5+
X-Git-Tag: 0.23.3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c867070782a6a1530ef5a359c3e996789fce435;p=thirdparty%2Fvala.git

gio-2.0: Update to 2.39.5+
---

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 39a9ba687..a6776ce97 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -299,6 +299,8 @@ namespace GLib {
 		public uint get_inactivity_timeout ();
 		public bool get_is_registered ();
 		public bool get_is_remote ();
+		[NoWrapper]
+		public virtual int handle_local_options (GLib.VariantDict options);
 		public void hold ();
 		public static bool id_is_valid (string application_id);
 		[NoWrapper]
@@ -1865,7 +1867,7 @@ namespace GLib {
 		public unowned T get_op_res_gpointer<T> ();
 		public ssize_t get_op_res_gssize ();
 		public void* get_source_tag ();
-		public static bool is_valid (GLib.AsyncResult result, GLib.Object source, void* source_tag);
+		public static bool is_valid (GLib.AsyncResult result, GLib.Object? source, void* source_tag);
 		public bool propagate_error () throws GLib.Error;
 		[CCode (cheader_filename = "gio/gio.h", cname = "g_simple_async_report_gerror_in_idle")]
 		public static async void report_gerror_in_idle (GLib.Object? object, GLib.Error error);
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 0c2ecfba4..3f250ff87 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -55,6 +55,7 @@ ActionEntry
   .change_state type="GLib.SimpleActionChangeStateCallback"
 ActionGroup
   .query_action#virtual_method virtual
+Application.handle_local_options#virtual_method skip=false
 Application.local_command_line
   .arguments ref type="unowned string[]"
   .exit_status out