diff options
author | Timothy Pearson <[email protected]> | 2012-03-31 20:18:41 -0500 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2012-03-31 20:18:41 -0500 |
commit | 03d905ea268bd893030264b0e7b5b98f783c58ff (patch) | |
tree | 3bef5cc590009bc63b9f68a422da1b958c229dcb /kioslave/media/mediaimpl.cpp | |
parent | d4e6607ad6a9bfc49f4dfeced379c136704714b1 (diff) | |
download | tdebase-03d905ea268bd893030264b0e7b5b98f783c58ff.tar.gz tdebase-03d905ea268bd893030264b0e7b5b98f783c58ff.zip |
Initial merge of alpha quality HAL replacement backend for the media kioslave
Pass the WITH_TDEHWLIB CMake option to enable this backend
Diffstat (limited to 'kioslave/media/mediaimpl.cpp')
-rw-r--r-- | kioslave/media/mediaimpl.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kioslave/media/mediaimpl.cpp b/kioslave/media/mediaimpl.cpp index f8d298e27..ccb9af0a2 100644 --- a/kioslave/media/mediaimpl.cpp +++ b/kioslave/media/mediaimpl.cpp @@ -34,6 +34,8 @@ #include "medium.h" +#include <config.h> + MediaImpl::MediaImpl() : TQObject(), DCOPObject("mediaimpl"), mp_mounting(0L) { @@ -226,13 +228,15 @@ bool MediaImpl::ensureMediumMounted(Medium &medium) m_lastErrorMessage = i18n("No such medium."); return false; } - + +#ifdef COMPILE_HALBACKEND if ( medium.isEncrypted() && medium.clearDeviceUdi().isEmpty() ) { m_lastErrorCode = KIO::ERR_COULD_NOT_MOUNT; m_lastErrorMessage = i18n("The drive is encrypted."); return false; } +#endif // COMPILE_HALBACKEND if ( medium.needMounting() ) { |