Updated. Update to 2.13.0.9. Added code to support the change inGDM2_2_13_0_10

2006-03-03  Brian Cameron  <brian.cameron@sun.com>

        * Release 2.13.0.10:
        * NEWS: Updated.
        * configure.ac, acconfig.h: Update to 2.13.0.9.  Added code to support
          the change in gdmconfig.c below.
        * gui/gdmconfig.c: Fix so that if gdm.conf file exists on the system
          this is used instead of custom.conf.  This makes GDM more backwards
          compatible and won't break user configuration if the user has an old
          config file.

1 files changed, 20 insertions, 0 deletions

diff --git a/daemon/gdmconfig.c b/daemon/gdmconfig.c
index a5790596..9a09614b 100644
--- a/daemon/gdmconfig.c
+++ b/daemon/gdmconfig.c
@@ -577,6 +577,26 @@ gdm_get_custom_config (struct stat *statbuf)
 {
    int r;
 
+   /*
+    * First check to see if the old configuration file name is on
+    * the system.  If so, use that as the custom configuration
+    * file.  "make install" will move this file aside, and 
+    * distros probably can also manage moving this file on
+    * upgrade.   
+    *
+    * In case this file is on the system, then use it as
+    * the custom configuration file until the user moves it
+    * aside.  This will likely mean all the defaults in
+    * defaults.conf will not get used since the old gdm.conf
+    * file has all the keys in it (except new ones).  But
+    * that would be what the user wants.
+    */
+   VE_IGNORE_EINTR (r = g_stat (GDM_OLD_CONF, statbuf));
+   if (r >= 0) {
+      custom_config_file = g_strdup (GDM_OLD_CONF);
+      return ve_config_new (custom_config_file);
+   }
+
    VE_IGNORE_EINTR (r = g_stat (GDM_CUSTOM_CONF, statbuf));
    if (r >= 0) {
       custom_config_file = g_strdup (GDM_CUSTOM_CONF);