summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-01-29 02:10:21 +0100
committerSlávek Banko <slavek.banko@axis.cz>2016-01-29 02:10:34 +0100
commit8aae507c2df306f588a057d52fbb0a723377d66d (patch)
tree9dc66396db3359b27da3cc38773e41daa36e4597
parented6ac1b202e0941b67b8e4790cc47d644b6cecdc (diff)
downloadtdebase-8aae507c2df306f588a057d52fbb0a723377d66d.tar.gz
tdebase-8aae507c2df306f588a057d52fbb0a723377d66d.zip
Fix removable hard disks mimetype in tdehw storage backend
This relates to Bug 2473 Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit ce73b505b2fb7ca3877cebdcd4785ac9ecbf0148)
-rw-r--r--tdeioslave/media/mediamanager/tdehardwarebackend.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index a7cbb2260..ed7b63c0f 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -728,14 +728,14 @@ void TDEBackend::setVolumeProperties(Medium* medium)
diskLabel = i18n("%1 Fixed Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
}
- if (sdevice->isDiskOfType(TDEDiskDeviceType::USB)) {
+ if (sdevice->isDiskOfType(TDEDiskDeviceType::USB)
+ || sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)
+ || sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) {
mimeType = "media/removable" + MOUNT_SUFFIX;
if (useDefaultLabel) {
diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize());
}
- medium->needMounting();
-
if (sdevice->isDiskOfType(TDEDiskDeviceType::CompactFlash)) {
medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX);
}