|
5932
|
1 |
diff -urN gdm-2.5.90.2/config/gdm.conf.in gdm-2.5.90.2-hacked/config/gdm.conf.in
|
|
|
2 |
--- gdm-2.6.0.9/config/gdm.conf.in 2005-02-14 16:49:35.000000000 -0600
|
|
|
3 |
+++ ./gdm.conf.in 2005-05-16 14:37:06.933537000 -0500
|
|
6569
|
4 |
@@ -61,7 +61,7 @@ TimedLoginDelay=30
|
|
5932
|
5 |
|
|
|
6 |
# The greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to
|
|
|
7 |
# get the new graphical greeter.
|
|
|
8 |
-#Greeter=@EXPANDED_LIBEXECDIR@/gdmlogin
|
|
|
9 |
+Greeter=@EXPANDED_LIBEXECDIR@/gdmgreeter
|
|
|
10 |
|
|
|
11 |
# The greeter for xdmcp logins, usually you want a less graphically intensive
|
|
|
12 |
# greeter here so it's better to leave this with gdmlogin
|
|
6569
|
13 |
@@ -87,7 +87,7 @@ TimedLoginDelay=30
|
|
|
14 |
# If you are having trouble with using a single server for a long time and want
|
|
|
15 |
# GDM to kill/restart the server, turn this on. On Solaris, this value is
|
|
|
16 |
# always true and this configuration setting is ignored.
|
|
5932
|
17 |
-#AlwaysRestartServer=false
|
|
|
18 |
+AlwaysRestartServer=true
|
|
|
19 |
|
|
6569
|
20 |
# User and group used for running GDM GUI applicaitons. By default this is set
|
|
|
21 |
# to user "gdm" and group "gdm". This user/group should have very limited
|
|
|
22 |
@@ -220,7 +220,7 @@ CheckDirOwner=true
|
|
|
23 |
# Note: Anytime we find a -query or -indirect on the command line we do not add
|
|
|
24 |
# a "-nolisten tcp", as then the query just wouldn't work, so this setting only
|
|
|
25 |
# affects truly local sessions.
|
|
5932
|
26 |
-#DisallowTCP=true
|
|
|
27 |
+DisallowTCP=false
|
|
6569
|
28 |
# By default never place cookies if we "detect" NFS. We detect NFS by
|
|
|
29 |
# detecting "root-squashing". It seems bad practice to place cookies on things
|
|
|
30 |
# that go over the network by default and thus we not do it by default.
|
|
|
31 |
@@ -280,7 +280,7 @@ Enable=false
|
|
|
32 |
#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc
|
|
5932
|
33 |
|
|
6569
|
34 |
# The GTK+ theme to use for the GUI.
|
|
5932
|
35 |
-#GtkTheme=Default
|
|
|
36 |
+GtkTheme=blueprint
|
|
|
37 |
# If to allow changing the GTK+ (widget) theme from the greeter. Currently
|
|
6569
|
38 |
# this only affects the standard greeter as the graphical greeter does not yet
|
|
|
39 |
# have this ability
|
|
|
40 |
@@ -413,8 +413,8 @@ DefaultRemoteWelcome=true
|
|
|
41 |
# list that is delimited by /: to the GraphicalThemes key and set
|
|
|
42 |
# GraphicalThemeRand to true. Otherwise use GraphicalTheme and specify just
|
|
|
43 |
# one theme.
|
|
5932
|
44 |
-#GraphicalTheme=circles
|
|
|
45 |
-#GraphicalThemes=circles/:happygnome
|
|
6095
|
46 |
+GraphicalTheme=OpenSolaris-blueprint
|
|
|
47 |
+GraphicalThemes=OpenSolaris-blueprint/:circles/:happygnome
|
|
5932
|
48 |
GraphicalThemeDir=@EXPANDED_DATADIR@/gdm/themes/
|
|
|
49 |
GraphicalThemeRand=false
|
|
6569
|
50 |
GraphicalThemeColor=#76848F
|
|
5932
|
51 |
--- gdm-2.6.0.3/config/gnome.desktop.in.orig 2004-11-18 12:39:34.555987000 -0800
|
|
|
52 |
+++ gdm-2.6.0.3/config/gnome.desktop.in 2004-11-18 12:39:51.180069000 -0800
|
|
|
53 |
@@ -2,7 +2,7 @@
|
|
|
54 |
Encoding=UTF-8
|
|
|
55 |
-_Name=GNOME
|
|
|
56 |
-_Comment=This session logs you into GNOME
|
|
|
57 |
-Exec=gnome-session
|
|
6095
|
58 |
+_Name=Opensolaris GNOME Desktop
|
|
|
59 |
+_Comment=This session logs you into the Opensolaris GNOME Desktop
|
|
5932
|
60 |
+Exec=/usr/dt/config/Xsession.jds
|
|
|
61 |
TryExec=gnome-session
|
|
|
62 |
# no icon yet, only the top three are currently used
|
|
|
63 |
Icon=
|
|
|
64 |
--- gdm-2.6.0.3/config/Xsession.in-orig 2004-10-11 17:53:51.542102000 -0500
|
|
|
65 |
+++ gdm-2.6.0.3/config/Xsession.in 2004-10-11 17:55:17.353924000 -0500
|
|
|
66 |
@@ -81,7 +81,7 @@
|
|
|
67 |
else
|
|
|
68 |
echo "$0: Starting the failsafe xterm session."
|
|
|
69 |
fi
|
|
|
70 |
- exec xterm -geometry 80x24+0+0
|
|
|
71 |
+ exec ctrun -l child -i none xterm -geometry 80x24+0+0
|
|
|
72 |
fi
|
|
|
73 |
|
|
|
74 |
# Note: ~/.xsession-errors is now done in the daemon so that it
|
|
|
75 |
@@ -275,7 +275,7 @@
|
|
|
76 |
|
|
|
77 |
echo "$0: Setup done, will execute: $command"
|
|
|
78 |
|
|
|
79 |
-eval exec $command
|
|
|
80 |
+eval exec ctrun -l child -i none $command
|
|
|
81 |
|
|
|
82 |
echo "$0: Executing $command failed, will run xterm"
|
|
|
83 |
|
|
|
84 |
@@ -283,4 +283,4 @@
|
|
|
85 |
"$zenity" --info --text `gettextfunc "I could not start your session and so I have started the failsafe xterm session. Windows now have focus only if you have your cursor above them. To get out of this mode type 'exit' in the window in the upper left corner"`
|
|
|
86 |
fi
|
|
|
87 |
|
|
|
88 |
-exec xterm -geometry 80x24+0+0
|
|
|
89 |
+exec ctrun -l child -i none xterm -geometry 80x24+0+0
|
|
6444
|
90 |
--- gdm-2.6.0.9/configure.ac-orig 2005-05-16 16:41:22.715039000 -0500
|
|
|
91 |
+++ gdm-2.6.0.9/configure.ac 2005-05-16 16:42:01.126104000 -0500
|
|
5932
|
92 |
@@ -853,7 +853,7 @@ if test ! -h /usr/X11R6 -a -x /usr/X11R6
|
|
|
93 |
elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
|
|
|
94 |
X_PATH="/usr/X11/bin"
|
|
|
95 |
X_SERVER_PATH="/usr/X11/bin"
|
|
|
96 |
- X_SERVER="/usr/X11/bin/X"
|
|
|
97 |
+ X_SERVER="/usr/X11/bin/Xserver"
|
|
|
98 |
GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
|
|
|
99 |
X_CONFIG_OPTIONS="-audit 0"
|
|
|
100 |
elif test -x /usr/X11R6/bin/X; then
|
|
|
101 |
@@ -865,7 +865,7 @@ elif test -x /usr/X11R6/bin/X; then
|
|
|
102 |
elif test -x /usr/X11/bin/X; then
|
|
|
103 |
X_PATH="/usr/X11/bin"
|
|
|
104 |
X_SERVER_PATH="/usr/X11/bin"
|
|
|
105 |
- X_SERVER="/usr/X11/bin/X"
|
|
|
106 |
+ X_SERVER="/usr/X11/bin/X/Xserver"
|
|
|
107 |
GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
|
|
|
108 |
X_CONFIG_OPTIONS="-audit 0"
|
|
|
109 |
elif test -x /usr/openwin/bin/Xsun; then
|