[23865] in Source-Commits
/svn/athena r23475 - trunk/debathena/debathena/xsession/debian
daemon@ATHENA.MIT.EDU (Robert A Basch)
Tue Feb 24 19:33:57 2009
Date: Tue, 24 Feb 2009 19:33:49 -0500
From: Robert A Basch <rbasch@MIT.EDU>
Message-Id: <200902250033.n1P0XnSn018950@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: rbasch
Date: 2009-02-24 19:33:49 -0500 (Tue, 24 Feb 2009)
New Revision: 23475
Added:
trunk/debathena/debathena/xsession/debian/athena-initial-x-terminal.desktop
trunk/debathena/debathena/xsession/debian/initial-x-terminal
Modified:
trunk/debathena/debathena/xsession/debian/changelog
trunk/debathena/debathena/xsession/debian/debathena-xsession.install
trunk/debathena/debathena/xsession/debian/xsession.bash
trunk/debathena/debathena/xsession/debian/xsession.tcsh
Log:
In xsession:
* Use xdg's autostart facility to launch the initial gnome-terminal,
so that it properly belongs to the GNOME session.
Added: trunk/debathena/debathena/xsession/debian/athena-initial-x-terminal.desktop
===================================================================
--- trunk/debathena/debathena/xsession/debian/athena-initial-x-terminal.desktop 2009-02-24 23:24:55 UTC (rev 23474)
+++ trunk/debathena/debathena/xsession/debian/athena-initial-x-terminal.desktop 2009-02-25 00:33:49 UTC (rev 23475)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Initial X Terminal
+Comment=Athena Initial X Terminal Emulator
+Icon=gnome-terminal
+Exec=/usr/lib/init/initial-x-terminal
+Terminal=false
+Type=Application
Modified: trunk/debathena/debathena/xsession/debian/changelog
===================================================================
--- trunk/debathena/debathena/xsession/debian/changelog 2009-02-24 23:24:55 UTC (rev 23474)
+++ trunk/debathena/debathena/xsession/debian/changelog 2009-02-25 00:33:49 UTC (rev 23475)
@@ -1,3 +1,10 @@
+debathena-xsession (1.6) unstable; urgency=low
+
+ * Use xdg's autostart facility to launch the initial gnome-terminal,
+ so that it properly belongs to the GNOME session.
+
+ -- Robert Basch <rbasch@mit.edu> Tue, 24 Feb 2009 18:53:08 -0500
+
debathena-xsession (1.5) unstable; urgency=low
[ William D Cattey ]
Modified: trunk/debathena/debathena/xsession/debian/debathena-xsession.install
===================================================================
--- trunk/debathena/debathena/xsession/debian/debathena-xsession.install 2009-02-24 23:24:55 UTC (rev 23474)
+++ trunk/debathena/debathena/xsession/debian/debathena-xsession.install 2009-02-25 00:33:49 UTC (rev 23475)
@@ -1,7 +1,9 @@
debian/97debathena-homedir-mode etc/X11/Xsession.d
debian/98debathena-xsession etc/X11/Xsession.d
+debian/athena-initial-x-terminal.desktop etc/xdg/autostart
debian/displaylert usr/lib/init
debian/displaymotd usr/lib/init
+debian/initial-x-terminal usr/lib/init
debian/quotawarn usr/lib/init
debian/xsession.bash usr/lib/init
debian/xsession.tcsh usr/lib/init
Added: trunk/debathena/debathena/xsession/debian/initial-x-terminal
===================================================================
--- trunk/debathena/debathena/xsession/debian/initial-x-terminal 2009-02-24 23:24:55 UTC (rev 23474)
+++ trunk/debathena/debathena/xsession/debian/initial-x-terminal 2009-02-25 00:33:49 UTC (rev 23475)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ "${ATHENA_INITIAL_X_TERMINAL+set}" = set ]; then
+ gnome-terminal --geometry=80x40-0-0 >/dev/null 2>&1 &
+fi
+exit 0
Property changes on: trunk/debathena/debathena/xsession/debian/initial-x-terminal
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/debathena/debathena/xsession/debian/xsession.bash
===================================================================
--- trunk/debathena/debathena/xsession/debian/xsession.bash 2009-02-24 23:24:55 UTC (rev 23474)
+++ trunk/debathena/debathena/xsession/debian/xsession.bash 2009-02-25 00:33:49 UTC (rev 23475)
@@ -27,7 +27,7 @@
# "skip_initial_xterm=t" in your ~/.bash_environment file.
if [ "${skip_initial_xterm+set}" != set ]; then
- (gnome-terminal --geometry=80x40-0-0 >/dev/null 2>&1 &)
+ export ATHENA_INITIAL_X_TERMINAL=
fi
if [ "${skip_x_startup+set}" != set ]; then
Modified: trunk/debathena/debathena/xsession/debian/xsession.tcsh
===================================================================
--- trunk/debathena/debathena/xsession/debian/xsession.tcsh 2009-02-24 23:24:55 UTC (rev 23474)
+++ trunk/debathena/debathena/xsession/debian/xsession.tcsh 2009-02-25 00:33:49 UTC (rev 23475)
@@ -22,8 +22,7 @@
endif
if (! $?skip_initial_xterm) then
- if ($?verbose_login) echo "Creating initial xterm window..."
- (gnome-terminal --geometry=80x40-0-0 >& /dev/null &)
+ setenv ATHENA_INITIAL_X_TERMINAL
endif
if (! $?skip_x_startup) then
