From 97982327f16d18c38f7ef8a80ed286ea58e734ad Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 2 Dec 2009 17:03:24 +0000
Subject: [PATCH] Forward XAUTHORITY variable to the plugin environment - this
 fixes a plugin issue in some cases on Unix

---
 direct/src/plugin/p3dAuthSession.cxx | 2 +-
 direct/src/plugin/p3dSession.cxx     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/direct/src/plugin/p3dAuthSession.cxx b/direct/src/plugin/p3dAuthSession.cxx
index cf0955700a..ee1c79e0d3 100644
--- a/direct/src/plugin/p3dAuthSession.cxx
+++ b/direct/src/plugin/p3dAuthSession.cxx
@@ -186,7 +186,7 @@ start_p3dcert() {
     "SYSTEMROOT", "USERPROFILE", "COMSPEC",
 #endif
 #ifdef HAVE_X11
-    "DISPLAY",
+    "DISPLAY", "XAUTHORITY",
 #endif
     NULL
   };
diff --git a/direct/src/plugin/p3dSession.cxx b/direct/src/plugin/p3dSession.cxx
index 6226140b15..5e87ed8952 100644
--- a/direct/src/plugin/p3dSession.cxx
+++ b/direct/src/plugin/p3dSession.cxx
@@ -863,7 +863,7 @@ start_p3dpython(P3DInstance *inst) {
       "SYSTEMROOT", "USERPROFILE", "COMSPEC",
 #endif
 #ifdef HAVE_X11
-      "DISPLAY",
+      "DISPLAY", "XAUTHORITY",
 #endif
       NULL
     };
@@ -956,7 +956,7 @@ start_p3dpython(P3DInstance *inst) {
   _env += "TEMP=";
   _env += inst_mgr->get_temp_directory();
   _env += '\0';
-    
+  
   // Define each package's root directory in an environment variable
   // named after the package, for the convenience of the packages in
   // setting up their config files.