David Zeuthen 62183ef
--- gdm-2.18.0/config/gdm.conf.in.orig	2007-03-11 17:46:16.000000000 -0400
David Zeuthen 62183ef
+++ gdm-2.18.0/config/gdm.conf.in	2007-03-13 18:25:12.000000000 -0400
David Zeuthen 62183ef
@@ -66,9 +66,9 @@
David Zeuthen 62183ef
 # should leave this alone.
David Zeuthen 62183ef
 #Chooser=@libexecdir@/gdmchooser
David Zeuthen 62183ef
 
David Zeuthen 62183ef
-# The greeter for local (non-xdmcp) logins.  Change gdmlogin to gdmgreeter to
David Zeuthen 62183ef
-# get the new graphical greeter.
David Zeuthen 62183ef
-#Greeter=@libexecdir@/gdmlogin
David Zeuthen 62183ef
+# The greeter for local (non-xdmcp) logins.  Change gdmgreeter to gdmlogin to
David Zeuthen 62183ef
+# get the boring greeter.
David Zeuthen 62183ef
+Greeter=@libexecdir@/gdmgreeter
David Zeuthen 62183ef
 
David Zeuthen 62183ef
 # The greeter for xdmcp logins, usually you want a less graphically intensive
David Zeuthen 62183ef
 # greeter here so it's better to leave this with gdmlogin
David Zeuthen 62183ef
@@ -78,23 +78,21 @@
David Zeuthen 62183ef
 # This is useful for enabling additional feature support e.g. GNOME
David Zeuthen 62183ef
 # accessibility framework. Only "trusted" modules should be allowed to minimize
David Zeuthen 62183ef
 # security holes
David Zeuthen 62183ef
-#AddGtkModules=false
David Zeuthen 62183ef
+AddGtkModules=true
David Zeuthen 62183ef
 # By default, these are the accessibility modules.
David Zeuthen 62183ef
-#GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libdwellmouselistener:@libdir@/gtk-2.0/modules/libkeymouselistener
David Zeuthen 62183ef
+GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libdwellmouselistener:@libdir@/gtk-2.0/modules/libkeymouselistener
David Zeuthen 62183ef
 
David Zeuthen 62183ef
 # Default path to set.  The profile scripts will likely override this value.
David Zeuthen 62183ef
 # This value will be overridden with the value from /etc/default/login if it
David Zeuthen 62183ef
 # contains "ROOT=<pathvalue>".
David Zeuthen 62183ef
-#DefaultPath=@GDM_USER_PATH@
David Zeuthen 62183ef
+DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin
David Zeuthen 62183ef
 # Default path for root.  The profile scripts will likely override this value.
David Zeuthen 62183ef
 # This value will be overridden with the value from /etc/default/login if it
David Zeuthen 62183ef
 # contains "SUROOT=<pathvalue>".
David Zeuthen 62183ef
-#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@
David Zeuthen 62183ef
+RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
David Zeuthen 62183ef
 
David Zeuthen 62183ef
-# If you are having trouble with using a single server for a long time and want
David Zeuthen 62183ef
-# GDM to kill/restart the server, turn this on.  On Solaris, this value is
David Zeuthen 62183ef
-# always true and this configuration setting is ignored.
David Zeuthen 62183ef
-#AlwaysRestartServer=false
David Zeuthen 62183ef
+# Whether to restart X server after the user logs out or not.
David Zeuthen 62183ef
+AlwaysRestartServer=true
David Zeuthen 62183ef
 
David Zeuthen 62183ef
 # User and group used for running GDM GUI applicaitons.  By default this is set
David Zeuthen 62183ef
 # to user "gdm" and group "gdm".  This user/group should have very limited
David Zeuthen 62183ef
@@ -125,22 +123,21 @@
David Zeuthen 62183ef
 XKeepsCrashing=@gdmconfdir@/XKeepsCrashing
David Zeuthen 62183ef
 # Reboot, Halt and suspend commands, you can add different commands separated
David Zeuthen 62183ef
 # by a semicolon.  GDM will use the first one it can find.
David Zeuthen 62183ef
-#RebootCommand=@REBOOT_COMMAND@
David Zeuthen 62183ef
-#HaltCommand=@HALT_COMMAND@
David Zeuthen 62183ef
-#SuspendCommand=@SUSPEND_COMMAND@
David Zeuthen 62183ef
+RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot
David Zeuthen 62183ef
+HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff
David Zeuthen 62183ef
 # Probably should not touch the below this is the standard setup.
David Zeuthen 62183ef
 ServAuthDir=@authdir@
David Zeuthen 62183ef
 # This is our standard startup script.  A bit different from a normal X
David Zeuthen 62183ef
 # session, but it shares a lot of stuff with that.  See the provided default
David Zeuthen 62183ef
 # for more information.
David Zeuthen 62183ef
-BaseXsession=@gdmconfdir@/Xsession
David Zeuthen 62183ef
+BaseXsession=/etc/X11/xinit/Xsession
David Zeuthen 62183ef
 # This is a directory where .desktop files describing the sessions live.  It is
David Zeuthen 62183ef
 # really a PATH style variable since 2.4.4.2 to allow actual interoperability
David Zeuthen 62183ef
 # with KDM.  Note that <dmconfdir>/Sessions is there for backwards
David Zeuthen 62183ef
 # compatibility reasons with 2.4.4.x.
David Zeuthen 62183ef
 #SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/
David Zeuthen 62183ef
 # This is the default .desktop session.  One of the ones in SessionDesktopDir
David Zeuthen 62183ef
-#DefaultSession=gnome.desktop
David Zeuthen 62183ef
+DefaultSession=default.desktop
David Zeuthen 62183ef
 # Better leave this blank and HOME will be used.  You can use syntax ~/ below
David Zeuthen 62183ef
 # to indicate home directory of the user.  You can also set this to something
David Zeuthen 62183ef
 # like /tmp if you don't want the authorizations to be in home directories.
David Zeuthen 62183ef
@@ -148,11 +145,11 @@
David Zeuthen 62183ef
 # is the home directory the UserAuthFBDir will still be used in case the home
David Zeuthen 62183ef
 # directory is NFS, see security/NeverPlaceCookiesOnNFS to override this
David Zeuthen 62183ef
 # behavior.
David Zeuthen 62183ef
-UserAuthDir=
David Zeuthen 62183ef
+UserAuthDir=/tmp
David Zeuthen 62183ef
 # Fallback directory for writing authorization file if user's home directory
David Zeuthen 62183ef
 # is not writable.
David Zeuthen 62183ef
 UserAuthFBDir=/tmp
David Zeuthen 62183ef
-UserAuthFile=.Xauthority
David Zeuthen 62183ef
+#UserAuthFile=.Xauthority
David Zeuthen 62183ef
 # The X server to use if we can't figure out what else to run.
David Zeuthen 62183ef
 StandardXServer=@X_SERVER@
David Zeuthen 62183ef
 # The maximum number of flexible X servers to run.
David Zeuthen 62183ef
@@ -173,7 +170,7 @@
David Zeuthen 62183ef
 #DoubleLoginWarning=true
David Zeuthen 62183ef
 # Should a second login always resume the current session and switch VT's on
David Zeuthen 62183ef
 # Linux and FreeBSD systems for console logins
David Zeuthen 62183ef
-#AlwaysLoginCurrentSession=true
David Zeuthen 62183ef
+AlwaysLoginCurrentSession=true
David Zeuthen 62183ef
 
David Zeuthen 62183ef
 # If true then the last login information is printed to the user before being
David Zeuthen 62183ef
 # prompted for password.  While this gives away some info on what users are on
David Zeuthen 62183ef
@@ -297,7 +294,7 @@
David Zeuthen 62183ef
 #GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
David Zeuthen 62183ef
 
David Zeuthen 62183ef
 # The GTK+ theme to use for the GUI.
David Zeuthen 62183ef
-#GtkTheme=Default
David Zeuthen 62183ef
+GtkTheme=Clearlooks
David Zeuthen 62183ef
 # If to allow changing the GTK+ (widget) theme from the greeter.  Currently
David Zeuthen 62183ef
 # this only affects the standard greeter as the graphical greeter does not yet
David Zeuthen 62183ef
 # have this ability.
David Zeuthen 62183ef
@@ -318,7 +315,7 @@
David Zeuthen 62183ef
 # themed login (gdmgreeter).
David Zeuthen 62183ef
 #
David Zeuthen 62183ef
 # The standard login has a title bar that the user can move.
David Zeuthen 62183ef
-#TitleBar=true
David Zeuthen 62183ef
+TitleBar=false
David Zeuthen 62183ef
 # Don't allow user to move the standard login window.  Only makes sense if
David Zeuthen 62183ef
 # TitleBar is on.
David Zeuthen 62183ef
 #LockPosition=false
David Zeuthen 62183ef
@@ -342,7 +339,7 @@
David Zeuthen 62183ef
 # User ID's less than the MinimalUID value will not be included in the face
David Zeuthen 62183ef
 # browser or in the gdmselection list for Automatic/Timed login.  They will not
David Zeuthen 62183ef
 # be displayed regardless of the settings for Include and Exclude.
David Zeuthen 62183ef
-#MinimalUID=100
David Zeuthen 62183ef
+MinimalUID=500
David Zeuthen 62183ef
 # Users listed in Include will be included in the face browser and in the
David Zeuthen 62183ef
 # gdmsetup selection list for Automatic/Timed login.  Users should be separated
David Zeuthen 62183ef
 # by commas.
David Zeuthen 62183ef
@@ -359,7 +356,7 @@
David Zeuthen 62183ef
 # large numbers of users and this feature should not be used in such
David Zeuthen 62183ef
 # environments.  The setting of IncludeAll does nothing if Include is set to a
David Zeuthen 62183ef
 # non-empty value.
David Zeuthen 62183ef
-#IncludeAll=false
David Zeuthen 62183ef
+IncludeAll=true
David Zeuthen 62183ef
 # If user or user.png exists in this dir it will be used as his picture.
David Zeuthen 62183ef
 #GlobalFaceDir=@datadir@/pixmaps/faces/
David Zeuthen 62183ef
 
David Zeuthen 62183ef
@@ -368,7 +365,7 @@
David Zeuthen 62183ef
 # file, although GDM will be able to read a standard locale.alias file as well.
David Zeuthen 62183ef
 #LocaleFile=@gdmlocaledir@/locale.alias
David Zeuthen 62183ef
 # Logo shown in the standard greeter.
David Zeuthen 62183ef
-#Logo=@pixmapdir@/gdm-foot-logo.png
David Zeuthen 62183ef
+Logo=
David Zeuthen 62183ef
 # Logo shown on file chooser button in gdmsetup (do not modify this value).
David Zeuthen 62183ef
 #ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png
David Zeuthen 62183ef
 # The standard greeter should shake if a user entered the wrong username or
David Zeuthen 62183ef
@@ -415,8 +412,9 @@
David Zeuthen 62183ef
 # The Standard greeter (gdmlogin) uses BackgroundColor as the background
David Zeuthen 62183ef
 # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor
David Zeuthen 62183ef
 # as the background color.
David Zeuthen 62183ef
-BackgroundColor=#76848F
David Zeuthen 62183ef
-GraphicalThemedColor=#76848F
David Zeuthen 62183ef
+BackgroundColor=#20305a
David Zeuthen 62183ef
+GraphicalThemedColor=#000000
David Zeuthen 62183ef
+
David Zeuthen 62183ef
 # XDMCP session should only get a color, this is the sanest setting since you
David Zeuthen 62183ef
 # don't want to take up too much bandwidth
David Zeuthen 62183ef
 #BackgroundRemoteOnlyColor=true
David Zeuthen 62183ef
@@ -437,8 +435,8 @@
David Zeuthen 62183ef
 # Show the Failsafe sessions.  These are much MUCH nicer (focus for xterm for
David Zeuthen 62183ef
 # example) and more failsafe then those supplied by scripts so distros should
David Zeuthen 62183ef
 # use this rather then just running an xterm from a script.
David Zeuthen 62183ef
-#ShowGnomeFailsafeSession=true
David Zeuthen 62183ef
-#ShowXtermFailsafeSession=true
David Zeuthen 62183ef
+ShowGnomeFailsafeSession=false
David Zeuthen 62183ef
+ShowXtermFailsafeSession=false
David Zeuthen 62183ef
 # Normally there is a session type called 'Last' that is shown which refers to
David Zeuthen 62183ef
 # the last session the user used.  If off, we will be in 'switchdesk' mode
David Zeuthen 62183ef
 # where the session saving stuff is disabled in GDM
David Zeuthen 62183ef
@@ -457,7 +455,7 @@
David Zeuthen 62183ef
 # list then provide a list that is delimited by /: to the GraphicalThemes
David Zeuthen 62183ef
 # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme
David Zeuthen 62183ef
 # and specify just one theme.
David Zeuthen 62183ef
-#GraphicalTheme=circles
David Zeuthen 62183ef
+GraphicalTheme=FedoraFlyingHigh
David Zeuthen 62183ef
 #GraphicalThemes=circles/:happygnome
David Zeuthen 62183ef
 GraphicalThemeDir=@datadir@/gdm/themes/
David Zeuthen 62183ef
 GraphicalThemeRand=false
David Zeuthen 62183ef
@@ -561,7 +559,7 @@
David Zeuthen 62183ef
 # Definition of the standard X server.
David Zeuthen 62183ef
 [server-Standard]
David Zeuthen 62183ef
 name=Standard server
David Zeuthen 62183ef
-command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@
David Zeuthen 62183ef
+command=@X_SERVER@ -br @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ 
David Zeuthen 62183ef
 flexible=true
David Zeuthen 62183ef
 # Indicates that the X server should be started at a different process
David Zeuthen 62183ef
 # priority.  Values can be any integer value accepted by the setpriority C