summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajeev Karale <rajeev.karale@wipro.com>2002-04-23 14:24:14 +0000
committerAlexander Larsson <alexl@src.gnome.org>2002-04-23 14:24:14 +0000
commit0ad6e62c9d92bb00d8b630e84376066b84da8f71 (patch)
treec2f0c188cacdd0fc1017acee5aea6403fec2206a
parent538ccab4112c7a2d482d0cd310850d55f6d91aa1 (diff)
downloadnautilus-0ad6e62c9d92bb00d8b630e84376066b84da8f71.tar.gz
finish_creating_volume() Bug Fixing : #77313. Mount_path for volume is
2002-04-23 Rajeev Karale <rajeev.karale@wipro.com> * libnautilus-private/nautilus-volume-monitor.c: finish_creating_volume() Bug Fixing : #77313. Mount_path for volume is different for solaris.
-rw-r--r--ChangeLog5
-rw-r--r--libnautilus-private/nautilus-volume-monitor.c30
2 files changed, 34 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d923857f..efacd6ef4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-23 Rajeev Karale <rajeev.karale@wipro.com>
+
+ * libnautilus-private/nautilus-volume-monitor.c: finish_creating_volume()
+ Bug Fixing : #77313. Mount_path for volume is different for solaris.
+
2002-04-22 Anders Carlsson <andersca@gnu.org>
* libnautilus-private/nautilus-icon-container.c:
diff --git a/libnautilus-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c
index 2474b8cc8..6f573d535 100644
--- a/libnautilus-private/nautilus-volume-monitor.c
+++ b/libnautilus-private/nautilus-volume-monitor.c
@@ -1810,7 +1810,35 @@ finish_creating_volume (NautilusVolumeMonitor *monitor, NautilusVolume *volume,
} else {
volume->is_removable = FALSE;
}
- }
+ } else if (eel_str_has_prefix (volume->device_path, "/vol/")) {
+ name = volume->mount_path + strlen ("/");
+
+ if (eel_str_has_prefix (name, "cdrom")) {
+ volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
+ volume->is_removable = TRUE;
+ } else if (eel_str_has_prefix (name, "floppy")) {
+ volume->device_type = NAUTILUS_DEVICE_FLOPPY_DRIVE;
+ volume->is_removable = TRUE;
+ } else if (eel_str_has_prefix (volume->device_path, floppy_device_path_prefix)) {
+ volume->device_type = NAUTILUS_DEVICE_FLOPPY_DRIVE;
+ volume->is_removable = TRUE;
+ } else if (eel_str_has_prefix (name, "zip")) {
+ volume->device_type = NAUTILUS_DEVICE_ZIP_DRIVE;
+ volume->is_removable = TRUE;
+ } else if (eel_str_has_prefix (name, "jaz")) {
+ volume->device_type = NAUTILUS_DEVICE_JAZ_DRIVE;
+ volume->is_removable = TRUE;
+ } else if (eel_str_has_prefix (name, "camera")) {
+ volume->device_type = NAUTILUS_DEVICE_CAMERA;
+ volume->is_removable = TRUE;
+ } else if (eel_str_has_prefix (name, "memstick")) {
+ volume->device_type = NAUTILUS_DEVICE_MEMORY_STICK;
+ volume->is_removable = TRUE;
+ } else {
+ volume->is_removable = FALSE;
+ }
+ }
+
return TRUE;
}