From: Evan Nemerson <evan@coeus-group.com>
Date: Fri, 22 Jun 2012 19:04:40 +0000 (-0700)
Subject: Give priority to unversioned vapi directory
X-Git-Tag: 0.17.2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07d3bbf32e546b432eee11bd802999594fa733ef;p=thirdparty%2Fvala.git

Give priority to unversioned vapi directory

This allows bindings distributed with upstream libraries to be
prioritized over bindings distributed with Vala.
---

diff --git a/vala/valacodecontext.vala b/vala/valacodecontext.vala
index faa431b67..f2b8b5991 100644
--- a/vala/valacodecontext.vala
+++ b/vala/valacodecontext.vala
@@ -537,18 +537,18 @@ public class Vala.CodeContext {
 			}
 		}
 
-		if (versioned_data_dir != null) {
+		if (data_dir != null) {
 			foreach (string dir in Environment.get_system_data_dirs ()) {
-				filename = Path.build_path ("/", dir, versioned_data_dir, basename);
+				filename = Path.build_path ("/", dir, data_dir, basename);
 				if (FileUtils.test (filename, FileTest.EXISTS)) {
 					return filename;
 				}
 			}
 		}
 
-		if (data_dir != null) {
+		if (versioned_data_dir != null) {
 			foreach (string dir in Environment.get_system_data_dirs ()) {
-				filename = Path.build_path ("/", dir, data_dir, basename);
+				filename = Path.build_path ("/", dir, versioned_data_dir, basename);
 				if (FileUtils.test (filename, FileTest.EXISTS)) {
 					return filename;
 				}