Call sessionexit script if running on Solaris. Now set Exec/TryExec to

2006-02-13  Brian Cameron  <brian.cameron@sun.com>

        * config/PostSession.in: Call sessionexit script if
          running on Solaris.
        * configure.ac, config/gnome.desktop.in.in: Now set
          Exec/TryExec to /usr/dt/config/Xsession.jds for
          Solaris.
        * po/POTFILES.in, po/POTFILES.skip: Update to reflect
          the move of gnome.desktop.in to gnome.desktop.in.in.

svn path=/trunk/; revision=4589

7 files changed, 31 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 531de746..7956f359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
-2006-01-21  Brian Cameron  <brian.cameron@sun.com>
+2006-02-13  Brian Cameron  <brian.cameron@sun.com>
+
+	* config/PostSession.in: Call sessionexit script if
+	  running on Solaris.
+	* configure.ac, config/gnome.desktop.in.in: Now set
+	  Exec/TryExec to /usr/dt/config/Xsession.jds for
+	  Solaris.
+	* po/POTFILES.in, po/POTFILES.skip: Update to reflect
+	  the move of gnome.desktop.in to gnome.desktop.in.in.
+
+2006-02-12  Brian Cameron  <brian.cameron@sun.com>
 
         * Release 2.17.7:
         * configure.ac: Update to new release version.
diff --git a/config/Makefile.am b/config/Makefile.am
index d3f8c960..06964914 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST = \
 	gdm.conf-custom \
 	$(DESKTOP_FILES) \
 	default.desktop.in \
-	gnome.desktop.in \
+	gnome.desktop.in.in \
 	CDE.desktop.in \
 	ssh.desktop.in.in \
 	Xsession.in \
diff --git a/config/PostSession.in b/config/PostSession.in
index f21aa848..b8667431 100755
--- a/config/PostSession.in
+++ b/config/PostSession.in
@@ -23,4 +23,14 @@ SESSREG=`gdmwhich sessreg`
 if [ "x$SESSREG" != "x" ] ; then
 	"$SESSREG" -d -w /var/log/wtmp -u /var/run/utmp -x "$X_SERVERS" -h "$REMOTE_HOST" -l "$DISPLAY" "$USER"
 fi
+
+# If running on Solaris, run sessionexit script.
+#
+if [ -x "/etc/dt/config/sessionexit" ]; then
+	/etc/dt/config/sessionexit
+fi
+if [ -x "/usr/dt/config/sessionexit" ]; then
+	/usr/dt/config/sessionexit
+fi
+
 exit 0
diff --git a/config/gnome.desktop.in b/config/gnome.desktop.in.in
index fae6f152..a522fb45 100644
--- a/config/gnome.desktop.in
+++ b/config/gnome.desktop.in.in
@@ -2,8 +2,8 @@
 Encoding=UTF-8
 _Name=GNOME
 _Comment=This session logs you into GNOME
-Exec=gnome-session
-TryExec=gnome-session
+Exec=@GDMGNOMESESSIONCMD@
+TryExec=@GDMGNOMESESSIONCMD@
 # no icon yet, only the top three are currently used
 Icon=
 Type=Application
diff --git a/configure.ac b/configure.ac
index 4abdba37..dac14c94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -977,6 +977,7 @@ case "$host" in
         SUSPEND_COMMAND="/usr/openwin/bin/sys-suspend -n"
         XSESSION_SHELL=/bin/ksh
         SOUND_PROGRAM=/usr/bin/audioplay
+        GDMGNOMESESSIONCMD=/usr/dt/config/Xsession.jds
         ;;
 *freebsd*)
 	GDM_USER_PATH="/bin:/usr/bin"
@@ -985,6 +986,7 @@ case "$host" in
 	SUSPEND_COMMAND="/usr/sbin/zzz"
 	XSESSION_SHELL=/bin/sh
 	SOUND_PROGRAM=
+        GDMGNOMESESSIONCMD=gnome-session
 	;;
 *)
         GDM_USER_PATH="/bin:/usr/bin"
@@ -993,6 +995,7 @@ case "$host" in
         SUSPEND_COMMAND=""
         XSESSION_SHELL=/bin/sh
         SOUND_PROGRAM=/usr/bin/play
+        GDMGNOMESESSIONCMD=gnome-session
         ;;
 esac
 
@@ -1097,6 +1100,7 @@ AC_DEFINE_UNQUOTED(XSESSION_SHELL,"$XSESSION_SHELL")
 AC_SUBST(GDM_USER_PATH)
 AC_SUBST(SOUND_PROGRAM)
 AC_DEFINE_UNQUOTED(SOUND_PROGRAM,"$SOUND_PROGRAM")
+AC_SUBST(GDMGNOMESESSIONCMD)
 
 AC_SUBST(X_PATH)
 AC_SUBST(X_SERVER)
@@ -1153,6 +1157,7 @@ config/Init
 config/PreSession
 config/PostSession
 config/gdmprefetchlist
+config/gnome.desktop.in
 config/ssh.desktop.in
 gdm-stop
 gdm-restart
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7b88fe7b..70d5af2a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
 # Please keep this file in alphabetical order.
 config/CDE.desktop.in
 config/default.desktop.in
-config/gnome.desktop.in
+config/gnome.desktop.in.in
 config/ssh.desktop.in.in
 config/gettextfoo.h
 daemon/auth.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index b01e53a0..643541a0 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,5 @@
 # Files with translatable strings to skip.
 # Please keep this file in alphabetical order.
+config/gnome.desktop.in
 config/ssh.desktop.in
 gui/gdmsetup.desktop.in