diff options
author | Brian Cameron <brian.cameron@sun.com> | 2006-11-28 18:18:46 +0000 |
---|---|---|
committer | Brian Cameron <bcameron@src.gnome.org> | 2006-11-28 18:18:46 +0000 |
commit | 17ade3a370b40a3e2cf08665ee29b8fa4ea5c9f7 (patch) | |
tree | 4c77b580c889c71710a904b79289d4bd38951611 | |
parent | 5623e8d613d31e870dec3c10587658c2642543c2 (diff) | |
download | gdm-17ade3a370b40a3e2cf08665ee29b8fa4ea5c9f7.tar.gz |
Since the default.desktop file really just runs the Xclients script it
2006-11-28 Brian Cameron <brian.cameron@sun.com>
* config/Xsession.in config/default.desktop.in: Since the
default.desktop file really just runs the Xclients script
it should have a better name that specifies this is what
it does. Modify the default fallback program if no
Xclients file exists to xterm since xsm isn't on all
systems. This is a safer fallback.
-rw-r--r-- | ChangeLog | 10 | ||||
-rwxr-xr-x | config/Xsession.in | 3 | ||||
-rw-r--r-- | config/default.desktop.in | 4 |
3 files changed, 13 insertions, 4 deletions
@@ -1,5 +1,15 @@ 2006-11-28 Brian Cameron <brian.cameron@sun.com> + * config/Xsession.in config/default.desktop.in: Since the + default.desktop file really just runs the Xclients script + it should have a better name that specifies this is what + it does. Modify the default fallback program if no + Xclients file exists to xterm since xsm isn't on all + systems. This is a safer fallback. Patch by + Padraig <Padraig.OBriain@sun.com>, modified by myself. + +2006-11-28 Brian Cameron <brian.cameron@sun.com> + * gui/gdmsession.c: Fix for TryExec check in gdmsession.c so that it does not pass arguments into g_find_program_in_path since it causes it to say it is not executable if arguments diff --git a/config/Xsession.in b/config/Xsession.in index 604b86d2..5822ad49 100755 --- a/config/Xsession.in +++ b/config/Xsession.in @@ -220,8 +220,7 @@ if [ "x$command" = "xdefault" ] ; then command="/etc/X11/Xclients" else echo "$0: Cannot find Xclients" - # FIXME: kind of an evil failsafe - command="xsm" + command="xterm -geometry 80x24+0+0" fi fi diff --git a/config/default.desktop.in b/config/default.desktop.in index 5d15dd2c..8bed5b3d 100644 --- a/config/default.desktop.in +++ b/config/default.desktop.in @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 # The names/descriptions should really be better -_Name=Default System Session -_Comment=This is the default system session +_Name=Run Xclient script +_Comment=This session runs the Xclients script Exec=default # The "default" Exec is a very special one and is handled specially in # the Xsession script, you could also have "custom" which would just run |