From ac0f62e694e67aa17fe8d08c707dc0b23f5456d8 Mon Sep 17 00:00:00 2001
From: Antoine Martin <totaam@xpra.org>
Date: Wed, 24 Feb 2016 04:38:48 +0000
Subject: [PATCH] #1104: fixup dbus env save and restore

git-svn-id: https://xpra.org/svn/Xpra/trunk@12027 3bb7dfac-3a0b-4e04-842a-767bc560f471
---
 src/xpra/scripts/server.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/xpra/scripts/server.py b/src/xpra/scripts/server.py
index 48aef51e35..78021ea483 100644
--- a/src/xpra/scripts/server.py
+++ b/src/xpra/scripts/server.py
@@ -102,11 +102,11 @@ def get_dbus_pid():
 
 def get_dbus_env():
     env = {}
-    for k,load in (
+    for n,load in (
             ("ADDRESS",     _get_str),
             ("PID",         _get_int),
             ("WINDOW_ID",   _get_int)):
-        k = "DBUS_SESSION_BUS_%s" % x
+        k = "DBUS_SESSION_BUS_%s" % n
         try:
             v = load(k)
             if v:
@@ -119,11 +119,11 @@ def save_dbus_env(env):
     #DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-B8CDeWmam9,guid=b77f682bd8b57a5cc02f870556cbe9e9
     #DBUS_SESSION_BUS_PID=11406
     #DBUS_SESSION_BUS_WINDOWID=50331649
-    for k,conv,save in (
+    for n,conv,save in (
             ("ADDRESS",     str,    _save_str),
             ("PID",         int,    _save_int),
             ("WINDOW_ID",   int,    _save_int)):
-        k = "DBUS_SESSION_BUS_%s" % k
+        k = "DBUS_SESSION_BUS_%s" % n
         v = env.get(k)
         if v is None:
             continue