tdeioslave media: added LOCKED property to Medium class.

Signed-off-by: Michele Calgaro <[email protected]>

3 files changed, 8 insertions, 1 deletions

diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp
index 6badc33c3..190dda774 100644
--- a/tdeioslave/media/mediamanager/halbackend.cpp
+++ b/tdeioslave/media/mediamanager/halbackend.cpp
@@ -517,6 +517,7 @@ void HALBackend::setVolumeProperties(Medium* medium)
 
         if (halClearVolume)
         {
+            medium->setLocked(false);
             medium->setMountable(true);
             medium->setDeviceNode(libhal_volume_get_device_file(halVolume));
             medium->setClearDeviceUdi(clearUdiString);
@@ -526,7 +527,8 @@ void HALBackend::setVolumeProperties(Medium* medium)
         }
         else
         {
-            medium->setMountable(true);
+            medium->setLocked(true);
+            medium->setMountable(false);
             medium->setDeviceNode(libhal_volume_get_device_file(halVolume));
             medium->setClearDeviceUdi(TQString::null);
             medium->setMountPoint(TQString::null);
@@ -537,6 +539,7 @@ void HALBackend::setVolumeProperties(Medium* medium)
     else
     {
         kdDebug(1219) << "HALBackend::setVolumeProperties : normal volume" << endl;
+        medium->setEncrypted(false);
         medium->setMountable(true);
         medium->setDeviceNode(libhal_volume_get_device_file(halVolume));
         medium->setMountPoint(TQString::fromUtf8(libhal_volume_get_mount_point(halVolume)));
diff --git a/tdeioslave/media/mediamanager/medialist.cpp b/tdeioslave/media/mediamanager/medialist.cpp
index b2dd84c60..8ea9aec50 100644
--- a/tdeioslave/media/mediamanager/medialist.cpp
+++ b/tdeioslave/media/mediamanager/medialist.cpp
@@ -132,6 +132,8 @@ bool MediaList::changeMediumState(const Medium &medium, bool allowNotification)
 
 	Medium *m = m_idMap[medium.id()];
 
+	m->setEncrypted(medium.isEncrypted());
+	m->setLocked(medium.isLocked());
 	m->setMountable(medium.isMountable());
 	if (medium.isMountable())
 	{
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index 74180ca9a..bcd610ef4 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -460,6 +460,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 	medium->setName(generateName(sdevice->deviceNode()));
 	if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) {
 		medium->setEncrypted(true);
+		medium->setLocked(!sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt));
 	}
 	else {
 		medium->setEncrypted(false);
@@ -831,6 +832,7 @@ bool TDEBackend::setFloppyProperties(Medium* medium)
 		medium->setName(generateName(sdevice->deviceNode()));
 		if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) {
 			medium->setEncrypted(true);
+			medium->setLocked(!sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt));
 		}
 		else {
 			medium->setEncrypted(false);