###############################################################################

#

# Copyright 2009 Sun Microsystems, Inc. All rights reserved.

# Use is subject to license terms.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the

# "Software"), to deal in the Software without restriction, including

# without limitation the rights to use, copy, modify, merge, publish,

# distribute, and/or sell copies of the Software, and to permit persons

# to whom the Software is furnished to do so, provided that the above

# copyright notice(s) and this permission notice appear in all copies of

# the Software and that both the above copyright notice(s) and this

# permission notice appear in supporting documentation.

#

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

#

# Except as contained in this notice, the name of a copyright holder

# shall not be used in advertising or otherwise to promote the sale, use

# or other dealings in this Software without prior written authorization

# of the copyright holder.

#

###############################################################################

Set default Xsession scripts/programs for Solaris/OpenSolaris.

diff -urp -x '*~' -x '*.orig' config/Xsession.cpp config/Xsession.cpp

--- config/Xsession.cpp 2009-09-17 19:24:37.000000000 -0700

+++ config/Xsession.cpp 2009-09-21 22:46:44.165111000 -0700

@@ -47,6 +47,14 @@ case $# in

esac

esac

+XCOMM Run system session script if present - these will do various setup,

+XCOMM then run $HOME/.xsession if it exists, so we can just run them

+if [[ -x /etc/X11/gdm/Xsession && -x /usr/bin/dtstart ]] ; then

+ exec /etc/X11/gdm/Xsession /usr/bin/dtstart jds

+elif [[ -x /usr/dt/config/Xsession.jds ]] ; then

+ exec /usr/dt/config/Xsession.jds

+fi

+

XCOMM The startup script is not intended to have arguments.

startup=$HOME/.xsession

@@ -80,5 +88,6 @@ else

exec `eval $XDESKTOP`

}

#endif

- exec BINDIR/xsm

+ BINDIR/xterm -geometry 80x24+10+10 -ls &

+ exec BINDIR/twm

fi