vala r1083 - in trunk: . vala vapi

[juergbi svn gnome org]

Author: juergbi
Date: Sun Mar  2 11:09:09 2008
New Revision: 1083
URL: http://svn.gnome.org/viewvc/vala?rev=1083&view=rev

Log:
2008-03-02  Juerg Billeter  <j bitron ch>

	* vapi/glib-2.0.vapi: add bindings for g_get_system_*_dirs

	* vala/valacodecontext.vala: use g_get_system_data_dirs to find
	  VAPI files, should make valac relocatable on Windows


Modified:
   trunk/ChangeLog
   trunk/vala/valacodecontext.vala
   trunk/vapi/glib-2.0.vapi

Modified: trunk/vala/valacodecontext.vala
==============================================================================
--- trunk/vala/valacodecontext.vala	(original)
+++ trunk/vala/valacodecontext.vala	Sun Mar  2 11:09:09 2008
@@ -402,14 +402,11 @@
 			return filename;
 		}
 
-		filename = Path.build_filename ("/usr/local/share/vala/vapi", basename);
-		if (FileUtils.test (filename, FileTest.EXISTS)) {
-			return filename;
-		}
-
-		filename = Path.build_filename ("/usr/share/vala/vapi", basename);
-		if (FileUtils.test (filename, FileTest.EXISTS)) {
-			return filename;
+		foreach (string vapidir in Environment.get_system_data_dirs ()) {
+			var filename = Path.build_filename (vapidir, "vala/vapi", basename);
+			if (FileUtils.test (filename, FileTest.EXISTS)) {
+				return filename;
+			}
 		}
 
 		return null;

Modified: trunk/vapi/glib-2.0.vapi
==============================================================================
--- trunk/vapi/glib-2.0.vapi	(original)
+++ trunk/vapi/glib-2.0.vapi	Sun Mar  2 11:09:09 2008
@@ -1672,6 +1672,10 @@
 		public static weak string get_user_name ();
 		[CCode (cname = "g_get_user_data_dir")]
 		public static weak string get_user_data_dir ();
+		[CCode (cname = "g_get_system_data_dirs"), NoArrayLength]
+		public static weak string[] get_system_data_dirs ();
+		[CCode (cname = "g_get_system_config_dirs"), NoArrayLength]
+		public static weak string[] get_system_config_dirs ();
 		[CCode (cname = "g_get_host_name")]
 		public static weak string! get_host_name ();
 		[CCode (cname = "g_get_home_dir")]