[gdm/wip/initial-setup2] initial-setup: Read overrides from the right location

[Matthias Clasen <matthiasc src gnome org>]

commit 38d6ca074fb46c92e324bc0a7f53110fd96cc86f
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat May 12 21:34:16 2012 -0400

    initial-setup: Read overrides from the right location

 gui/initial-setup/gdm-initial-setup.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gui/initial-setup/gdm-initial-setup.c b/gui/initial-setup/gdm-initial-setup.c
index 3b40557..1850a6f 100644
--- a/gui/initial-setup/gdm-initial-setup.c
+++ b/gui/initial-setup/gdm-initial-setup.c
@@ -2205,6 +2205,7 @@ int
 main (int argc, char *argv[])
 {
         SetupData *setup;
+        gchar *filename;
         GError *error;
         GOptionEntry entries[] = {
                 { "skip-account", 0, 0, G_OPTION_ARG_NONE, &skip_account, "Skip account creation", NULL },
@@ -2238,15 +2239,15 @@ main (int argc, char *argv[])
         }
 
         setup->overrides = g_key_file_new ();
-        if (!g_key_file_load_from_file (setup->overrides,
-                                        "overrides.ini",
-                                        0, &error)) {
+        filename = g_build_filename (UIDIR, "overrides.ini", NULL);
+        if (!g_key_file_load_from_file (setup->overrides, filename, 0, &error)) {
                 if (!g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
                         g_error ("%s", error->message);
                         exit (1);
                 }
                 g_error_free (error);
         }
+        g_free (filename);
 
         prepare_assistant (setup);