[GRASS-SVN] r47138 - grass/trunk/lib/display

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-07-17 08:19:12 -0700 (Sun, 17 Jul 2011)
New Revision: 47138

Modified:
   grass/trunk/lib/display/r_raster.c
Log:
revert r47081 - GRASS_* variables are treated as system env variables


Modified: grass/trunk/lib/display/r_raster.c
===================================================================
--- grass/trunk/lib/display/r_raster.c	2011-07-16 13:20:45 UTC (rev 47137)
+++ grass/trunk/lib/display/r_raster.c	2011-07-17 15:19:12 UTC (rev 47138)
@@ -82,7 +82,7 @@
 	if (G_number_of_tokens(token) != 2)
 	    continue;
 	G_debug(3, "\tread_env_file(): %s=%s", token[0], token[1]);
-	G_setenv(token[0], token[1]);
+	setenv(token[0], token[1], 1);
 	G_free_tokens(token);
 	token = NULL;
     }
@@ -124,9 +124,9 @@
 	
 	if (v) {
 	    if (p && G_strcasecmp(p, "ps") == 0)
-		G_setenv("GRASS_PSFILE", v);
+		setenv("GRASS_PSFILE", v, 1);
 	    else
-		G_setenv("GRASS_PNGFILE", v);
+		setenv("GRASS_PNGFILE", v, 1);
 	}
 	
 	G_asprintf(&env, "MONITOR_%s_ENVFILE", m);