r15712 - in /desktop/unstable/seahorse/debian: changelog seahorse.Xsession

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Apr 20 14:09:41 2008
New Revision: 15712

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15712
Log:
seahorse.Xsession: only start seahorse-agent for GNOME sessions. 
Closes: #443115.

Modified:
    desktop/unstable/seahorse/debian/changelog
    desktop/unstable/seahorse/debian/seahorse.Xsession

Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=15712&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Sun Apr 20 14:09:41 2008
@@ -1,3 +1,10 @@
+seahorse (2.22.1-2) UNRELEASED; urgency=low
+
+  * seahorse.Xsession: only start seahorse-agent for GNOME sessions. 
+    Closes: #443115.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 20 Apr 2008 16:08:25 +0200
+
 seahorse (2.22.1-1) unstable; urgency=high
 
   * New upstream bugfix release:

Modified: desktop/unstable/seahorse/debian/seahorse.Xsession
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/seahorse.Xsession?rev=15712&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/seahorse.Xsession (original)
+++ desktop/unstable/seahorse/debian/seahorse.Xsession Sun Apr 20 14:09:41 2008
@@ -2,7 +2,7 @@
 
 SEAHORSE=/usr/bin/seahorse-agent
 
-if [ -x $SEAHORSE ]; then
+if [ -n "$GNOMERC" ] && [ -x $SEAHORSE ]; then
 	STARTUP="$SEAHORSE --execute $STARTUP"
 fi