vte r2051 - in trunk: . src

[cpwilson svn gnome org]

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

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

    * src/pty.c (merge_environ): Fix bug in patch to use g_listenv()
    as it only returns the variable name and we need to use g_getenv()
    to retrieve its value.



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:46:29 2008
@@ -278,12 +278,11 @@
 	parent_environ = g_listenv ();
 	for (i = 0; parent_environ[i] != NULL; i++) {
 		gchar *name = g_strdup (parent_environ[i]);
-		gchar *value = strchr (name, '=');
-		if (value) {
-			*value = '\0';
-			value = g_strdup (value + 1);
+		const gchar *value = g_getenv (name);
+		if (value != NULL) {
+			value = g_strdup (value);
 		}
-		g_hash_table_replace (table, name, value);
+		g_hash_table_replace (table, name, (gchar *) value);
 	}
 	g_strfreev (parent_environ);