diff options
author | Gene Z. Ragan <gzr@eazel.com> | 2001-04-18 19:05:10 +0000 |
---|---|---|
committer | Gene Ragan <gzr@src.gnome.org> | 2001-04-18 19:05:10 +0000 |
commit | a13e10180c2a62c39c9eeab875e9d834bcb121db (patch) | |
tree | 21e68f0faf96e4f2661c2fceff36c9b36d2e77bf /libnautilus-extensions/nautilus-volume-monitor.c | |
parent | db4b617a4dfd45b8ee721f7d9a32712b44febdac (diff) | |
download | nautilus-a13e10180c2a62c39c9eeab875e9d834bcb121db.tar.gz |
Fix bug 8102, with Nautilus running, CDs get ejected (wrong and makes the
2001-04-18 Gene Z. Ragan <gzr@eazel.com>
Fix bug 8102, with Nautilus running, CDs get ejected
(wrong and makes the kernel unhappy)
* libnautilus-extensions/nautilus-volume-monitor.c:
(mount_volume_iso9660_add):
Remove ioctls that are not needed and may cause the
cd to allow ejecting even with a mounted volume.
Diffstat (limited to 'libnautilus-extensions/nautilus-volume-monitor.c')
-rw-r--r-- | libnautilus-extensions/nautilus-volume-monitor.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libnautilus-extensions/nautilus-volume-monitor.c b/libnautilus-extensions/nautilus-volume-monitor.c index 53417a342..7fa0cd92d 100644 --- a/libnautilus-extensions/nautilus-volume-monitor.c +++ b/libnautilus-extensions/nautilus-volume-monitor.c @@ -1205,14 +1205,6 @@ get_cdrom_type (const char *vol_dev_path, int* fd) #endif } -static void -cdrom_ioctl_get_info (int fd) -{ - ioctl (fd, CDROM_CLEAR_OPTIONS, CDO_LOCK | CDO_AUTO_CLOSE | CDO_AUTO_EJECT); - ioctl (fd, CDROM_SET_OPTIONS, CDO_USE_FFLAGS | CDO_CHECK_TYPE); - ioctl (fd, CDROM_LOCKDOOR, 0); -} - static gboolean mount_volume_iso9660_add (NautilusVolume *volume) { @@ -1228,8 +1220,6 @@ mount_volume_iso9660_add (NautilusVolume *volume) if (ioctl (fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) < 0) { return FALSE; } - - cdrom_ioctl_get_info (fd); close (fd); #endif |