diff options
| author | Michele Calgaro <[email protected]> | 2019-08-25 11:21:21 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2020-10-17 10:48:29 +0800 |
| commit | b54fcda719b94c629c11e9b3462f2c9a2c5a9666 (patch) | |
| tree | b3541609fd0e5aca04427b1c4ff759a9390c77b9 /tdeioslave/media/mediamanager/halbackend.cpp | |
| parent | d34f23f403e82f352e4c5d4e20966bcba2bec8c6 (diff) | |
| download | tdebase-b54fcda719b94c629c11e9b3462f2c9a2c5a9666.tar.gz tdebase-b54fcda719b94c629c11e9b3462f2c9a2c5a9666.zip | |
tdeioslave media: fixed handling of mountable state for encrypted devices.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'tdeioslave/media/mediamanager/halbackend.cpp')
| -rw-r--r-- | tdeioslave/media/mediamanager/halbackend.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp index e05b5c3e8..6badc33c3 100644 --- a/tdeioslave/media/mediamanager/halbackend.cpp +++ b/tdeioslave/media/mediamanager/halbackend.cpp @@ -506,13 +506,13 @@ void HALBackend::setVolumeProperties(Medium* medium) medium->setEncrypted(true); char* clearUdi = libhal_volume_crypto_get_clear_volume_udi(m_halContext, halVolume); - TQString clearUdiString; + TQString clearUdiString; if (clearUdi != NULL) { kdDebug(1219) << "HALBackend::setVolumeProperties : crypto clear volume avail - " << clearUdi << endl; halClearVolume = libhal_volume_from_udi(m_halContext, clearUdi); // ignore if halClearVolume is NULL -> just not unlocked in this case - clearUdiString = clearUdi; - libhal_free_string(clearUdi); + clearUdiString = clearUdi; + libhal_free_string(clearUdi); } if (halClearVolume) @@ -660,8 +660,6 @@ void HALBackend::setVolumeProperties(Medium* medium) case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: { medium->setIconName("ipod" + MOUNTED_ICON_SUFFIX); - medium->setMountable(false); - if (libhal_device_get_property_QString(m_halContext, driveUdi.latin1(), "info.product") == "iPod" && KProtocolInfo::isKnownProtocol( TQString("ipod") ) ) { |