1 Index: libgnomevfs/gnome-vfs-init.c
2 ===================================================================
3 RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-init.c,v
4 retrieving revision 1.32
5 diff -u -r1.32 gnome-vfs-init.c
6 --- libgnomevfs/gnome-vfs-init.c 5 Nov 2003 15:44:53 -0000 1.32
7 +++ libgnomevfs/gnome-vfs-init.c 24 Mar 2004 13:16:50 -0000
9 gboolean retval = TRUE;
12 - dirname = g_build_filename (g_get_home_dir (), ".gnome", NULL);
13 + dirname = g_build_filename (g_get_home_dir (), ".gnome2", NULL);
15 if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) {
16 if (mkdir (dirname, S_IRWXU) != 0) {
17 - g_warning ("Unable to create ~/.gnome directory: %s",
18 + g_warning ("Unable to create ~/.gnome2 directory: %s",
22 } else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) {
23 - g_warning ("Error: ~/.gnome must be a directory.");
24 + g_warning ("Error: ~/.gnome2 must be a directory.");
28 Index: libgnomevfs/gnome-vfs-mime-info.c
29 ===================================================================
30 RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-mime-info.c,v
31 retrieving revision 1.76
32 diff -u -r1.76 gnome-vfs-mime-info.c
33 --- libgnomevfs/gnome-vfs-mime-info.c 17 Jul 2003 22:33:27 -0000 1.76
34 +++ libgnomevfs/gnome-vfs-mime-info.c 24 Mar 2004 13:16:51 -0000
36 #define DELETED_VALUE "moilegrandvizir"
38 /* These ones are used to automatically reload mime info on demand */
39 -static mime_dir_source_t gnome_mime_dir, user_mime_dir;
40 +static mime_dir_source_t gnome_mime_dir, old_user_mime_dir, user_mime_dir;
41 static time_t last_checked;
43 /* To initialize the module automatically */
46 mime_info_load (&gnome_mime_dir);
47 mime_info_load (&user_mime_dir);
49 mime_list_load (&gnome_mime_dir);
50 mime_list_load (&user_mime_dir);
52 + if (old_user_mime_dir.dirname != NULL) {
53 + mime_info_load (&old_user_mime_dir);
54 + mime_list_load (&old_user_mime_dir);
59 gnome_vfs_mime_init (void)
64 * The hash tables that store the mime keys.
67 gnome_mime_dir.system_dir = TRUE;
69 user_mime_dir.dirname = g_strconcat
70 - (g_get_home_dir (), "/.gnome/mime-info", NULL);
71 + (g_get_home_dir (), "/.gnome2/mime-info", NULL);
72 user_mime_dir.system_dir = FALSE;
74 + dirname = g_strconcat (g_get_home_dir (), "/.gnome/mime-info", NULL);
75 + if (g_file_test (dirname, G_FILE_TEST_IS_DIR)) {
76 + old_user_mime_dir.dirname = dirname;
77 + old_user_mime_dir.system_dir = FALSE;
79 + memset (&old_user_mime_dir, 0, sizeof (old_user_mime_dir));
86 Index: libgnomevfs/gnome-vfs-mime-monitor.c
87 ===================================================================
88 RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-mime-monitor.c,v
89 retrieving revision 1.14
90 diff -u -r1.14 gnome-vfs-mime-monitor.c
91 --- libgnomevfs/gnome-vfs-mime-monitor.c 22 Jan 2004 12:29:10 -0000 1.14
92 +++ libgnomevfs/gnome-vfs-mime-monitor.c 24 Mar 2004 13:16:51 -0000
94 monitor->priv->gnome_callback_data);
97 - mime_dir = g_strconcat (g_get_home_dir (), "/.gnome/mime-info", NULL);
98 + mime_dir = g_strconcat (g_get_home_dir (), "/.gnome2/mime-info", NULL);
99 if (!g_file_test (mime_dir, G_FILE_TEST_EXISTS)) {
100 mkdir (mime_dir, S_IRWXU);