Don't propagate GDK_NATIVE_WINDOWS to child processes

Generally you only need to work around bugs in one specific app, so we
don't want to affect the applications that application will start.
Thus we unset GDK_NATIVE_WINDOWS after reading it.

1 files changed, 7 insertions, 2 deletions

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 6b81cc7de2..5dd2fae952 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -206,8 +206,13 @@ gdk_pre_parse_libgtk_only (void)
   }
 #endif	/* G_ENABLE_DEBUG */
 
-  if (getenv("GDK_NATIVE_WINDOWS"))
-    _gdk_native_windows = TRUE;
+  if (getenv ("GDK_NATIVE_WINDOWS"))
+    {
+      _gdk_native_windows = TRUE;
+      /* Ensure that this is not propagated
+	 to spawned applications */
+      g_unsetenv ("GDK_NATIVE_WINDOWS");
+    }
 
   g_type_init ();