gnome-shell r29 - trunk/scripts

[otaylor svn gnome org]

Author: otaylor
Date: Mon Nov  3 21:39:41 2008
New Revision: 29
URL: http://svn.gnome.org/viewvc/gnome-shell?rev=29&view=rev

Log:
Don't override XAUTHORITY until after we run Xephyr

Don't override the setting of XAUTHORITY when running Xephyr,
since then we may not be able to connect to the host display.
Instead pass in the local auth file via the -auth command
line argument.

An alternate fix would be to use 'xauth merge' to merge the
existing XAUTHORITY file into our local file.


Modified:
   trunk/scripts/start-in-Xephyr

Modified: trunk/scripts/start-in-Xephyr
==============================================================================
--- trunk/scripts/start-in-Xephyr	(original)
+++ trunk/scripts/start-in-Xephyr	Mon Nov  3 21:39:41 2008
@@ -29,14 +29,19 @@
     hexkey = "".join(("%02x" % ord(byte) for byte in key))
 
     # Store that in an xauthority file as the key for connecting to our Xephyr
-    os.environ['XAUTHORITY'] = xauth_file
-    retcode = subprocess.call(["xauth", "add", display,  "MIT-MAGIC-COOKIE-1", hexkey])
+    retcode = subprocess.call(["xauth",
+                               "-f", xauth_file,
+                               "add", display,  "MIT-MAGIC-COOKIE-1", hexkey])
     if retcode != 0:
         raise RuntimeError("xauth failed")
 
     # Launch Xephyr
-    xephyr = subprocess.Popen(["Xephyr", display, "-screen", "800x600", "-host-cursor"])
+    xephyr = subprocess.Popen(["Xephyr", display,
+                               "-auth", xauth_file,
+                               "-screen", "800x600",
+                               "-host-cursor"])
     os.environ['DISPLAY'] = display
+    os.environ['XAUTHORITY'] = xauth_file
 
     # Wait for server to get going: LAME
     time.sleep(1)