From ca2f106ca8a8e501e02ec34ca1712ca6a2736f2d Mon Sep 17 00:00:00 2001
From: Ryan Thompson <darwinawdwinner@gmail.com>
Date: Wed, 15 Feb 2012 13:26:04 -0800
Subject: [PATCH] Update more environment variables

The following variables are now updated when reconnecting to
screen/tmux:

XDG_SESSION_COOKIE
XDG_SESSION_PATH
GNOME_KEYRING_CONTROL
GNOME_KEYRING_PID
GPG_AGENT_INFO
SSH_AUTH_SOCK
SSH_AGENT_PID
---
 usr/bin/byobu-reconnect-sockets | 3 ++-
 usr/bin/byobu-select-session    | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/bin/byobu-reconnect-sockets b/usr/bin/byobu-reconnect-sockets
index d32d263e..8e2771e7 100755
--- a/usr/bin/byobu-reconnect-sockets
+++ b/usr/bin/byobu-reconnect-sockets
@@ -81,7 +81,8 @@ tmux_update () {
 }
 
 # Pull environment variables/values from backend and update/export here
-VARS_TO_UPDATE="DISPLAY DBUS_SESSION_BUS_ADDRESS SESSION_MANAGER GPG_AGENT_INFO"
+VARS_TO_UPDATE="DISPLAY DBUS_SESSION_BUS_ADDRESS SESSION_MANAGER GPG_AGENT_INFO XDG_SESSION_COOKIE XDG_SESSION_PATH GNOME_KEYRING_CONTROL GNOME_KEYRING_PID GPG_AGENT_INFO SSH_AUTH_SOCK SSH_AGENT_PID"
+
 case $BYOBU_BACKEND in
 	tmux)
 		tmux_update
diff --git a/usr/bin/byobu-select-session b/usr/bin/byobu-select-session
index 7b8ba6cb..17ad25cc 100755
--- a/usr/bin/byobu-select-session
+++ b/usr/bin/byobu-select-session
@@ -31,7 +31,9 @@ choice = ""
 sessions = []
 text = []
 
-BYOBU_UPDATE_ENVVARS=["DISPLAY", "DBUS_SESSION_BUS_ADDRESS", "SESSION_MANAGER", "GPG_AGENT_INFO"]
+BYOBU_UPDATE_ENVVARS=["DISPLAY", "DBUS_SESSION_BUS_ADDRESS", "SESSION_MANAGER", "GPG_AGENT_INFO",
+                      "XDG_SESSION_COOKIE", "XDG_SESSION_PATH", "GNOME_KEYRING_CONTROL",
+                      "GNOME_KEYRING_PID", "GPG_AGENT_INFO", "SSH_AUTH_SOCK", "SSH_AGENT_PID"]
 
 def get_sessions():
 	sessions = []