Branch: master

df19ff6b 2019-08-13 13:05:10 Michele Calgaro 
Fixed incorrect display of media device mime comment. This relates to
issue TDE/tdelibs#35.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M tdeioslave/media/mediaimpl.cpp
M tdeioslave/media/mediamanager/tdehardwarebackend.cpp

tdeioslave/media/mediaimpl.cpp

diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp
index 1d00beb..b92757f 100644
--- a/tdeioslave/media/mediaimpl.cpp
+++ b/tdeioslave/media/mediaimpl.cpp
@@ -426,7 +426,6 @@
 	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);

tdeioslave/media/mediamanager/tdehardwarebackend.cpp

diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index ab03629..754012d 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -360,24 +360,25 @@
 
 	// 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))
+			) {
 		}
-		setVolumeProperties(m);
+		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);
+		}
 	}
 
 	if ((sdevice->isDiskOfType(TDEDiskDeviceType::CDROM))