--- gnome-libs-1.2.13/libgnome/gnomelib-init.c.config-dir-variable	Thu Feb 15 23:22:29 2001
+++ gnome-libs-1.2.13/libgnome/gnomelib-init.c	Thu Apr 18 19:18:23 2002
@@ -176,9 +176,23 @@
 	 * never freed - gnome_config currently uses this, and it's better
 	 * to figure it out once than to repeatedly get it
 	 */
-	gnome_user_dir = g_concat_dir_and_file (gnome_user_home_dir, ".gnome");
-	gnome_user_private_dir = g_concat_dir_and_file (gnome_user_home_dir,
-							".gnome_private");
+        if (g_getenv ("GNOME_CONFIG_DIR"))
+          {
+            char *str;
+            
+            gnome_user_dir = g_concat_dir_and_file (gnome_user_home_dir, g_getenv ("GNOME_CONFIG_DIR"));
+
+            str = g_strconcat (g_getenv ("GNOME_CONFIG_DIR"), "_private", NULL);
+            gnome_user_private_dir = g_concat_dir_and_file (gnome_user_home_dir, str);
+            g_free (str);
+          }
+        else
+          {
+            gnome_user_dir = g_concat_dir_and_file (gnome_user_home_dir, ".gnome");
+            gnome_user_private_dir = g_concat_dir_and_file (gnome_user_home_dir,
+                                                            ".gnome_private");
+          }
+        
 	gnome_user_accels_dir = g_concat_dir_and_file (gnome_user_dir, "accels");
 	create_user_gnome_directories ();
 
--- gnome-libs-1.2.13/libgnome/gnome-mime.c.config-dir-variable	Fri Mar 16 14:44:42 2001
+++ gnome-libs-1.2.13/libgnome/gnome-mime.c	Thu Apr 18 19:18:23 2002
@@ -290,7 +290,7 @@
 	gnome_mime_dir.dirname = gnome_unconditional_datadir_file ("mime-info");
 	gnome_mime_dir.system_dir = TRUE;
 
-	user_mime_dir.dirname  = g_concat_dir_and_file (gnome_util_user_home (), ".gnome/mime-info");
+        user_mime_dir.dirname  = gnome_util_home_file ("mime-info");
 	user_mime_dir.system_dir = FALSE;
 	mime_load (&gnome_mime_dir);
 	mime_load (&user_mime_dir);
--- gnome-libs-1.2.13/libgnome/gnome-mime-info.c.config-dir-variable	Wed Jul 12 15:03:13 2000
+++ gnome-libs-1.2.13/libgnome/gnome-mime-info.c	Thu Apr 18 19:18:23 2002
@@ -455,8 +455,8 @@
 	 */
 	gnome_mime_dir.dirname = gnome_unconditional_datadir_file ("mime-info");
 	gnome_mime_dir.system_dir = TRUE;
-	
-	user_mime_dir.dirname  = g_concat_dir_and_file (gnome_util_user_home (), ".gnome/mime-info");
+
+        user_mime_dir.dirname  = gnome_util_home_file ("mime-info");
 	user_mime_dir.system_dir = FALSE;
 
 	/*
--- gnome-libs-1.2.13/libgnome/gnome-util.c.config-dir-variable	Tue Dec 26 19:15:45 2000
+++ gnome-libs-1.2.13/libgnome/gnome-util.c	Thu Apr 18 19:18:23 2002
@@ -545,3 +545,21 @@
 	return 0;
 }
 
+
+char*
+libgnome_internal_hack_added_post_1_4_do_not_use_util_home_file (const char *afile)
+{
+  char *prefix;
+  char *ret;
+  
+  if (g_getenv ("GNOME_CONFIG_DIR"))
+    prefix = g_concat_dir_and_file (g_get_home_dir (), g_getenv ("GNOME_CONFIG_DIR"));
+  else
+    prefix = g_concat_dir_and_file (g_get_home_dir (), ".gnome");
+  
+  ret = g_concat_dir_and_file (prefix, afile);
+
+  g_free (prefix);
+
+  return ret;
+}
--- gnome-libs-1.2.13/libgnome/gnome-util.h.config-dir-variable	Mon Jan 25 21:47:28 1999
+++ gnome-libs-1.2.13/libgnome/gnome-util.h	Thu Apr 18 19:22:03 2002
@@ -81,7 +81,8 @@
 /* very similar to above, but adds $HOME/.gnome/ to beginning
  * This is meant to be the most useful version.
  */
-#define gnome_util_home_file(afile) (g_strconcat(gnome_util_user_home(), "/.gnome/", (afile), NULL))
+char* libgnome_internal_hack_added_post_1_4_do_not_use_util_home_file (const char *afile);
+#define gnome_util_home_file(afile) libgnome_internal_hack_added_post_1_4_do_not_use_util_home_file (afile)
 
 /* Find the name of the user's shell.  */
 char *gnome_util_user_shell (void);