diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-05-11 08:27:17 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-05-11 08:27:17 +0000 |
| commit | e5748b057a01d39a017c81d0a9b3ac9ed979965c (patch) | |
| tree | 40defc6905037b445bc52b66af923a24679a2237 | |
| parent | 3052f0a3b0fc256e95fd5802481d62c3dd184a8b (diff) | |
| download | gdm-e5748b057a01d39a017c81d0a9b3ac9ed979965c.tar.gz | |
Remove failsafe logic since it is no longer used. The gnome-session-start
2007-05-11 Brian Cameron <brian.cameron@sun.com>
* config/Xsession.in: Remove failsafe logic since it is
no longer used. The gnome-session-start function in slave.c
starts the xterm directly. But when that change was made,
this cruft was not removed.
svn path=/trunk/; revision=4914
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | config/Xsession.in | 15 |
2 files changed, 7 insertions, 15 deletions
@@ -1,5 +1,12 @@ 2007-05-11 Brian Cameron <brian.cameron@sun.com> + * config/Xsession.in: Remove failsafe logic since it is + no longer used. The gnome-session-start function in slave.c + starts the xterm directly. But when that change was made, + this cruft was not removed. + +2007-05-11 Brian Cameron <brian.cameron@sun.com> + * acconfig.h, configure.ac, daemon/slave.c, gui/modules/keymouselistener.c, gui/modules/dwellmouselistener.c: Add ctrun support which diff --git a/config/Xsession.in b/config/Xsession.in index 89f88937..b14eb046 100755 --- a/config/Xsession.in +++ b/config/Xsession.in @@ -3,7 +3,6 @@ # This is SORT OF LIKE an X session, but not quite. You get a command as the # first argument (it could be multiple words, so run it with "eval"). As a # special case, the command can be: -# failsafe - Run an xterm only # default - Run the appropriate Xclients startup (see the code below) # custom - Run ~/.xsession and if that's not available run 'default' # @@ -26,10 +25,6 @@ command="$@" -if [ -z "$command" ] ; then - command=failsafe -fi - # this will go into the .xsession-errors along with all other echo's # good for debugging where things went wrong echo "$0: Beginning session setup..." @@ -77,16 +72,6 @@ gdmwhich () { zenity=`gdmwhich zenity` -if [ x"$command" = xfailsafe ] ; then - if [ -n "$zenity" ] ; then - disptext=`gettextfunc "This is 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."` - "$zenity" --info --text "$disptext" - else - echo "$0: Starting the failsafe xterm session." - fi - exec xterm -geometry 80x24+0+0 -fi - # Note: ~/.xsession-errors is now done in the daemon so that it # works for ALL sessions (except ones named 'Failsafe') |