diff options
author | Brian Cameron <brian.cameron@sun.com> | 2006-02-13 18:47:21 +0000 |
---|---|---|
committer | Brian Cameron <bcameron@src.gnome.org> | 2006-02-13 18:47:21 +0000 |
commit | 8632e2a5670d280c153a43b3b0b522f8c5369815 (patch) | |
tree | 58aa800f6ae833d2ca1b28e27a8ffb036365ce25 /config | |
parent | 90113edce31c7024c0ce17bf3c9e197626621d94 (diff) | |
download | gdm-8632e2a5670d280c153a43b3b0b522f8c5369815.tar.gz |
Fix calls to zenity so they work. Fixes bug #330892. Last minute updates
2006-02-13 Brian Cameron <brian.cameron@sun.com>
* config/Xsession.in: Fix calls to zenity so they work. Fixes
bug #330892.
* README, README.install, docs/C/gdm.xml: Last minute updates
before string freeze.
Diffstat (limited to 'config')
-rwxr-xr-x | config/Xsession.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/Xsession.in b/config/Xsession.in index db0e6310..4b7cb5f9 100755 --- a/config/Xsession.in +++ b/config/Xsession.in @@ -79,7 +79,8 @@ zenity=`gdmwhich zenity` if [ x"$command" = xfailsafe ] ; then if [ -n "$zenity" ] ; then - "$zenity" --info --text `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 in the upper left corner"` + 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 in the upper left corner"` + "$zenity" --info --text "$disptext" else echo "$0: Starting the failsafe xterm session." fi @@ -239,7 +240,8 @@ eval exec $command echo "$0: Executing $command failed, will run xterm" if [ -n "$zenity" ] ; then - "$zenity" --info --text `gettextfunc "Failed to start the session, so starting a failsafe xterm session. Windows will have focus only if the mouse pointer is above them. To get out of this mode type 'exit' in the window in the upper left corner"` + disptext=`gettextfunc "Failed to start the session, so starting a failsafe xterm session. Windows will have focus only if the mouse pointer is above them. To get out of this mode type 'exit' in the window in the upper left corner"` + "$zenity" --info --text "$disptext" fi exec xterm -geometry 80x24+0+0 |