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

[Christian Persch <chpe src gnome org>]

commit c44effdcaafbd1de31a3591c89ae7fb4d371251d
Author: Christian Persch <chpe gnome org>
Date:   Sat May 25 18:00:36 2013 +0200

    screen: Don't merge the parent environment
    
    Since vte already does this, there is no point in doing it before as well.
    (cherry picked from commit e74c3e3fc9b330644a02ce2b7030defbb401a111)

 src/terminal-screen.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index b92471c..07de4cd 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -1210,13 +1210,6 @@ get_child_environment (TerminalScreen *screen,
 
   env_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 
-  /* First take the factory's environment */
-  env = g_listenv ();
-  for (i = 0; env[i]; ++i)
-    g_hash_table_insert (env_table, env[i], g_strdup (g_getenv (env[i])));
-  g_free (env); /* the strings themselves are now owned by the hash table */
-
-  /* and then merge the child environment, if any */
   env = priv->initial_env;
   if (env)
     {