From: Jaap A. Haitsma <jaap@haitsma.org>
Date: Wed, 1 Jul 2009 05:51:23 +0000 (+0200)
Subject: Add g_file_hash and g_file_equal as HashFunc and EqualFunc
X-Git-Tag: 0.7.5~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=627170831cbf22e2aabf171dd2ed759dd7221652;p=thirdparty%2Fvala.git

Add g_file_hash and g_file_equal as HashFunc and EqualFunc

Fixes bug #587412
Patch by Jens Georg <mail@jensge.org>
---

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index a6c907f4c..9f51256bb 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -584,7 +584,6 @@ namespace GLib {
 		[CCode (type = "GIcon*", has_construct_function = false)]
 		public ThemedIcon.with_default_fallbacks (string iconname);
 		public string name { construct; }
-		[CCode (array_length = false, array_null_terminated = true)]
 		public string[] names { get; construct; }
 		[NoAccessorMethod]
 		public bool use_default_fallbacks { get; construct; }
@@ -1072,6 +1071,10 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gio.h", has_target = false)]
 	public delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable);
 	[CCode (cheader_filename = "gio/gio.h")]
+	public static GLib.EqualFunc file_equal;
+	[CCode (cheader_filename = "gio/gio.h")]
+	public static GLib.HashFunc file_hash;
+	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_ACCESS_CAN_DELETE;
 	[CCode (cheader_filename = "gio/gio.h")]
 	public const string FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE;
diff --git a/vapi/packages/gio-2.0/gio-2.0-custom.vala b/vapi/packages/gio-2.0/gio-2.0-custom.vala
index 63956c435..42ab86c39 100644
--- a/vapi/packages/gio-2.0/gio-2.0-custom.vala
+++ b/vapi/packages/gio-2.0/gio-2.0-custom.vala
@@ -33,5 +33,10 @@ namespace GLib {
 		public abstract GLib.FileMonitor monitor_directory (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 		public abstract GLib.FileMonitor monitor_file (GLib.FileMonitorFlags flags, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 	}
+
+	[CCode (cname = "g_file_hash", cheader_filename = "gio/gio.h")]
+	public static GLib.HashFunc file_hash;
+	[CCode (cname = "g_file_equal", cheader_filename = "gio/gio.h")]
+	public static GLib.EqualFunc file_equal;
 }