summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-01-27 23:08:57 +0100
committerSlávek Banko <slavek.banko@axis.cz>2016-01-27 23:09:10 +0100
commit111cc009ea9a3699dcdda42503efc284e0d58098 (patch)
tree7b26624b79be7740cd1542e18071940b27cc5f54 /tdecore
parent107e863644c853db9239eae62e3ad62758f0d724 (diff)
downloadtdelibs-111cc009ea9a3699dcdda42503efc284e0d58098.tar.gz
tdelibs-111cc009ea9a3699dcdda42503efc284e0d58098.zip
Fix ZIP drive classification in tdehwlib
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 6dfc04c51a9c2086e2f6a4be75ec847e8ef9f6fb)
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/tdehw/tdehardwaredevices.cpp17
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;