vte r2052 - in trunk: . src

[cpwilson svn gnome org]

Author: cpwilson
Date: Thu May 29 11:50:13 2008
New Revision: 2052
URL: http://svn.gnome.org/viewvc/vte?rev=2052&view=rev

Log:
2008-05-29  Chris Wilson  <chris chris-wilson co uk>

    * src/pty.c (merge_environ): Replace previous commit with the
    better patch by Christian Persch.



Modified:
   trunk/ChangeLog
   trunk/src/pty.c

Modified: trunk/src/pty.c
==============================================================================
--- trunk/src/pty.c	(original)
+++ trunk/src/pty.c	Thu May 29 11:50:13 2008
@@ -277,12 +277,9 @@
 
 	parent_environ = g_listenv ();
 	for (i = 0; parent_environ[i] != NULL; i++) {
-		gchar *name = g_strdup (parent_environ[i]);
-		const gchar *value = g_getenv (name);
-		if (value != NULL) {
-			value = g_strdup (value);
-		}
-		g_hash_table_replace (table, name, (gchar *) value);
+		g_hash_table_replace (table,
+			              g_strdup (parent_environ[i]),
+				      g_strdup (g_getenv (parent_environ[i])));
 	}
 	g_strfreev (parent_environ);