Merge lp:~rct86/byobu/morevars into lp:byobu

[Ryan Thompson]

Fixes https://bugs.launchpad.net/byobu/+bug/924545

Add the following to the list of environment vars to update:

XDG_SESSION_COOKIE
XDG_SESSION_PATH
GNOME_KEYRING_CONTROL
GNOME_KEYRING_PID
GPG_AGENT_INFO
SSH_AUTH_SOCK
SSH_AGENT_PID

[Ryan Thompson (rct86)]

I just tested the code from this branch, and it does indeed solve the issue. The unlock button in gnome-control-center now works after restarting my X session and then starting gnome-control-center from inside byobu.

=== modified file 'usr/bin/byobu-reconnect-sockets'
--- usr/bin/byobu-reconnect-sockets	2012-01-31 12:07:58 +0000
+++ usr/bin/byobu-reconnect-sockets	2012-02-15 21:32:10 +0000
@@ -81,7 +81,8 @@
 }
 
 # 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

=== modified file 'usr/bin/byobu-select-session'
--- usr/bin/byobu-select-session	2012-01-28 18:59:55 +0000
+++ usr/bin/byobu-select-session	2012-02-15 21:32:10 +0000
@@ -31,7 +31,9 @@
 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 = []