r19931 - in /desktop/unstable/seahorse-plugins/debian: changelog seahorse.Xsession

[lool at users.alioth.debian.org]

Author: lool
Date: Sun May 10 18:28:34 2009
New Revision: 19931

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19931
Log:
searhorse.Xsession: don't start seahorse-agent if $GPG_AGENT_INFO is set.

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

Modified: desktop/unstable/seahorse-plugins/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse-plugins/debian/changelog?rev=19931&op=diff
==============================================================================
--- desktop/unstable/seahorse-plugins/debian/changelog (original)
+++ desktop/unstable/seahorse-plugins/debian/changelog Sun May 10 18:28:34 2009
@@ -1,3 +1,9 @@
+seahorse-plugins (2.24.1-4) UNRELEASED; urgency=low
+
+  * searhorse.Xsession: don't start seahorse-agent if $GPG_AGENT_INFO is set.
+
+ -- Loic Minier <lool at dooz.org>  Sun, 10 May 2009 20:27:52 +0200
+
 seahorse-plugins (2.24.1-3) unstable; urgency=low
 
   * Upload to unstable.

Modified: desktop/unstable/seahorse-plugins/debian/seahorse.Xsession
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse-plugins/debian/seahorse.Xsession?rev=19931&op=diff
==============================================================================
--- desktop/unstable/seahorse-plugins/debian/seahorse.Xsession (original)
+++ desktop/unstable/seahorse-plugins/debian/seahorse.Xsession Sun May 10 18:28:34 2009
@@ -2,7 +2,7 @@
 
 SEAHORSE=/usr/bin/seahorse-agent
 
-if [ -n "$GNOMERC" ] && [ -x $SEAHORSE ]; then
+if [ -n "$GNOMERC" ] && [ -x $SEAHORSE ] && [ -z "$GPG_AGENT_INFO" ]; then
 	STARTUP="$SEAHORSE --execute $STARTUP"
 fi