- merged from DEVEL

[packages/gnome-vfs2.git] / gnome-vfs2-gnome2-dir.patch

Index: libgnomevfs/gnome-vfs-init.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-init.c,v
retrieving revision 1.32
diff -u -r1.32 gnome-vfs-init.c
--- libgnomevfs/gnome-vfs-init.c	5 Nov 2003 15:44:53 -0000	1.32
+++ libgnomevfs/gnome-vfs-init.c	24 Mar 2004 13:16:50 -0000
@@ -59,16 +59,16 @@
 	gboolean retval = TRUE;
 	gchar *dirname;
 
-	dirname = g_build_filename (g_get_home_dir (), ".gnome", NULL);
+	dirname = g_build_filename (g_get_home_dir (), ".gnome2", NULL);
 
 	if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) {
 		if (mkdir (dirname, S_IRWXU) != 0) {
-			g_warning ("Unable to create ~/.gnome directory: %s",
+			g_warning ("Unable to create ~/.gnome2 directory: %s",
 				   g_strerror (errno));
 			retval = FALSE;
 		}
 	} else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) {
-		g_warning ("Error: ~/.gnome must be a directory.");
+		g_warning ("Error: ~/.gnome2 must be a directory.");
 		retval = FALSE;
 	}
 
Index: libgnomevfs/gnome-vfs-mime-monitor.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-mime-monitor.c,v
retrieving revision 1.14
diff -u -r1.14 gnome-vfs-mime-monitor.c
--- libgnomevfs/gnome-vfs-mime-monitor.c	22 Jan 2004 12:29:10 -0000	1.14
+++ libgnomevfs/gnome-vfs-mime-monitor.c	24 Mar 2004 13:16:51 -0000
@@ -114,7 +114,7 @@
 			       monitor->priv->gnome_callback_data);
 	g_free (mime_dir);
 
-	mime_dir = g_strconcat (g_get_home_dir (), "/.gnome/mime-info", NULL);
+	mime_dir = g_strconcat (g_get_home_dir (), "/.gnome2/mime-info", NULL);
 	if (!g_file_test (mime_dir, G_FILE_TEST_EXISTS)) {
 		mkdir (mime_dir, S_IRWXU);
 	}