[26078] in Source-Commits
/svn/athena r25379 - in trunk/debathena/debathena/dotfiles: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Aug 11 18:09:29 2011
Date: Thu, 11 Aug 2011 18:09:23 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201108112209.p7BM9NYT015979@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-08-11 18:09:23 -0400 (Thu, 11 Aug 2011)
New Revision: 25379
Modified:
trunk/debathena/debathena/dotfiles/bashrc
trunk/debathena/debathena/dotfiles/cshrc
trunk/debathena/debathena/dotfiles/debian/changelog
Log:
In dotfiles:
* Update logout alias for GNOME 3.0 (Trac: #1027)
Modified: trunk/debathena/debathena/dotfiles/bashrc
===================================================================
--- trunk/debathena/debathena/dotfiles/bashrc 2011-08-11 20:26:36 UTC (rev 25378)
+++ trunk/debathena/debathena/dotfiles/bashrc 2011-08-11 22:09:23 UTC (rev 25379)
@@ -106,7 +106,11 @@
# Set up standard bash shell initializations
if [ "${XSESSION+set}" = set ]; then
+ if [ -x /usr/bin/gnome-session-quit ]; then
+ logout () { gnome-session-quit --no-prompt; exit; } # logout for X
+ else
logout () { gnome-session-save --kill --silent; exit; } # logout for X
+ fi
fi
# aliases dealing with adding locker programs
Modified: trunk/debathena/debathena/dotfiles/cshrc
===================================================================
--- trunk/debathena/debathena/dotfiles/cshrc 2011-08-11 20:26:36 UTC (rev 25378)
+++ trunk/debathena/debathena/dotfiles/cshrc 2011-08-11 22:09:23 UTC (rev 25379)
@@ -148,7 +148,11 @@
# Set up standard C shell aliases
if ($?XSESSION) then
- alias logout 'exit && gnome-session-save --kill --silent' # logout for X
+ if ( -x /usr/bin/gnome-session-quit ) then
+ alias logout 'exit && gnome-session-quit --no-prompt' # logout for X
+ else
+ alias logout 'exit && gnome-session-save --kill --silent' # logout for X
+ endif
endif
# aliases dealing with subjects
Modified: trunk/debathena/debathena/dotfiles/debian/changelog
===================================================================
--- trunk/debathena/debathena/dotfiles/debian/changelog 2011-08-11 20:26:36 UTC (rev 25378)
+++ trunk/debathena/debathena/dotfiles/debian/changelog 2011-08-11 22:09:23 UTC (rev 25379)
@@ -1,3 +1,9 @@
+debathena-dotfiles (10.0.30-0debathena1) UNRELEASED; urgency=low
+
+ * Update logout alias for GNOME 3.0 (Trac: #1027)
+
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 11 Aug 2011 18:08:36 -0400
+
debathena-dotfiles (10.0.29-0debathena1) unstable; urgency=low
[ Geoffrey Thomas ]