|
8809
|
1 |
diff -ur gnome-vfs-2.16.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c ../SUNWgnome-vfs-2.16.1.hacked/gnome-vfs-2.16.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c
|
|
|
2 |
--- gnome-vfs-2.16.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2006-10-20 15:36:40.235990000 +0000
|
|
|
3 |
+++ ../SUNWgnome-vfs-2.16.1.hacked/gnome-vfs-2.16.1/libgnomevfs/gnome-vfs-volume-monitor-daemon.c 2006-10-20 15:38:58.945481000 +0000
|
|
|
4 |
@@ -934,6 +934,11 @@
|
|
|
5 |
vol->priv->device_type = GNOME_VFS_DEVICE_TYPE_HARDDRIVE;
|
|
|
6 |
}
|
|
|
7 |
|
|
|
8 |
+ /* Nautilus is not refreshing the desktop because floppy and cd devices are mounted as subfs
|
|
|
9 |
+ * So we dont want to show different label for different media devices.
|
|
|
10 |
+ * Let icon represent drive and not the media. For more info, please see #6228176
|
|
|
11 |
+ */
|
|
|
12 |
+#if 0
|
|
|
13 |
if (vol->priv->device_type == GNOME_VFS_DEVICE_TYPE_CDROM) {
|
|
|
14 |
fd = 0;
|
|
|
15 |
disctype = _gnome_vfs_get_cdrom_type (mount->device_path, &fd);
|
|
|
16 |
@@ -965,6 +970,7 @@
|
|
|
17 |
close (fd);
|
|
|
18 |
}
|
|
|
19 |
}
|
|
|
20 |
+#endif
|
|
|
21 |
|
|
|
22 |
if (display_name == NULL) {
|
|
|
23 |
display_name = make_volume_name_from_path_and_fs (mount->mount_path, mount->filesystem_type);
|
|
|
24 |
@@ -990,6 +996,7 @@
|
|
|
25 |
vol->priv->is_user_visible = 0;
|
|
|
26 |
switch (vol->priv->device_type) {
|
|
|
27 |
case GNOME_VFS_DEVICE_TYPE_CDROM:
|
|
|
28 |
+ case GNOME_VFS_DEVICE_TYPE_AUDIO_CD:
|
|
|
29 |
case GNOME_VFS_DEVICE_TYPE_FLOPPY:
|
|
|
30 |
case GNOME_VFS_DEVICE_TYPE_ZIP:
|
|
|
31 |
case GNOME_VFS_DEVICE_TYPE_JAZ:
|