]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Reverse order of directory loading for a given XDG variable
authorMichael Terry <michael.terry@canonical.com>
Tue, 18 Mar 2014 03:14:51 +0000 (23:14 -0400)
committerMichael Terry <michael.terry@canonical.com>
Tue, 18 Mar 2014 03:14:51 +0000 (23:14 -0400)
common/configuration.c

index 524b33f4ebccd931f715fa50c12cc4cb3fb6867a..8502d6d12a4afd73bac93c66a4a08011a39a39c8 100644 (file)
@@ -145,7 +145,9 @@ load_config_directories (const gchar * const *dirs, GList **messages)
 {
     gint i;
 
-    for (i = 0; dirs[i]; i++)
+    // Load in reverse order, because XDG_* fields are preference-ordered and
+    // the directories in front should override directories in back. 
+    for (i = g_strv_length ((gchar **)dirs) - 1; i >= 0; i--)
     {
         gchar *full_dir = g_build_filename (dirs[i], "lightdm", "lightdm.conf.d", NULL);
             if (messages)