gobject-introspection r885 - in trunk: . girepository

[otaylor svn gnome org]

Author: otaylor
Date: Tue Nov 11 15:25:59 2008
New Revision: 885
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=885&view=rev

Log:
2008-11-11  Owen Taylor  <otaylor redhat com>

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

Modified:
   trunk/ChangeLog
   trunk/girepository/girparser.c

Modified: trunk/girepository/girparser.c
==============================================================================
--- trunk/girepository/girparser.c	(original)
+++ trunk/girepository/girparser.c	Tue Nov 11 15:25:59 2008
@@ -198,14 +198,6 @@
       
   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 @@
 	  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;
 }