Changeset 23285 in vbox

Timestamp:

Sep 24, 2009 2:56:59 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

52775

Message:

pass the XAUTHORITY environment variable along with DISPLAY

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManage.cpp (modified) (1 diff)
• VirtualBox/src/VBoxSelectorWnd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -523 +523 @@
 #if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
         /* make sure the VM process will start on the same display as VBoxManage */
-        {
-            const char *display = RTEnvGet ("DISPLAY");
-            if (display)
-                env = Utf8StrFmt ("DISPLAY=%s", display);
-        }
+        Utf8Str str;
+        const char *pszDisplay = RTEnvGet("DISPLAY");
+        if (pszDisplay)
+            str.append(Utf8StrFmt("DISPLAY=%s\n", pszDisplay));
+        const char *pszXAuth = RTEnvGet("XAUTHORITY");
+        if (pszXAuth)
+            str.append(Utf8StrFmt("XAUTHORITY=%s\n", pszXAuth));
+        env = Bstr(str);
 #endif
         ComPtr<IProgress> progress;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -1004 +1004 @@
 #if defined (Q_WS_X11)
     /* make sure the VM process will start on the same display as the Selector */
-    {
-        const char *display = RTEnvGet ("DISPLAY");
-        if (display)
-            env.sprintf ("DISPLAY=%s", display);
-    }
+    const char *display = RTEnvGet ("DISPLAY");
+    if (display)
+        env.append(QString("DISPLAY=%1\n").arg(display));
+    const char *xauth = RTEnvGet ("XAUTHORITY");
+    if (xauth)
+        env.append(QString("XAUTHORITY=%1\n").arg(xauth));
 #endif