Fixed incorrect display of media device mime comment. This relates to

issue TDE/tdelibs#35. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
6 years ago · df19ff6b7d
parent 2d7de7cea4
commit df19ff6b7d
2 changed files with 17 additions and 17 deletions
--- 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);
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@ -360,7 +360,7 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat

 	// Keep these conditions in sync with ::AddDevice above, OR ELSE!!!
 	// BEGIN
-
+	if (sdevice->isDiskOfType(TDEDiskDeviceType::HDD)) {
 		if (!(sdevice->isDiskOfType(TDEDiskDeviceType::LUKS))
 			&& !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem))
 			&& !(sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio))
@ -379,6 +379,7 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat
 			}
 			setVolumeProperties(m);
 		}
+	}

 	if ((sdevice->isDiskOfType(TDEDiskDeviceType::CDROM))
 		|| (sdevice->isDiskOfType(TDEDiskDeviceType::CDR))