Bug 623401 - schema compiler: process enums first

Process *.enum.xml before any *.gschema.xml files to ensure that all
enums have been defined.

diff --git a/gio/gschema-compile.c b/gio/gschema-compile.c
index d7ae5f8..33d6ea4 100644 (file)
--- a/gio/gschema-compile.c
+++ b/gio/gschema-compile.c
@@ -1601,8 +1601,15 @@ compare_strings (gconstpointer a,
 {
   gchar *one = *(gchar **) a;
   gchar *two = *(gchar **) b;
+  gint cmp;
 
-  return strcmp (one, two);
+  cmp = g_str_has_suffix (two, ".enums.xml") -
+        g_str_has_suffix (one, ".enums.xml");
+
+  if (!cmp)
+    cmp = strcmp (one, two);
+
+  return cmp;
 }
 
 int