diff --speed-large-files --minimal -Nru glib-2.6.1.orig/glib/gconvert.c glib-2.6.1/glib/gconvert.c
--- glib-2.6.1.orig/glib/gconvert.c	2004-12-21 09:33:11.000000000 +1100
+++ glib-2.6.1/glib/gconvert.c	2005-01-24 13:55:11.983902960 +1100
@@ -1070,7 +1070,7 @@
       cache->charset = g_strdup (charset);
       
       p = getenv ("G_FILENAME_ENCODING");
-      if (p != NULL) 
+      if (p != NULL && p[0] != '\0') 
 	{
 	  cache->filename_charsets = g_strsplit (p, ",", 0);
 	  cache->is_utf8 = (strcmp (cache->filename_charsets[0], "UTF-8") == 0);
