|
7306
|
1 |
diff -ru ../gdm-2.14.6/config/Xsession.in gdm-2.14.6/config/Xsession.in
|
|
|
2 |
--- ../gdm-2.14.6/config/Xsession.in 2006-05-22 12:06:01.384065000 +0200
|
|
|
3 |
+++ gdm-2.14.6/config/Xsession.in 2006-05-22 12:12:16.800423000 +0200
|
|
|
4 |
@@ -84,7 +84,7 @@
|
|
|
5 |
else
|
|
|
6 |
echo "$0: Starting the failsafe xterm session."
|
|
|
7 |
fi
|
|
|
8 |
- exec xterm -geometry 80x24+0+0
|
|
|
9 |
+ exec ctrun -l child -i none xterm -geometry 80x24+0+0
|
|
|
10 |
fi
|
|
|
11 |
|
|
|
12 |
# Note: ~/.xsession-errors is now done in the daemon so that it
|
|
|
13 |
@@ -235,7 +235,7 @@
|
|
|
14 |
|
|
|
15 |
echo "$0: Setup done, will execute: $command"
|
|
|
16 |
|
|
|
17 |
-eval exec $command
|
|
|
18 |
+eval exec ctrun -l child -i none $command
|
|
|
19 |
|
|
|
20 |
echo "$0: Executing $command failed, will run xterm"
|
|
|
21 |
|
|
|
22 |
@@ -244,4 +244,4 @@
|
|
|
23 |
"$zenity" --info --text "$disptext"
|
|
|
24 |
fi
|
|
|
25 |
|
|
|
26 |
-exec xterm -geometry 80x24+0+0
|
|
|
27 |
+exec ctrun -l child -i none xterm -geometry 80x24+0+0
|
|
|
28 |
diff -ru ../gdm-2.14.6/config/gdm.conf.in gdm-2.14.6/config/gdm.conf.in
|
|
|
29 |
--- ../gdm-2.14.6/config/gdm.conf.in 2006-05-22 12:06:01.382431000 +0200
|
|
|
30 |
+++ gdm-2.14.6/config/gdm.conf.in 2006-05-22 12:14:35.005143000 +0200
|
|
|
31 |
@@ -61,7 +61,7 @@
|
|
|
32 |
|
|
|
33 |
# The greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to
|
|
|
34 |
# get the new graphical greeter.
|
|
|
35 |
-#Greeter=@libexecdir@/gdmlogin
|
|
|
36 |
+Greeter=@libexecdir@/gdmgreeter
|
|
|
37 |
|
|
|
38 |
# The greeter for xdmcp logins, usually you want a less graphically intensive
|
|
|
39 |
# greeter here so it's better to leave this with gdmlogin
|
|
|
40 |
@@ -87,7 +87,7 @@
|
|
|
41 |
# If you are having trouble with using a single server for a long time and want
|
|
|
42 |
# GDM to kill/restart the server, turn this on. On Solaris, this value is
|
|
|
43 |
# always true and this configuration setting is ignored.
|
|
|
44 |
-#AlwaysRestartServer=false
|
|
|
45 |
+AlwaysRestartServer=true
|
|
|
46 |
|
|
|
47 |
# User and group used for running GDM GUI applicaitons. By default this is set
|
|
|
48 |
# to user "gdm" and group "gdm". This user/group should have very limited
|
|
|
49 |
@@ -226,7 +226,7 @@
|
|
|
50 |
# Note: Anytime we find a -query or -indirect on the command line we do not add
|
|
|
51 |
# a "-nolisten tcp", as then the query just wouldn't work, so this setting only
|
|
|
52 |
# affects truly local sessions.
|
|
|
53 |
-#DisallowTCP=true
|
|
|
54 |
+DisallowTCP=false
|
|
|
55 |
# By default never place cookies if we "detect" NFS. We detect NFS by
|
|
|
56 |
# detecting "root-squashing". It seems bad practice to place cookies on things
|
|
|
57 |
# that go over the network by default and thus we do not do it by default.
|
|
|
58 |
@@ -288,7 +288,7 @@
|
|
|
59 |
#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
|
|
|
60 |
|
|
|
61 |
# The GTK+ theme to use for the GUI.
|
|
|
62 |
-#GtkTheme=Default
|
|
|
63 |
+GtkTheme=nimbus
|
|
|
64 |
# If to allow changing the GTK+ (widget) theme from the greeter. Currently
|
|
|
65 |
# this only affects the standard greeter as the graphical greeter does not yet
|
|
|
66 |
# have this ability.
|
|
|
67 |
@@ -370,7 +370,7 @@
|
|
|
68 |
# menu that contains reboot, shutdown, suspend, config and chooser. None of
|
|
|
69 |
# these is available if this is off. They can be turned off individually
|
|
|
70 |
# however.
|
|
|
71 |
-#SystemMenu=true
|
|
|
72 |
+SystemMenu=false
|
|
|
73 |
# Configuration is available from the system menu of the greeter.
|
|
|
74 |
#ConfigAvailable=false
|
|
|
75 |
# Should the chooser button be shown. If this is shown, GDM can drop into
|
|
|
76 |
@@ -406,8 +406,8 @@
|
|
|
77 |
# The Standard greeter (gdmlogin) uses BackgroundColor as the background
|
|
|
78 |
# color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor
|
|
|
79 |
# as the background color.
|
|
|
80 |
-BackgroundColor=#76848F
|
|
|
81 |
-GraphicalThemedColor=#76848F
|
|
|
82 |
+BackgroundColor=#35556b
|
|
|
83 |
+GraphicalThemedColor=#35556b
|
|
|
84 |
# XDMCP session should only get a color, this is the sanest setting since you
|
|
|
85 |
# don't want to take up too much bandwidth
|
|
|
86 |
#BackgroundRemoteOnlyColor=true
|
|
|
87 |
@@ -448,8 +448,8 @@
|
|
|
88 |
# list then provide a list that is delimited by /: to the GraphicalThemes
|
|
|
89 |
# key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme
|
|
|
90 |
# and specify just one theme.
|
|
|
91 |
-#GraphicalTheme=circles
|
|
|
92 |
-#GraphicalThemes=circles/:happygnome
|
|
|
93 |
+GraphicalTheme=Sun-Nimbus
|
|
|
94 |
+GraphicalThemes=Sun-Nimbus/:circles/:happygnome
|
|
|
95 |
GraphicalThemeDir=@datadir@/gdm/themes/
|
|
|
96 |
GraphicalThemeRand=false
|
|
|
97 |
|
|
|
98 |
diff -ru ../gdm-2.14.6/config/gnome.desktop.in gdm-2.14.6/config/gnome.desktop.in
|
|
|
99 |
--- ../gdm-2.14.6/config/gnome.desktop.in 2006-05-22 12:06:01.383674000 +0200
|
|
|
100 |
+++ gdm-2.14.6/config/gnome.desktop.in 2006-05-22 12:12:16.798993000 +0200
|
|
|
101 |
@@ -1,8 +1,8 @@
|
|
|
102 |
[Desktop Entry]
|
|
5932
|
103 |
Encoding=UTF-8
|
|
|
104 |
-_Name=GNOME
|
|
|
105 |
-_Comment=This session logs you into GNOME
|
|
|
106 |
-Exec=gnome-session
|
|
6095
|
107 |
+_Name=Opensolaris GNOME Desktop
|
|
|
108 |
+_Comment=This session logs you into the Opensolaris GNOME Desktop
|
|
5932
|
109 |
+Exec=/usr/dt/config/Xsession.jds
|
|
|
110 |
TryExec=gnome-session
|
|
|
111 |
# no icon yet, only the top three are currently used
|
|
|
112 |
Icon=
|
|
7306
|
113 |
diff -ru ../gdm-2.14.6/configure.ac gdm-2.14.6/configure.ac
|
|
|
114 |
--- ../gdm-2.14.6/configure.ac 2006-05-22 12:06:01.496662000 +0200
|
|
|
115 |
+++ gdm-2.14.6/configure.ac 2006-05-22 12:12:16.802731000 +0200
|
|
|
116 |
@@ -966,7 +966,7 @@
|
|
5932
|
117 |
elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
|
|
|
118 |
X_PATH="/usr/X11/bin"
|
|
|
119 |
X_SERVER_PATH="/usr/X11/bin"
|
|
|
120 |
- X_SERVER="/usr/X11/bin/X"
|
|
|
121 |
+ X_SERVER="/usr/X11/bin/Xserver"
|
|
|
122 |
GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
|
|
|
123 |
X_CONFIG_OPTIONS="-audit 0"
|
|
|
124 |
elif test -x /usr/X11R6/bin/X; then
|
|
7306
|
125 |
@@ -978,7 +978,7 @@
|
|
5932
|
126 |
elif test -x /usr/X11/bin/X; then
|
|
|
127 |
X_PATH="/usr/X11/bin"
|
|
|
128 |
X_SERVER_PATH="/usr/X11/bin"
|
|
|
129 |
- X_SERVER="/usr/X11/bin/X"
|
|
|
130 |
+ X_SERVER="/usr/X11/bin/X/Xserver"
|
|
|
131 |
GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
|
|
|
132 |
X_CONFIG_OPTIONS="-audit 0"
|
|
|
133 |
elif test -x /usr/openwin/bin/Xsun; then
|