diff options
| author | Slávek Banko <[email protected]> | 2021-05-17 18:10:38 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2021-05-18 14:07:41 +0200 |
| commit | 225ddaa3667808031fe65763d7f533437484486c (patch) | |
| tree | e9d7f1883f85f355d8772c5d918d3efa578a76c5 /kicker | |
| parent | 9bdd3a0e4724a591f0cdc6dd8bdd60dc794354e4 (diff) | |
| download | tdebase-225ddaa3667808031fe65763d7f533437484486c.tar.gz tdebase-225ddaa3667808031fe65763d7f533437484486c.zip | |
Respect build option WITH_TDEHWLIB, otherwise it can lead to FTBFS in special cases.
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit e031e12d06c77e0a05ad0c30c21f3afea94764af)
Diffstat (limited to 'kicker')
| -rw-r--r-- | kicker/kicker/ui/k_new_mnu.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 0cb572211..28b5f0a95 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/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> @@ -1366,7 +1370,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(); @@ -3790,7 +3794,7 @@ void KMenu::insertSuspendOption( int &nId, int &index ) "/org/freedesktop/Hal/devices/computer", "power_management.can_hibernate", 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(); @@ -3884,7 +3888,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 == 1) { |