Browse Source

Respect build option WITH_TDEHWLIB, otherwise it can lead to FTBFS in special cases.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/209/head
Slávek Banko 1 year ago
parent
commit
e031e12d06
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
  1. 4
      drkonqi/backtrace.cpp
  2. 8
      kcontrol/displayconfig/displayconfig.cpp
  3. 6
      kcontrol/displayconfig/displayconfig.h
  4. 12
      kcontrol/hwmanager/hwdevicetray.cpp
  5. 2
      kcontrol/hwmanager/hwdevicetray.h
  6. 4
      kcontrol/hwmanager/hwdevicetray_app.cpp
  7. 1
      kcontrol/randr/CMakeLists.txt
  8. 8
      kcontrol/randr/tderandrtray.cpp
  9. 2
      kcontrol/randr/tderandrtray.h
  10. 10
      kdesktop/lock/lockdlg.cpp
  11. 16
      kdesktop/lock/lockprocess.cpp
  12. 2
      kdesktop/lock/lockprocess.h
  13. 8
      kdesktop/lockeng.cpp
  14. 2
      kdesktop/lockeng.h
  15. 12
      kicker/kicker/ui/k_new_mnu.cpp
  16. 4
      ksmserver/server.cpp
  17. 4
      ksmserver/server.h
  18. 4
      ksmserver/shutdown.cpp
  19. 8
      ksmserver/shutdowndlg.cpp
  20. 1
      tdeioslave/media/medianotifier/CMakeLists.txt
  21. 6
      tdeioslave/media/medianotifier/notificationdialog.cpp
  22. 1
      tdeioslave/media/mounthelper/CMakeLists.txt
  23. 10
      tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
  24. 6
      tdm/kfrontend/kgapp.cpp
  25. 2
      tdm/kfrontend/kgapp.h
  26. 14
      tdm/kfrontend/kgreeter.cpp
  27. 8
      tdm/kfrontend/kgverify.cpp
  28. 4
      tdm/kfrontend/kgverify.h
  29. 8
      tdm/kfrontend/sakdlg.cpp

4
drkonqi/backtrace.cpp

@ -36,7 +36,7 @@
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <tdetempfile.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <tdehardwaredevices.h>
#endif
@ -358,7 +358,7 @@ void BackTrace::processBacktrace()
}
#endif // HAVE_ELFICON
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
// Append potentially important hardware information
m_strBt.append("\n==== (tdehwlib) hardware information ====\n");
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();

8
kcontrol/displayconfig/displayconfig.cpp

@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
@ -744,7 +748,7 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) {
KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &)
: TDECModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0)
{
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
#endif
@ -863,7 +867,7 @@ KDisplayConfig::~KDisplayConfig()
}
void KDisplayConfig::deviceChanged (TDEGenericDevice* device) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
if (device->type() == TDEGenericDeviceType::Monitor) {
if (base->rescanHardware->isEnabled()) {
base->rescanHardware->setEnabled(false);

6
kcontrol/displayconfig/displayconfig.h

@ -21,10 +21,6 @@
#ifndef _KCM_DisplayCONFIG_H
#define _KCM_DisplayCONFIG_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <tqptrlist.h>
#include <tqslider.h>
#include <tqworkspace.h>
@ -34,7 +30,7 @@
#include <dcopobject.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <tdehardwaredevices.h>
#else
#define TDEGenericDevice void

12
kcontrol/hwmanager/hwdevicetray.cpp

@ -17,6 +17,10 @@
* License along with cryptocardwatcher. If not, see http://www.gnu.org/licenses/.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <tqtimer.h>
#include <tqimage.h>
#include <tqtooltip.h>
@ -84,7 +88,7 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name)
new TDEActionMenu(i18n("Eject"), SmallIcon("player_eject", TQIconSet::Automatic), actionCollection(), "eject_menu");
new TDEActionMenu(i18n("Properties"), SmallIcon("edit", TQIconSet::Automatic), actionCollection(), "properties_menu");
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(deviceAdded(TDEGenericDevice*)));
connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(deviceRemoved(TDEGenericDevice*)));
@ -636,7 +640,7 @@ void HwDeviceSystemTray::slotEditShortcutKeys() {
}
void HwDeviceSystemTray::deviceAdded(TDEGenericDevice* device) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TDEConfig config("mediamanagerrc");
config.setGroup("Global");
if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true))
@ -662,7 +666,7 @@ void HwDeviceSystemTray::deviceAdded(TDEGenericDevice* device) {
}
void HwDeviceSystemTray::deviceRemoved(TDEGenericDevice* device) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TDEConfig config("mediamanagerrc");
config.setGroup("Global");
if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true))
@ -688,7 +692,7 @@ void HwDeviceSystemTray::deviceRemoved(TDEGenericDevice* device) {
}
void HwDeviceSystemTray::deviceChanged(TDEGenericDevice* device) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TDEConfig config("mediamanagerrc");
config.setGroup("Global");
if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true))

2
kcontrol/hwmanager/hwdevicetray.h

@ -27,7 +27,7 @@
#include <ksimpleconfig.h>
#include <tdepassivepopupstack.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <tdehardwaredevices.h>
#else
#define TDEGenericDevice void

4
kcontrol/hwmanager/hwdevicetray_app.cpp

@ -17,6 +17,10 @@
* License along with cryptocardwatcher. If not, see http://www.gnu.org/licenses/.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <kdebug.h>
#include "hwdevicetray_app.h"

1
kcontrol/randr/CMakeLists.txt

@ -11,6 +11,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

8
kcontrol/randr/tderandrtray.cpp

@ -16,6 +16,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <tqtimer.h>
#include <tqimage.h>
#include <tqtooltip.h>
@ -92,7 +96,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
applyIccConfiguration(cur_profile, NULL);
}
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
#endif
@ -888,7 +892,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter)
}
void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
if (device->type() == TDEGenericDeviceType::Monitor) {
KRandrPassivePopup::message(
i18n("New display output options are available!"),

2
kcontrol/randr/tderandrtray.h

@ -24,7 +24,7 @@
#include <ksystemtray.h>
#include <kglobalaccel.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <tdehardwaredevices.h>
#else
#define TDEGenericDevice void

10
kdesktop/lock/lockdlg.cpp

@ -44,7 +44,7 @@
#include <tqlistview.h>
#include <tqheader.h>
#include <tqcheckbox.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <tqfile.h>
#include <tdecryptographiccarddevice.h>
#endif
@ -481,7 +481,7 @@ void PasswordDlg::reapVerify()
switch (WEXITSTATUS(status)) {
case AuthOk:
{
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
KUser userinfo;
TQString fileName = userinfo.homeDir() + "/.tde_card_login_state";
TQFile flagFile(fileName);
@ -559,7 +559,7 @@ void PasswordDlg::handleVerify()
setFixedSize( sizeHint().width(), sizeHint().height() + 1 );
setFixedSize( sizeHint() );
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
// Check if cryptographic card login is being used
if (mCardLoginInProgress) {
// Attempt authentication if configured
@ -980,7 +980,7 @@ void PasswordDlg::capsLocked()
}
void PasswordDlg::attemptCardLogin() {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#ifndef HAVE_KRB5
// Don't enable card-based logins if Kerberos integration was disabled
return;
@ -1020,7 +1020,7 @@ void PasswordDlg::attemptCardLogin() {
}
void PasswordDlg::resetCardLogin() {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
validUserCardInserted = false;
greet->abort();
greet->clear();

16
kdesktop/lock/lockprocess.cpp

@ -19,7 +19,7 @@
#include <config.h>
#include <tdeglobal.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <ksslcertificate.h>
#include <kuser.h>
#include <tdehardwaredevices.h>
@ -298,7 +298,7 @@ LockProcess::LockProcess()
}
}
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
// Initialize SmartCard readers
TDEGenericDevice *hwdevice;
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@ -2832,7 +2832,7 @@ void LockProcess::processInputPipeCommand(TQString inputcommand) {
}
void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TQString login_name = TQString::null;
X509CertificatePtrList certList = cdevice->cardX509Certificates();
if (certList.count() > 0) {
@ -2870,7 +2870,7 @@ void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice)
}
void LockProcess::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
PasswordDlg* passDlg = dynamic_cast<PasswordDlg*>(currentDialog);
if (passDlg) {
passDlg->resetCardLogin();
@ -2884,7 +2884,7 @@ void LockProcess::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice)
void LockProcess::signalPassDlgToAttemptCardLogin()
{
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
PasswordDlg* passDlg = dynamic_cast<PasswordDlg*>(currentDialog);
if (passDlg && m_loginCardDevice) {
passDlg->attemptCardLogin();
@ -2900,7 +2900,7 @@ void LockProcess::signalPassDlgToAttemptCardLogin()
void LockProcess::signalPassDlgToAttemptCardAbort()
{
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
PasswordDlg* passDlg = dynamic_cast<PasswordDlg*>(currentDialog);
if (passDlg) {
passDlg->resetCardLogin();
@ -2916,7 +2916,7 @@ void LockProcess::signalPassDlgToAttemptCardAbort()
void LockProcess::cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice)
{
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TQCString password;
TQString pin_entry;
@ -2937,7 +2937,7 @@ void LockProcess::cryptographicCardPinRequested(TQString prompt, TDECryptographi
TDECryptographicCardDevice* LockProcess::cryptographicCardDevice()
{
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
return m_loginCardDevice;
#else
return NULL;

2
kdesktop/lock/lockprocess.h

@ -29,7 +29,7 @@ class KLibrary;
class KWinModule;
class KSMModalDialog;
class LockProcess;
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
class TDECryptographicCardDevice;
#else
#define TDECryptographicCardDevice void

8
kdesktop/lockeng.cpp

@ -13,7 +13,7 @@
#include <sys/stat.h>
#include <tdeglobal.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <ksslcertificate.h>
#include <kuser.h>
#include <tdehardwaredevices.h>
@ -200,7 +200,7 @@ SaverEngine::SaverEngine()
delete config;
config = NULL;
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
// Initialize SmartCard readers
TDEGenericDevice *hwdevice;
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@ -265,7 +265,7 @@ void SaverEngine::cardStartupTimeout() {
}
void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TQString login_name = TQString::null;
X509CertificatePtrList certList = cdevice->cardX509Certificates();
if (certList.count() > 0) {
@ -291,7 +291,7 @@ void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice)
}
void SaverEngine::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
if (mValidCryptoCardInserted) {
mValidCryptoCardInserted = false;

2
kdesktop/lockeng.h

@ -18,7 +18,7 @@
#include <tqdbusconnection.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
class TDECryptographicCardDevice;
#else
#define TDECryptographicCardDevice void

12
kicker/kicker/ui/k_new_mnu.cpp

@ -21,6 +21,10 @@
******************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
@ -52,7 +56,7 @@
#include <kdebug.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <tdehardwaredevices.h>
#endif
#include <kiconloader.h>
@ -1377,7 +1381,7 @@ void KMenu::insertStaticExitItems()
#if defined(COMPILE_HALBACKEND)
if (ksmserver.readBoolEntry( "offerShutdown", true ) && DM().canShutdown())
maysd = true;
#elif defined(__TDE_HAVE_TDEHWLIB)
#elif defined(WITH_TDEHWLIB)
TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
if( rootDevice ) {
maysd = rootDevice->canPowerOff();
@ -3810,7 +3814,7 @@ void KMenu::insertSuspendOption( int &nId, int &index )
"/org/freedesktop/Hal/devices/computer",
"power_management.can_suspend_hybrid",
NULL);
#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND
#elif defined(WITH_TDEHWLIB) // COMPILE_HALBACKEND
TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
if (rootDevice) {
suspend_ram = rootDevice->canSuspend();
@ -3924,7 +3928,7 @@ void KMenu::slotSuspend(int id)
}
dbus_message_unref(msg);
}
#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND
#elif defined(WITH_TDEHWLIB) // COMPILE_HALBACKEND
TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
if (rootDevice) {
if (id == SuspendType::Freeze) {

4
ksmserver/server.cpp

@ -599,7 +599,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
clientInteracting = 0;
xonCommand = config->readEntry( "xonCommand", "xon" );
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
hwDevices = TDEGlobal::hardwareDevices();
#endif
@ -723,7 +723,7 @@ void KSMServer::cleanUp()
DM().shutdown( shutdownType, shutdownMode, bootOption );
}
else {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
if (rootDevice) {
if (shutdownType == TDEApplication::ShutdownTypeHalt) {

4
ksmserver/server.h

@ -21,7 +21,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#include <tqtimer.h>
#include <dcopobject.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <tdehardwaredevices.h>
#endif
@ -253,7 +253,7 @@ private:
WindowMap legacyWindows;
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TDEHardwareDevices* hwDevices;
#endif
int initialClientCount;

4
ksmserver/shutdown.cpp

@ -152,7 +152,7 @@ bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd, bool &mayrb,
mayrb = true;
}
else {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
if (rootDevice) {
if (rootDevice->canPowerOff()) {
@ -241,7 +241,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
// If this is not done the desktop of the locked session will be shown after suspend/hibernate until the lock fully engages!
kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
}
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
if (rootDevice) {
switch (selection) {

8
ksmserver/shutdowndlg.cpp

@ -6,6 +6,10 @@ Copyright (C) 2010 Timothy Pearson <kb9vqf@pearsoncomputing.net>
Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
******************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "shutdowndlg.h"
#include <tqapplication.h>
@ -33,7 +37,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <tdehardwaredevices.h>
#endif
#include <kdebug.h>
@ -874,7 +878,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
canHybridSuspend = true;
}
}
#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND
#elif defined(WITH_TDEHWLIB) // COMPILE_HALBACKEND
TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
if (rootDevice) {
canFreeze = rootDevice->canFreeze();

1
tdeioslave/media/medianotifier/CMakeLists.txt

@ -14,6 +14,7 @@ include_directories(
${CMAKE_BINARY_DIR}/tdeioslave/media/libmediacommon
${CMAKE_SOURCE_DIR}/tdeioslave/media/libmediacommon
${CMAKE_SOURCE_DIR}/tdmlib
${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

6
tdeioslave/media/medianotifier/notificationdialog.cpp

@ -17,6 +17,10 @@
Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "notificationdialog.h"
#include <tqlayout.h>
@ -28,7 +32,7 @@
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <tqpushbutton.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <tdehardwaredevices.h>
#endif

1
tdeioslave/media/mounthelper/CMakeLists.txt

@ -12,6 +12,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/tdeioslave/media/libmediacommon
${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)

10
tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp

@ -19,6 +19,10 @@
Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <tdecmdlineargs.h>
#include <tdelocale.h>
#include <tdeapplication.h>
@ -32,7 +36,7 @@
#include <kprocess.h>
#include <tdestartupinfo.h>
#include <kmimetype.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <tdehardwaredevices.h>
#endif
@ -173,7 +177,7 @@ void MountHelper::lock(const Medium &medium)
void MountHelper::eject(const TQString &device, bool quiet)
{
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
// Try TDE HW library eject first...
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device);
@ -203,7 +207,7 @@ void MountHelper::eject(const TQString &device, bool quiet)
void MountHelper::releaseHolders(const Medium &medium, bool handleThis)
{
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
if (medium.id().isEmpty())
{
m_errorStr = i18n("Try to release holders from an unknown medium.");

6
tdm/kfrontend/kgapp.cpp

@ -124,14 +124,14 @@ void GreeterApp::init()
startTimer( pingInterval * 60000 );
}
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
#endif
}
void GreeterApp::deviceChanged(TDEGenericDevice* device) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#ifdef WITH_XRANDR
if (device->type() == TDEGenericDeviceType::Monitor) {
KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();
@ -139,7 +139,7 @@ void GreeterApp::deviceChanged(TDEGenericDevice* device) {
delete randrsimple;
}
#endif // WITH_XRANDR
#endif // __TDE_HAVE_TDEHWLIB
#endif // WITH_TDEHWLIB
}
void

2
tdm/kfrontend/kgapp.h

@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define KGAPP_H
#include <tdeapplication.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <tdehardwaredevices.h>
#else
#define TDEGenericDevice void

14
tdm/kfrontend/kgreeter.cpp

@ -22,6 +22,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "kgreeter.h"
#include "kconsole.h"
#include "tdmconfig.h"
@ -35,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <dmctl.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <ksslcertificate.h>
#include <tdehardwaredevices.h>
#include <tdecryptographiccarddevice.h>
@ -247,7 +251,7 @@ KGreeter::~KGreeter()
void KGreeter::cryptographicCardWatcherSetup() {
cardLoginUser = TQString::null;
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
// Initialize SmartCard readers
TDEGenericDevice *hwdevice;
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@ -861,7 +865,7 @@ KGreeter::verifySetUser( const TQString &user )
}
void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#ifndef HAVE_KRB5
// Don't enable card-based logins if Kerberos integration was disabled
return;
@ -945,7 +949,7 @@ void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
}
void KGreeter::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
cardLoginUser = TQString::null;
userView->setEnabled(false);
verify->lockUserEntry(false);
@ -1338,7 +1342,7 @@ KThemedGreeter::updateStatus( bool fail, bool caps, int timedleft )
}
}
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
if (cardLoginUser != TQString::null) {
verify->setPasswordPrompt(i18n("PIN:"));
}

8
tdm/kfrontend/kgverify.cpp

@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "themer/tdmlabel.h"
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <ksslcertificate.h>
#include <tdehardwaredevices.h>
#include <tdecryptographiccarddevice.h>
@ -100,7 +100,7 @@ KGVerify::KGVerify(KGVerifyHandler *_handler, KdmThemer *_themer,
, isClear(true)
, inGreeterPlugin(false)
, abortRequested(false)
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
, cardLoginInProgress(false)
, cardLoginDevice(NULL)
#endif
@ -329,7 +329,7 @@ KGVerify::start()
return;
}
else
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
if (!cardLoginInProgress)
#endif
{
@ -672,7 +672,7 @@ KGVerify::handleVerify()
greet->textPrompt(msg, echo, ndelay);
inGreeterPlugin = !ndelay;
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
if (cardLoginInProgress) {
TQString autoPIN = cardLoginDevice->autoPIN();
if (autoPIN != TQString::null) {

4
tdm/kfrontend/kgverify.h

@ -77,7 +77,7 @@ class TQPopupMenu;
class TQTimer;
class KPushButton;
class KLibrary;
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
class TDECryptographicCardDevice;
#endif
@ -184,7 +184,7 @@ class KGVerify : public TQObject, public KGreeterPluginHandler {
static TQVariant getConf( void *ctx, const char *key, const TQVariant &dflt );
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
bool cardLoginInProgress;
TDECryptographicCardDevice* cardLoginDevice;
#endif

8
tdm/kfrontend/sakdlg.cpp

@ -10,7 +10,7 @@
#include <dmctl.h>
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
#include <ksslcertificate.h>
#include <tdehardwaredevices.h>
#include <tdecryptographiccarddevice.h>
@ -136,7 +136,7 @@ SAKDlg::SAKDlg(TQWidget *parent)
connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
mSAKProcess->start();
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
// Initialize SmartCard readers
TDEGenericDevice *hwdevice;
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@ -175,7 +175,7 @@ void SAKDlg::processInputPipeCommand(TQString command) {
}
void SAKDlg::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
TQString login_name = TQString::null;
X509CertificatePtrList certList = cdevice->cardX509Certificates();
if (certList.count() > 0) {
@ -221,7 +221,7 @@ void SAKDlg::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
}
void SAKDlg::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_TDEHWLIB
//
#endif
}

Loading…
Cancel
Save