[gvfs/gnome-2-28] Disallow ejecting empty drives



commit 9fcb94f8d86f91f7f1d91d48399bf0c994e6c544
Author: Tomas Bzatek <tbzatek redhat com>
Date:   Tue Oct 13 17:12:33 2009 +0200

    Disallow ejecting empty drives
    
    Similar to previous commit, hide the Eject menu item when drive has no media.

 monitor/gdu/ggdudrive.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index 20f8940..79c6809 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -188,7 +188,9 @@ update_drive (GGduDrive *drive)
        *
        * See also below where we e.g. set can_eject to TRUE for non-removable drives.
        */
-      drive->can_eject = gdu_device_drive_get_is_media_ejectable (device) || gdu_device_drive_get_requires_eject (device) || gdu_device_is_removable (device);
+      drive->can_eject = ((gdu_device_drive_get_is_media_ejectable (device) || gdu_device_is_removable (device)) &&
+                          gdu_device_is_media_available (device) && ! _is_pc_floppy_drive (device)) ||
+                         gdu_device_drive_get_requires_eject (device);
       drive->is_media_check_automatic = gdu_device_is_media_change_detected (device);
       drive->can_poll_for_media = gdu_device_is_removable (device);
     }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]