From: Jürg Billeter <j@bitron.ch>
Date: Thu, 11 Nov 2010 14:14:45 +0000 (+0100)
Subject: glib-2.0, gio-2.0: Update to 2.27.3
X-Git-Tag: 0.11.3~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbde6619dbb041ebbfd877e975b2f5d6f3566ee9;p=thirdparty%2Fvala.git

glib-2.0, gio-2.0: Update to 2.27.3
---

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index dbc5550f7..82579128b 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -1058,18 +1058,20 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class Periodic : GLib.Object {
 		[CCode (has_construct_function = false)]
-		public Periodic (uint hz, int priority);
+		public Periodic (uint hz, int high_priority, int low_priority);
 		public uint add (owned GLib.PeriodicTickFunc callback);
 		public void block ();
-		public void damaged (owned GLib.PeriodicRepairFunc callback);
+		public void damaged ();
+		public int get_high_priority ();
 		public uint get_hz ();
-		public int get_priority ();
+		public int get_low_priority ();
 		public void remove (uint tag);
-		public void unblock (GLib.TimeSpec unblock_time);
+		public void unblock (int64 unblock_time);
+		public int high_priority { get; construct; }
 		public uint hz { get; construct; }
-		public int priority { get; construct; }
+		public int low_priority { get; construct; }
 		public virtual signal void repair ();
-		public virtual signal void tick (uint64 p0);
+		public virtual signal void tick (int64 timestamp);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class Permission : GLib.Object {
@@ -2005,7 +2007,8 @@ namespace GLib {
 	[CCode (cprefix = "G_DBUS_SIGNAL_FLAGS_", cheader_filename = "gio/gio.h")]
 	[Flags]
 	public enum DBusSignalFlags {
-		NONE
+		NONE,
+		NO_MATCH_RULE
 	}
 	[CCode (cprefix = "G_DBUS_SUBTREE_FLAGS_", cheader_filename = "gio/gio.h")]
 	[Flags]
@@ -2343,9 +2346,7 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gio.h")]
 	public delegate bool IOSchedulerJobFunc (GLib.IOSchedulerJob job, GLib.Cancellable cancellable);
 	[CCode (cheader_filename = "gio/gio.h")]
-	public delegate void PeriodicRepairFunc (GLib.Periodic periodic);
-	[CCode (cheader_filename = "gio/gio.h")]
-	public delegate void PeriodicTickFunc (GLib.Periodic periodic, uint64 timestamp);
+	public delegate void PeriodicTickFunc (GLib.Periodic periodic, int64 timestamp);
 	[CCode (cheader_filename = "gio/gio.h", has_target = false)]
 	public delegate void* ReallocFunc (void* data, size_t size);
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -2626,4 +2627,6 @@ namespace GLib {
 	public static void g_simple_async_report_error_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, GLib.Quark domain, int code, string format);
 	[CCode (cname = "g_simple_async_report_gerror_in_idle", cheader_filename = "gio/gio.h")]
 	public static void g_simple_async_report_gerror_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, GLib.Error error);
+	[CCode (cname = "g_simple_async_report_take_gerror_in_idle", cheader_filename = "gio/gio.h")]
+	public static void g_simple_async_report_take_gerror_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, GLib.Error error);
 }
diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 723377cb3..91b80e498 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -2094,11 +2094,6 @@ namespace GLib {
 		public string to_iso8601 ();
 	}
 
-	public struct TimeSpec {
-		public time_t tv_usec;
-		public long tv_nsec;
-	}
-
 	public struct DateDay : uchar {
 		[CCode (cname = "G_DATE_BAD_DAY")]
 		public static DateDay BAD_DAY;
diff --git a/vapi/packages/gio-2.0/gio-2.0.gi b/vapi/packages/gio-2.0/gio-2.0.gi
index e599be40b..99b30e97b 100644
--- a/vapi/packages/gio-2.0/gio-2.0.gi
+++ b/vapi/packages/gio-2.0/gio-2.0.gi
@@ -407,6 +407,15 @@
 				<parameter name="error" type="GError*"/>
 			</parameters>
 		</function>
+		<function name="g_simple_async_report_take_gerror_in_idle" symbol="g_simple_async_report_take_gerror_in_idle">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="object" type="GObject*"/>
+				<parameter name="callback" type="GAsyncReadyCallback"/>
+				<parameter name="user_data" type="gpointer"/>
+				<parameter name="error" type="GError*"/>
+			</parameters>
+		</function>
 		<callback name="GAsyncReadyCallback">
 			<return-type type="void"/>
 			<parameters>
@@ -570,18 +579,11 @@
 				<parameter name="user_data" type="gpointer"/>
 			</parameters>
 		</callback>
-		<callback name="GPeriodicRepairFunc">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="periodic" type="GPeriodic*"/>
-				<parameter name="user_data" type="gpointer"/>
-			</parameters>
-		</callback>
 		<callback name="GPeriodicTickFunc">
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="periodic" type="GPeriodic*"/>
-				<parameter name="timestamp" type="guint64"/>
+				<parameter name="timestamp" type="gint64"/>
 				<parameter name="user_data" type="gpointer"/>
 			</parameters>
 		</callback>
@@ -1434,6 +1436,7 @@
 		</flags>
 		<flags name="GDBusSignalFlags" type-name="GDBusSignalFlags" get-type="g_dbus_signal_flags_get_type">
 			<member name="G_DBUS_SIGNAL_FLAGS_NONE" value="0"/>
+			<member name="G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE" value="1"/>
 		</flags>
 		<flags name="GDBusSubtreeFlags" type-name="GDBusSubtreeFlags" get-type="g_dbus_subtree_flags_get_type">
 			<member name="G_DBUS_SUBTREE_FLAGS_NONE" value="0"/>
@@ -5729,9 +5732,12 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="periodic" type="GPeriodic*"/>
-					<parameter name="callback" type="GPeriodicRepairFunc"/>
-					<parameter name="user_data" type="gpointer"/>
-					<parameter name="notify" type="GDestroyNotify"/>
+				</parameters>
+			</method>
+			<method name="get_high_priority" symbol="g_periodic_get_high_priority">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="periodic" type="GPeriodic*"/>
 				</parameters>
 			</method>
 			<method name="get_hz" symbol="g_periodic_get_hz">
@@ -5740,7 +5746,7 @@
 					<parameter name="periodic" type="GPeriodic*"/>
 				</parameters>
 			</method>
-			<method name="get_priority" symbol="g_periodic_get_priority">
+			<method name="get_low_priority" symbol="g_periodic_get_low_priority">
 				<return-type type="gint"/>
 				<parameters>
 					<parameter name="periodic" type="GPeriodic*"/>
@@ -5750,7 +5756,8 @@
 				<return-type type="GPeriodic*"/>
 				<parameters>
 					<parameter name="hz" type="guint"/>
-					<parameter name="priority" type="gint"/>
+					<parameter name="high_priority" type="gint"/>
+					<parameter name="low_priority" type="gint"/>
 				</parameters>
 			</constructor>
 			<method name="remove" symbol="g_periodic_remove">
@@ -5764,22 +5771,23 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="periodic" type="GPeriodic*"/>
-					<parameter name="unblock_time" type="GTimeSpec*"/>
+					<parameter name="unblock_time" type="gint64"/>
 				</parameters>
 			</method>
+			<property name="high-priority" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
 			<property name="hz" type="guint" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="priority" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="low-priority" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
 			<signal name="repair" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="object" type="GPeriodic*"/>
+					<parameter name="periodic" type="GPeriodic*"/>
 				</parameters>
 			</signal>
 			<signal name="tick" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="object" type="GPeriodic*"/>
-					<parameter name="p0" type="guint64"/>
+					<parameter name="periodic" type="GPeriodic*"/>
+					<parameter name="timestamp" type="gint64"/>
 				</parameters>
 			</signal>
 		</object>