diff options
| author | Alexander Larsson <alexl@redhat.com> | 2002-08-29 10:56:02 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2002-08-29 10:56:02 +0000 |
| commit | 05c9341f8f8944a7c3be3bd8b1d16b021680aafd (patch) | |
| tree | 4c0da50c5f7ede8527bc854ceb0ac45f628d54ac | |
| parent | e4ae51202629a987a62b3193897b588eec07c0a2 (diff) | |
| download | nautilus-05c9341f8f8944a7c3be3bd8b1d16b021680aafd.tar.gz | |
Don't mark loopback mounts as CDROM.
2002-08-29 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-volume-monitor.c (mount_volume_iso9660_add):
Don't mark loopback mounts as CDROM.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-volume-monitor.c | 5 |
2 files changed, 9 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2002-08-29 Alexander Larsson <alexl@redhat.com> + * libnautilus-private/nautilus-volume-monitor.c (mount_volume_iso9660_add): + Don't mark loopback mounts as CDROM. + +2002-08-29 Alexander Larsson <alexl@redhat.com> + * src/nautilus-application.c (volume_mounted_callback): Allow other apps that do their own CD switching to temporary disable nautilus from popping up CD windows by grabbing the diff --git a/libnautilus-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c index a94b8bea8..73109ba79 100644 --- a/libnautilus-private/nautilus-volume-monitor.c +++ b/libnautilus-private/nautilus-volume-monitor.c @@ -1260,7 +1260,10 @@ get_cdrom_type (const char *vol_dev_path, int* fd) static gboolean mount_volume_iso9660_add (NautilusVolume *volume) { - volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE; + /* Don't mark loopback mounts as cdroms. */ + if (!eel_str_has_prefix (volume->device_path, "/dev/loop")) { + volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE; + } return TRUE; } |