summaryrefslogtreecommitdiffstats
path: root/x11/gdm2/files/patch-ab
blob: db8711ef357a56d2b112831a4fe6af54ce112fa0 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
--- config/gdm.conf.in.orig Fri Aug 23 13:59:57 2002
+++ config/gdm.conf.in  Sun Aug 25 13:57:05 2002
@@ -33,14 +33,14 @@
 # The gdm configuration program that is run from the login screen, you should
 # probably leave this alone
 Configurator=@EXPANDED_GDMCONFIGDIR@/gdmsetup --disable-sound --disable-crash-dialog
-GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session
+GnomeDefaultSession=@EXPANDED_DATADIR@/default.session
 # The chooser program.  Must output the chosen host on stdout, probably you
 # should leave this alone
 Chooser=@EXPANDED_BINDIR@/gdmchooser
 # Default path to set.  The profile scripts will likely override this
 DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
 # Default path for root.  The profile scripts will likely override this
-RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
+RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
 DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init
 # Greeter for local (non-xdmcp) logins.  Change gdmlogin to gdmgreeter to
 # get the new graphical greeter.
@@ -57,7 +57,7 @@
 # To try to kill all clients started at greeter time or in the Init script.
 # doesn't always work, only if those clients have a window of their own
 KillInitClients=true
-LogDir=@EXPANDED_AUTHDIR@
+LogDir=/var/log
 # You should probably never change this value unless you have a weird setup
 PidFile=/var/run/gdm.pid
 PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
@@ -84,11 +84,11 @@
 UserAuthFBDir=/tmp
 UserAuthFile=.Xauthority
 # The X server to use if we can't figure out what else to run.
-StandardXServer=/usr/X11R6/bin/X
+StandardXServer=@EXPANDED_BINDIR@/X
 # The maximum number of flexible X servers to run.
 FlexibleXServers=5
 # the X nest command
-Xnest=/usr/X11R6/bin/Xnest -name Xnest
+Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest
 # Automatic VT allocation.  Right now only works on Linux.  This way
 # we force X to use specific vts.  turn VTAllocation to false if this
 # is causing problems.
@@ -153,7 +153,7 @@
 # The 'theme'.  By default we're using the default gtk theme
 # Of course assuming that gtk got installed in the same prefix,
 # if not change this.
-GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc
+GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc
 # Maximum size of an icon, larger icons are scaled down
 MaxIconWidth=128
 MaxIconHeight=128
@@ -281,7 +281,7 @@
 # Definition of the standard X server.
 [server-Standard]
 name=Standard server
-command=/usr/X11R6/bin/X
+command=@EXPANDED_BINDIR@/X
 flexible=true
 
 # To use this server type you should add -query host or -indirect host
@@ -289,7 +289,7 @@
 [server-Terminal]
 name=Terminal server
 # Add -terminate to make things behave more nicely
-command=/usr/X11R6/bin/X -terminate
+command=@EXPANDED_BINDIR@/X -terminate
 # Make this not appear in the flexible servers (we need extra params
 # anyway, and terminate would be bad for xdmcp)
 flexible=false