From: Jürg Billeter <j@bitron.ch>
Date: Sat, 6 Nov 2010 15:39:44 +0000 (+0100)
Subject: gio-2.0: Update to 2.27.2
X-Git-Tag: 0.11.2~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=990fc89a1d4d64ef33ed52845f465d3dc2a504a3;p=thirdparty%2Fvala.git

gio-2.0: Update to 2.27.2
---

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 64f2a4dbe..aec515efd 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -107,9 +107,11 @@ namespace GLib {
 		protected ApplicationCommandLine ();
 		public string[] get_arguments ();
 		public unowned string get_cwd ();
+		public unowned string get_environ ();
 		public int get_exit_status ();
 		public bool get_is_remote ();
 		public GLib.Variant? get_platform_data ();
+		public unowned string getenv (string name);
 		public void print (string format);
 		[NoWrapper]
 		public virtual void print_literal (string message);
@@ -1063,7 +1065,7 @@ namespace GLib {
 		public uint get_hz ();
 		public int get_priority ();
 		public void remove (uint tag);
-		public void unblock ();
+		public void unblock (GLib.TimeSpec unblock_time);
 		public uint hz { get; construct; }
 		public int priority { get; construct; }
 		public virtual signal void repair ();
@@ -1243,6 +1245,7 @@ namespace GLib {
 		public void set_op_res_gboolean (bool op_res);
 		public void set_op_res_gpointer (void* op_res, GLib.DestroyNotify destroy_op_res);
 		public void set_op_res_gssize (ssize_t op_res);
+		public void take_error (GLib.Error error);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -1864,7 +1867,8 @@ namespace GLib {
 		IS_SERVICE,
 		IS_LAUNCHER,
 		HANDLES_OPEN,
-		HANDLES_COMMAND_LINE
+		HANDLES_COMMAND_LINE,
+		SEND_ENVIRONMENT
 	}
 	[CCode (cprefix = "G_ASK_PASSWORD_", cheader_filename = "gio/gio.h")]
 	[Flags]
diff --git a/vapi/packages/gio-2.0/gio-2.0.gi b/vapi/packages/gio-2.0/gio-2.0.gi
index 3059b2e69..e599be40b 100644
--- a/vapi/packages/gio-2.0/gio-2.0.gi
+++ b/vapi/packages/gio-2.0/gio-2.0.gi
@@ -1368,6 +1368,7 @@
 			<member name="G_APPLICATION_IS_LAUNCHER" value="2"/>
 			<member name="G_APPLICATION_HANDLES_OPEN" value="4"/>
 			<member name="G_APPLICATION_HANDLES_COMMAND_LINE" value="8"/>
+			<member name="G_APPLICATION_SEND_ENVIRONMENT" value="16"/>
 		</flags>
 		<flags name="GAskPasswordFlags" type-name="GAskPasswordFlags" get-type="g_ask_password_flags_get_type">
 			<member name="G_ASK_PASSWORD_NEED_PASSWORD" value="1"/>
@@ -1742,6 +1743,12 @@
 					<parameter name="cmdline" type="GApplicationCommandLine*"/>
 				</parameters>
 			</method>
+			<method name="get_environ" symbol="g_application_command_line_get_environ">
+				<return-type type="gchar**"/>
+				<parameters>
+					<parameter name="cmdline" type="GApplicationCommandLine*"/>
+				</parameters>
+			</method>
 			<method name="get_exit_status" symbol="g_application_command_line_get_exit_status">
 				<return-type type="int"/>
 				<parameters>
@@ -1760,6 +1767,13 @@
 					<parameter name="cmdline" type="GApplicationCommandLine*"/>
 				</parameters>
 			</method>
+			<method name="getenv" symbol="g_application_command_line_getenv">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="cmdline" type="GApplicationCommandLine*"/>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</method>
 			<method name="print" symbol="g_application_command_line_print">
 				<return-type type="void"/>
 				<parameters>
@@ -5750,6 +5764,7 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="periodic" type="GPeriodic*"/>
+					<parameter name="unblock_time" type="GTimeSpec*"/>
 				</parameters>
 			</method>
 			<property name="hz" type="guint" readable="1" writable="1" construct="0" construct-only="1"/>
@@ -6629,6 +6644,15 @@
 					<parameter name="error" type="GError*"/>
 				</parameters>
 			</constructor>
+			<constructor name="new_take_error" symbol="g_simple_async_result_new_take_error">
+				<return-type type="GSimpleAsyncResult*"/>
+				<parameters>
+					<parameter name="source_object" type="GObject*"/>
+					<parameter name="callback" type="GAsyncReadyCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+					<parameter name="error" type="GError*"/>
+				</parameters>
+			</constructor>
 			<method name="propagate_error" symbol="g_simple_async_result_propagate_error">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -6700,6 +6724,13 @@
 					<parameter name="op_res" type="gssize"/>
 				</parameters>
 			</method>
+			<method name="take_error" symbol="g_simple_async_result_take_error">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="simple" type="GSimpleAsyncResult*"/>
+					<parameter name="error" type="GError*"/>
+				</parameters>
+			</method>
 		</object>
 		<object name="GSimplePermission" parent="GPermission" type-name="GSimplePermission" get-type="g_simple_permission_get_type">
 			<constructor name="new" symbol="g_simple_permission_new">
diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata
index 201a9c09c..676a69348 100644
--- a/vapi/packages/gio-2.0/gio-2.0.metadata
+++ b/vapi/packages/gio-2.0/gio-2.0.metadata
@@ -337,6 +337,7 @@ g_settings_get_strv is_array="1" no_array_length="1" array_null_terminated="1" t
 g_settings_set_strv.value is_array="1" no_array_length="1"
 
 g_simple_async_result_new.source_object nullable="1"
+g_simple_async_result_new_take_error hidden="1"
 
 g_socket_listener_accept_finish.source_object transfer_ownership="1" nullable="1" default_value="null"
 g_socket_listener_accept_socket_finish.source_object transfer_ownership="1" nullable="1" default_value="null"