diff options
| author | Gene Z. Ragan <gzr@eazel.com> | 2001-04-18 23:47:34 +0000 |
|---|---|---|
| committer | Gene Ragan <gzr@src.gnome.org> | 2001-04-18 23:47:34 +0000 |
| commit | cc4f35e36e47f44b0760b37e2ffac91b69bdbbf2 (patch) | |
| tree | fe8d148702c2030c5fd0672e9f838c52764306f6 /libnautilus-extensions/nautilus-volume-monitor.c | |
| parent | 759fcbed3b6dc48a092ab8fea213453161186162 (diff) | |
| download | nautilus-cc4f35e36e47f44b0760b37e2ffac91b69bdbbf2.tar.gz | |
Fix an error that was introduced that caused floppy devices to not get
2001-04-18 Gene Z. Ragan <gzr@eazel.com>
Fix an error that was introduced that caused floppy
devices to not get identified. The floppy prefix
should be /dev/fd not /dev/fd/
* libnautilus-extensions/nautilus-volume-monitor.c:
(nautilus_volume_monitor_initialize_class),
(mount_volume_auto_add):
Diffstat (limited to 'libnautilus-extensions/nautilus-volume-monitor.c')
| -rw-r--r-- | libnautilus-extensions/nautilus-volume-monitor.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libnautilus-extensions/nautilus-volume-monitor.c b/libnautilus-extensions/nautilus-volume-monitor.c index b4133ffc8..3be703bc3 100644 --- a/libnautilus-extensions/nautilus-volume-monitor.c +++ b/libnautilus-extensions/nautilus-volume-monitor.c @@ -252,12 +252,12 @@ nautilus_volume_monitor_initialize_class (NautilusVolumeMonitorClass *klass) if (g_file_exists ("/vol/dev")) { floppy_device_path_prefix = "/vol/dev/diskette/"; } else { - floppy_device_path_prefix = "/dev/fd/"; + floppy_device_path_prefix = "/dev/fd"; } if (g_file_exists ("/vol")) { noauto_string = "/vol/"; } else { - noauto_string = "/dev/fd/"; + noauto_string = "/dev/fd"; } mnttab_exists = g_file_exists ("/etc/mnttab"); } @@ -1112,7 +1112,6 @@ verify_current_mount_state (NautilusVolumeMonitor *monitor) free_mount_list (saved_mount_list); } - static int mount_volumes_check_status (NautilusVolumeMonitor *monitor) { @@ -1244,7 +1243,7 @@ mount_volume_affs_add (NautilusVolume *volume) static gboolean mount_volume_auto_add (NautilusVolume *volume) { - if (strcmp (volume->mount_path, "/mnt/floppy") == 0) { + if (eel_str_has_prefix (volume->device_path, floppy_device_path_prefix)) { volume->type = NAUTILUS_VOLUME_FLOPPY; } else { volume->type = NAUTILUS_VOLUME_AUTO; |