--- trunk/kdebase-workspace/agent-startup.sh	2012/05/16 21:01:54	1782
+++ trunk/kdebase-workspace/agent-startup.sh	2013/01/03 15:21:57	2012
@@ -7,16 +7,12 @@
 # the environment variables set here are available
 # throughout the session.
 
-# Uncomment the following lines to start gpg-agent
-# and/or ssh-agent at kde startup.
-# If you do so, do not forget to uncomment the respective
-# lines in KDEDIR/shutdown/agent-shutdown.sh to
-# properly kill the agents when the session ends.
+if [ -x /usr/bin/gpg-agent ]
+then
+	eval "$(/usr/bin/gpg-agent --daemon)"
+fi
 
-#if [ -x /usr/bin/gpg-agent ]; then
-#	eval "$(/usr/bin/gpg-agent --daemon)"
-#fi
-
-#if [ -x /usr/bin/ssh-agent ]; then
-#	eval "$(/usr/bin/ssh-agent -s)"
-#fi
+if [ -x /usr/bin/ssh-agent ]
+then
+	eval "$(/usr/bin/ssh-agent -s)"
+fi