Search provided include dirs before the default directories.

2008-11-11  Owen Taylor  <otaylor@redhat.com>

        * girepository/girparser.c: Search provided include dirs before
        the default directories.

svn path=/trunk/; revision=885

diff --git a/ChangeLog b/ChangeLog
index 1f396b4..a12e011 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-11  Owen Taylor  <otaylor@redhat.com>
+
+       * girepository/girparser.c: Search provided include dirs before
+       the default directories.
+
 2008-11-11  Owen Taylor  <otaylor@redhat.com>
 
        * girepository/giroffsets.c: Include fully-qualified names in

diff --git a/girepository/girparser.c b/girepository/girparser.c
index af9bf34..74d7275 100644 (file)
--- a/girepository/girparser.c
+++ b/girepository/girparser.c
@@ -198,14 +198,6 @@ locate_gir (const char *name, const char *version, const char * const* extra_pat
       
   girname = g_strdup_printf ("%s-%s.gir", name, version);
   
-  for (dir = datadirs; *dir; dir++) 
-    {
-      path = g_build_filename (*dir, "gir", girname, NULL);
-      if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
-       return path;
-      g_free (path);
-      path = NULL;
-    }
   if (extra_paths != NULL)
     {
       for (dir = extra_paths; *dir; dir++) 
@@ -217,6 +209,14 @@ locate_gir (const char *name, const char *version, const char * const* extra_pat
          path = NULL;
        }
     }
+  for (dir = datadirs; *dir; dir++) 
+    {
+      path = g_build_filename (*dir, "gir", girname, NULL);
+      if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
+       return path;
+      g_free (path);
+      path = NULL;
+    }
   g_free (girname);
   return path;
 }