diff options
| author | Michele Calgaro <[email protected]> | 2019-08-13 21:21:37 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2019-08-13 22:05:10 +0900 |
| commit | df19ff6b7dc7adcdb88e86d50d9d88d622a09d88 (patch) | |
| tree | 9f8d4ed36c152df435afe7178c023f834097dd90 | |
| parent | 2d7de7cea4e48670e9849188b6475c344600790b (diff) | |
| download | tdebase-df19ff6b7dc7adcdb88e86d50d9d88d622a09d88.tar.gz tdebase-df19ff6b7dc7adcdb88e86d50d9d88d622a09d88.zip | |
Fixed incorrect display of media device mime comment. This relates to
issue TDE/tdelibs#35.
Signed-off-by: Michele Calgaro <[email protected]>
| -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 1d00bebf2..b92757f90 100644 --- a/tdeioslave/media/mediaimpl.cpp +++ b/tdeioslave/media/mediaimpl.cpp @@ -426,7 +426,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 ab03629bc..754012d9a 100644 --- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp @@ -360,24 +360,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)) |