Correct Makefile so that if CONSOLE_HELPER is set, we don't try to create

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

        * Makefile.am: Correct Makefile so that if
          CONSOLE_HELPER is set, we don't try to create
          an /sbin/gdmsetup symlink to gdmsetup.  Now
          gdmsetup is already installed to /sbin always.
          Fixes #302319.
        * gui/gdmsetup.c: Fix sensitivity of the
          "Delete Theme" button.
        * daemon/gdm.h, gui/gdmlogin.c, gui/greeter/greeter.c:
          Now only set user/password entry to PAM_MAX_RESP_SIZE
          if HAVE_PAM is defined, otherwise set it to
          GDM_MAX_PASS set to 256 in daemon/gdm.h.  This
          allows gdm to be used on systems that do not have
          PAM.  Fixes #302228.
        * daemon/gdm.h, docs/C/gdm.xml, gui/gdmsetup.c,
          gui/greeter/greeter.c, gui/gdmsetup.glade,
          gui/gdmsetup-strings.c, config/gdm.conf.in:
          Now support random theme.  Fixes #302354.
        * gui/gdmcommon.c, gui/gdmlogin.c,
          gui/greeter/greeter_session.c, gui/Makefile.am,
          added gui/gdmsession.[ch]:  Support better
          sorting for session names.  Fixes #301818.

1 files changed, 7 insertions, 24 deletions

diff --git a/config/gdm.conf.in b/config/gdm.conf.in
index 14d19c7f..13722339 100644
--- a/config/gdm.conf.in
+++ b/config/gdm.conf.in
@@ -236,15 +236,6 @@ Enable=false
 # or mail details for some user, or some such.
 #Willing=@EXPANDED_SYSCONFDIR@/gdm/Xwilling
 
-# Run XDMCP sessions on a local proxy X server
-#EnableProxy=false
-# Proxy X server on which XDMCP session should be run
-#ProxyXServer=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@ -geometry 768x576
-#ProxyXServer=@X_SERVER_PATH@/Xdmx @X_CONFIG_OPTIONS@ -addremovescreens -norender -noglxproxy
-# Command which enables the proxy X server to be reconnected
-# to another backend display
-#ProxyReconnect=@GDM_RECONNECT_PROXY@
-
 [gui]
 # The specific gtkrc file we use.  It should be the full path to the gtkrc
 # that we need.  Unless you need a specific gtkrc that doesn't correspond to
@@ -359,21 +350,8 @@ DefaultRemoteWelcome=true
 # Program to run to draw the background in the standard greeter.  Perhaps
 # something like an xscreensaver hack or some such.
 #BackgroundProgram=
-# If this is true then the background program is run always, otherwise
+# if this is true then the background program is run always, otherwise
 # it is only run when the BackgroundType is 0 (None)
-#BackgroundProgramInitialDelay=30
-#  The background program will be started after at least that many 
-#  seconds of inactivity. Note that in the current implementation, the actual
-#  delay could be twice as long as the one specified here in the worst case. 
-#  Basically GDM checks from time to time if there was activity and runs
-#  the program if there was none.
-#RestartBackgroundProgram=true
-#  If set the background program will be restarted when it has exited, after 
-#  the delay described below has elapsed.  This option can be useful when you
-#  wish to run a screen saver program when no user is using the machine.
-#BackgroundProgramRestartDelay=30
-#  The background program will be restarted after at least that many seconds 
-#  of inactivity.
 #RunBackgroundProgramAlways=false
 # Show the Failsafe sessions.  These are much MUCH nicer (focus for xterm for
 # example) and more failsafe then those supplied by scripts so distros should
@@ -393,9 +371,14 @@ DefaultRemoteWelcome=true
 # for instance in console, xdm and ssh.
 #UseInvisibleInEntry=false
 # These two keys are for the new greeter.  Circles is the standard
-# shipped theme
+# shipped theme.  If you want gdm to select a random theme from a list
+# then provide a list that is delimited by /: to the GraphicalThemes key and 
+# set GraphicalThemeRand to true.  Otherwise use GraphicalTheme and specify
+# just one theme.
 #GraphicalTheme=circles
+#GraphicalThemes=circles/:happygnome
 GraphicalThemeDir=@EXPANDED_DATADIR@/gdm/themes/
+GraphicalThemeRand=false
 # If InfoMsgFile points to a file, the greeter will display the contents of the
 # file in a modal dialog box before the user is allowed to log in.
 #InfoMsgFile=