diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-06-16 22:55:14 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-07-09 10:19:34 +0900 |
| commit | d2da293eaecf382e2fd2b6517b90df62ae21e127 (patch) | |
| tree | d19288a7ffe4b2f85cb5a3a136a2e834ae93c738 /tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp | |
| parent | bd9913481762ac2dd5677479197c7ed4c2152d5e (diff) | |
| download | tdebase-d2da293eaecf382e2fd2b6517b90df62ae21e127.tar.gz tdebase-d2da293eaecf382e2fd2b6517b90df62ae21e127.zip | |
Adjusted to new icon names and renamed media types related to encrypted drives in a better way.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp')
| -rw-r--r-- | tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index 75d703b95..f32268855 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp @@ -104,8 +104,8 @@ MountHelper::MountHelper() : TDEApplication() } if (!medium.needDecryption()) { - m_errorStr = i18n("%1 is already decrypted.").arg(url.prettyURL()); - TQTimer::singleShot(0, this, TQT_SLOT(error()) ); + m_errorStr = i18n("%1 is already unlocked.").arg(url.prettyURL()); + TQTimer::singleShot(0, this, TQT_SLOT(error())); return; } @@ -166,9 +166,9 @@ MountHelper::MountHelper() : TDEApplication() } } - /* If this is a decrypted volume and there is no error yet - * we try to teardown the decryption */ - if (m_errorStr.isNull() && medium.isEncrypted() && !medium.clearDeviceUdi().isNull()) + // If this is an unlocked encrypted volume and there is no error yet, we try to lock it + if (unmountResult.contains("result") && unmountResult["result"].toBool() && + medium.isEncrypted() && !medium.clearDeviceUdi().isNull()) { DCOPReply reply = mediamanager.call( "undecrypt", medium.id()); if (reply.isValid()) { |