diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-08-13 21:21:37 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-08-14 14:53:20 +0900 |
| commit | 0aaebc24cd00c9dd833c16dd14d1814948baac38 (patch) | |
| tree | 7bbb1801f5f7f831eec2084209eb5b2792a4c034 | |
| parent | 117f9924f1cf4f000890b03b825d6dd67c89e884 (diff) | |
| download | tdebase-0aaebc24cd00c9dd833c16dd14d1814948baac38.tar.gz tdebase-0aaebc24cd00c9dd833c16dd14d1814948baac38.zip | |
Fixed incorrect display of media device mime comment. This relates to
issue TDE/tdelibs#35.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit df19ff6b7dc7adcdb88e86d50d9d88d622a09d88)
| -rw-r--r-- | tdeioslave/media/mediaimpl.cpp | 1 | ||||
| -rw-r--r-- | tdeioslave/media/mediamanager/tdehardwarebackend.cpp | 33 |
2 files changed, 17 insertions, 17 deletions
diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp index 7b22a5d22..35bbb9ebc 100644 --- a/tdeioslave/media/mediaimpl.cpp +++ b/tdeioslave/media/mediaimpl.cpp @@ -422,7 +422,6 @@ void MediaImpl::createMediumEntry(TDEIO::UDSEntry& entry, addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, medium.mimeType()); - addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "inode/directory"); if (medium.softHidden()) { addAtom(entry, TDEIO::UDS_HIDDEN , true); diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp index b6976b68a..8869095d1 100644 --- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp @@ -350,24 +350,25 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat // Keep these conditions in sync with ::AddDevice above, OR ELSE!!! // BEGIN - - if (!(sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) - && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem)) - && !(sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio)) - && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) - ) { - } - else { - // Do not list the LUKS backend device if it has been unlocked elsewhere - if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) { - if (sdevice->holdingDevices().count() > 0) { - m->setHidden(true); - } - else { - m->setHidden(false); + if (sdevice->isDiskOfType(TDEDiskDeviceType::HDD)) { + if (!(sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) + && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem)) + && !(sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio)) + && !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) + ) { + } + else { + // Do not list the LUKS backend device if it has been unlocked elsewhere + if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) { + if (sdevice->holdingDevices().count() > 0) { + m->setHidden(true); + } + else { + m->setHidden(false); + } } + setVolumeProperties(m); } - setVolumeProperties(m); } if ((sdevice->isDiskOfType(TDEDiskDeviceType::CDROM)) |