[gnome-terminal/gnome-3-8] screen: Don't merge the parent environment

[Christian Persch <chpe src gnome org>]

commit 37f4772c08cc657dbb980820e9cee6dde5e583e2
Author: Christian Persch <chpe gnome org>
Date:   Sat May 25 18:03:30 2013 +0200

    screen: Don't merge the parent environment
    
    Make sure not to inherit the server's environment into the terminal child
    processes, but instead only the environment as passed from the client.
    (cherry picked from commit aaa515ee68e833437add3f4e30e79ed97f4f26d1)

 configure.ac          |    2 +-
 src/terminal-screen.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c4ce86d..93fda51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ case "$with_gtk" in
   3.0) GTK_API_VERSION=3.0
        GTK_REQUIRED=3.6.0
        VTE_PC_VERSION=-2.90
-       VTE_REQUIRED=0.34.0
+       VTE_REQUIRED=0.34.6
        ;;
 esac
 
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 07de4cd..66183dc 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -1381,7 +1381,8 @@ terminal_screen_do_exec (TerminalScreen *screen,
   GError *err = NULL;
   const char *working_dir;
   VtePtyFlags pty_flags = VTE_PTY_DEFAULT;
-  GSpawnFlags spawn_flags = G_SPAWN_SEARCH_PATH_FROM_ENVP;
+  GSpawnFlags spawn_flags = G_SPAWN_SEARCH_PATH_FROM_ENVP |
+                            VTE_SPAWN_NO_PARENT_ENVV;
   GPid pid;
   gboolean result = FALSE;