nautilus r13589 - in trunk: . src

[herzi svn gnome org]

Author: herzi
Date: Thu Jan 10 19:57:31 2008
New Revision: 13589
URL: http://svn.gnome.org/viewvc/nautilus?rev=13589&view=rev

Log:
2008-01-10  Sven Herzberg  <herzi gnome-de org>

	Don't check for unportable functions, fixes #396923

	Reviewed by Alex.

	* configure.in: don't check for unportable functions to modify the
	environment
	* src/nautilus-main.c: don't use putenv(), use g_unsetenv()


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/nautilus-main.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jan 10 19:57:31 2008
@@ -150,9 +150,6 @@
 			      
 dnl ==========================================================================
 
-AC_CHECK_FUNCS(setenv unsetenv putenv)
-
-dnl ==========================================================================
 AC_CHECK_FUNCS(statfs statvfs)
 AC_CHECK_HEADERS(sys/statfs.h sys/statvfs.h)
 

Modified: trunk/src/nautilus-main.c
==============================================================================
--- trunk/src/nautilus-main.c	(original)
+++ trunk/src/nautilus-main.c	Thu Jan 10 19:57:31 2008
@@ -429,7 +429,7 @@
 	if (startup_id != NULL && *startup_id != '\0') {
 		/* Clear the DESKTOP_STARTUP_ID, but make sure to copy it first */
 		startup_id_copy = g_strdup (startup_id);
-		putenv ("DESKTOP_STARTUP_ID=");
+		g_unsetenv ("DESKTOP_STARTUP_ID");
 	}
 
 	/* we'll do it ourselves due to complicated factory setup */