Attachment 275211 Details for Bug 320201 – xorg-x11-init-seahorse.patch

[patch] xorg-x11-init-seahorse.patch

xorg-x11-init-seahorse.patch (text/plain), 3.02 KB, created by Matt Domsch on 2007-12-03 02:23:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Domsch

Created: 2007-12-03 02:23:10 UTC

Size: 3.02 KB

patch

obsolete

>Index: Xsession
>===================================================================
>RCS file: /cvs/extras/rpms/xorg-x11-xinit/devel/Xsession,v
>retrieving revision 1.8
>diff -u -b -B -u -r1.8 Xsession
>--- Xsession	23 Oct 2007 18:46:49 -0000	1.8
>+++ Xsession	3 Dec 2007 02:10:40 -0000
>@@ -40,7 +40,7 @@
> # this script. 
> XCLIENTS_D=/etc/X11/xinit/Xclients.d
> if [ -d "$XCLIENTS_D" -a "$#" -eq 1 -a -x "$XCLIENTS_D/Xclients.$1.sh" ]; then
>-    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $XCLIENTS_D/Xclients.$1.sh"
>+    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $SEAHORSE_AGENT $XCLIENTS_D/Xclients.$1.sh"
> else
> # now, we see if xdm/gdm/kdm has asked for a specific environment
> case $# in
>@@ -54,11 +54,11 @@
> 	    exec -l $SHELL -c "xterm -geometry 80x24-0-0"
> 	    ;;
> 	gnome)
>-	    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH gnome-session"
>-	    exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH gnome-session\"" 
>+	    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $SEAHORSE_AGENT gnome-session"
>+	    exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH $SEAHORSE_AGENT gnome-session\"" 
> 	    ;;
> 	kde|kde1|kde2)
>-	    exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH startkde\""
>+	    exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH $SEAHORSE_AGENT startkde\""
> 	    ;;
> 	twm)
>         # fall back to twm
>@@ -69,7 +69,7 @@
>        # provides 'failsafe', 'default' or 'custom'.  KDM will do the
>        # same at some point
> 	    if [ "$1" != "default" -a "$1" != "custom" ]; then
>-		exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH $1\""
>+		exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH $SEAHORSE_AGENT $1\""
> 	    fi
> 	    ;;
>     esac
>@@ -78,11 +78,11 @@
> 
> # otherwise, take default action
> if [ -x "$HOME/.xsession" ]; then
>-    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $HOME/.xsession"
>+    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $SEAHORSE_AGENT $HOME/.xsession"
> elif [ -x "$HOME/.Xclients" ]; then
>-    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients"
>+    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $SEAHORSE_AGENT $HOME/.Xclients"
> elif [ -x /etc/X11/xinit/Xclients ]; then
>-    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients"
>+    exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $SEAHORSE_AGENT /etc/X11/xinit/Xclients"
> else
>     # should never get here; failsafe fallback
>     exec -l $SHELL -c "xsm"
>Index: xinitrc-common
>===================================================================
>RCS file: /cvs/extras/rpms/xorg-x11-xinit/devel/xinitrc-common,v
>retrieving revision 1.3
>diff -u -b -B -u -r1.3 xinitrc-common
>--- xinitrc-common	12 Oct 2007 18:27:29 -0000	1.3
>+++ xinitrc-common	3 Dec 2007 02:10:40 -0000
>@@ -71,5 +71,8 @@
> DBUS_LAUNCH=
> [ -x /usr/bin/dbus-launch -a -z "$DBUS_SESSION_BUS_ADDRESS" ] && DBUS_LAUNCH="/usr/bin/dbus-launch --exit-with-session"
> 
>+SEAHORSE_AGENT=
>+[ -x /usr/bin/seahorse-agent ] && SEAHORSE_AGENT="/usr/bin/seahorse-agent --execute"
>+
> CK_XINIT_SESSION=
> [ -x /usr/bin/ck-xinit-session ] && CK_XINIT_SESSION="/usr/bin/ck-xinit-session"

Actions: View | Diff

Attachments on bug 320201: 275211