summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-03-30 20:24:24 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-03-30 20:24:24 -0500
commit983ade75ae2f488477bbb796f52ce2135c202dfe (patch)
tree32fd2ad28d871b6f5f636ae5659391eac56665b5 /src
parent39728f666128bb7d8ab24c1e3835cf0ac3c1f092 (diff)
downloadk3b-983ade75ae2f488477bbb796f52ce2135c202dfe.tar.gz
k3b-983ade75ae2f488477bbb796f52ce2135c202dfe.zip
Use TDE hardware library instead of HAL when HAL is not available
Clean up spurious build files
Diffstat (limited to 'src')
-rw-r--r--src/k3bapplication.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp
index db82043..f3fefb1 100644
--- a/src/k3bapplication.cpp
+++ b/src/k3bapplication.cpp
@@ -416,10 +416,8 @@ bool K3bApplication::Core::internalBlockDevice( K3bDevice::Device* dev )
m_deviceBlockMap[dev] = mediaCache()->blockDevice( dev );
}
-#ifdef HAVE_HAL
if( K3bDevice::HalConnection::instance()->lock( dev ) != K3bDevice::HalConnection::org_freedesktop_Hal_Success )
kdDebug() << "(K3bInterferingSystemsHandler) HAL lock failed." << endl;
-#endif
//
// Check if the device is in use
@@ -441,9 +439,7 @@ void K3bApplication::Core::internalUnblockDevice( K3bDevice::Device* dev )
m_deviceBlockMap.erase( dev );
}
-#ifdef HAVE_HAL
K3bDevice::HalConnection::instance()->unlock( dev );
-#endif
K3bCore::internalUnblockDevice( dev );
}