Commit 04623abc authored by Brian Cameron's avatar Brian Cameron Committed by Brian Cameron

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

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.
parent e52aca99
2006-02-27 Brian Cameron <brian.cameron@sun.com>
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.
2006-02-28 Brian Cameron <brian.cameron@sun.com>
* Release 2.13.0.9:
* NEWS: Updated.
......
......@@ -2,6 +2,13 @@ Ahh news...
2.13.0.9 stuff:
- Now GDM will use the gdm.conf file if it exists as the custom.conf
file, so if the user has an old configuration file it will continue
to use that.
- Translation updates (Gabor Kelemen, Alexander Shopov)
2.13.0.9 stuff:
- New "gtk-theme" property can be used with the <greeter> tag in
gdmgreeter themes to specify a theme to control the appearance
of the F10/Options menu, the entry field, and other GTK+
......
......@@ -4,6 +4,7 @@
#undef GETTEXT_PACKAGE
#undef GDM_DEFAULTS_CONF
#undef GDM_CUSTOM_CONF
#undef GDM_OLD_CONF
#undef GDM_USER_PATH
#undef HALT_COMMAND
#undef REBOOT_COMMAND
......
......@@ -2,7 +2,7 @@ AC_PREREQ(2.52)
AC_INIT(daemon/gdm.h)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(gdm,2.13.0.9)
AM_INIT_AUTOMAKE(gdm,2.13.0.10)
AC_CONFIG_MACRO_DIR([m4])
AM_MAINTAINER_MODE
......@@ -871,10 +871,12 @@ else
GDM_CUSTOM_CONF="$sysconfdir/gdm/custom.conf"
fi
GDM_OLD_CONF="$sysconfdir/gdm/gdm.conf"
AC_SUBST(GDM_CUSTOM_CONF)
AC_DEFINE_UNQUOTED(GDM_CUSTOM_CONF,"$GDM_CUSTOM_CONF")
AC_SUBST(GDM_OLD_CONF)
AC_DEFINE_UNQUOTED(GDM_OLD_CONF,"$GDM_OLD_CONF")
AC_ARG_WITH(prefetch,
[ --with-prefetch=[yes/no] Install GDM library prefetch utility [default=no]],,
......
......@@ -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);
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment