diff options
| -rw-r--r-- | tdecore/tdehw/tdehardwaredevices.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp index 89d9232ee..e0b594f49 100644 --- a/tdecore/tdehw/tdehardwaredevices.cpp +++ b/tdecore/tdehw/tdehardwaredevices.cpp @@ -1014,16 +1014,21 @@ TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQ disktype = disktype | TDEDiskDeviceType::USB; } + if (disktypestring.upper() == "DISK") { + disktype = disktype | TDEDiskDeviceType::HDD; + } + if ((disktypestring.upper() == "FLOPPY") || (TQString(udev_device_get_property_value(dev, "ID_DRIVE_FLOPPY")) == "1")) { disktype = disktype | TDEDiskDeviceType::Floppy; + disktype = disktype & ~TDEDiskDeviceType::HDD; } - if (disktypestring.upper() == "ZIP") { - disktype = disktype | TDEDiskDeviceType::Zip; - } - if ((devicevendor.upper() == "IOMEGA") && (devicemodel.upper().contains("ZIP"))) { + if ((disktypestring.upper() == "ZIP") + || (TQString(udev_device_get_property_value(dev, "ID_DRIVE_FLOPPY_ZIP")) == "1") + || ((devicevendor.upper() == "IOMEGA") && (devicemodel.upper().contains("ZIP")))) { disktype = disktype | TDEDiskDeviceType::Zip; + disktype = disktype & ~TDEDiskDeviceType::HDD; } if ((devicevendor.upper() == "APPLE") && (devicemodel.upper().contains("IPOD"))) { @@ -1077,10 +1082,6 @@ TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQ disktype = disktype | TDEDiskDeviceType::Jaz; } - if (disktypestring.upper() == "DISK") { - disktype = disktype | TDEDiskDeviceType::HDD; - } - if (disktypestring.upper() == "CD") { disktype = disktype | TDEDiskDeviceType::Optical; |