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 faa431b67869bcf944ce58bf4418e851f23e170b..f2b8b5991b6d04f7685fc6002f6c52823edac190 100644 (file)
--- 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;
                                }