610ae56816
See http://library.gnome.org/misc/release-notes/2.24/ for the general release notes. On the FreeBSD front, this release introduces Fuse support in HAL, adds multi-CPU support to libgtop, WebKit updates, and fixes some long-standing seahorse and gnome-keyring bugs. The documentation updates to the website are forthcoming. This release features commits by adamw, ahze, kwm, mezz, and myself. It would not have been possible without are contributors and testers: Alexander Loginov Craig Butler [1] Dmitry Marakasov [6] Eric L. Chen Joseph S. Atkinson Kris Moore Lapo Luchini [7] Nikos Ntarmos Pawel Worach Romain Tartiere TAOKA Fumiyoshi [3] Yasuda Keisuke Zyl aZ [4] bf [2] [5] Florent Thoumie Peter Wemm pluknet PR: 125857 [1] 126993 [2] 130031 [3] 127399 [4] 127661 [5] 124302 [6] 129570 [7] 129936 123790
39 lines
1.3 KiB
Text
39 lines
1.3 KiB
Text
--- data/Xsession.in.orig 2008-05-12 20:25:54.000000000 -0400
|
|
+++ data/Xsession.in 2008-06-09 01:29:59.000000000 -0400
|
|
@@ -231,12 +231,31 @@ if [ "x$command" = "xdefault" ] ; then
|
|
fi
|
|
fi
|
|
|
|
+is_gnome=0
|
|
+if [ "x$command" = "xgnome-session" ]; then
|
|
+ is_gnome=1
|
|
+fi
|
|
+
|
|
+# add seahorse-agent if found
|
|
+if [ ${is_gnome} = 1 ]; then
|
|
+ seahorseagent="`gdmwhich seahorse-agent`"
|
|
+ if [ -n "$seahorseagent" ] && [ -x "$seahorseagent" ] && [ -z "$GPG_AGENT_INFO" ] ; then
|
|
+ command="dbus-launch --exit-with-session $seahorseagent --execute $command"
|
|
+ elif [ -z "$seahorseagent" ] ; then
|
|
+ echo "$0: seahorse-agent not found!"
|
|
+ fi
|
|
+fi
|
|
+
|
|
# add ssh-agent if found
|
|
-sshagent="`gdmwhich ssh-agent`"
|
|
-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
|
|
- command="$sshagent -- $command"
|
|
-elif [ -z "$sshagent" ] ; then
|
|
- echo "$0: ssh-agent not found!"
|
|
+# ssh-agent functionality is handled by gnome-keyring-daemon which is launched
|
|
+# from gnome-session
|
|
+if [ ${is_gnome} != 1 ]; then
|
|
+ sshagent="`gdmwhich ssh-agent`"
|
|
+ if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
|
|
+ command="$sshagent -- $command"
|
|
+ elif [ -z "$sshagent" ] ; then
|
|
+ echo "$0: ssh-agent not found!"
|
|
+ fi
|
|
fi
|
|
|
|
echo "$0: Setup done, will execute: $command"
|