From 866f81ea56390a33df7e6b97116737b3324841ca Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 18 Feb 2012 16:07:00 -0600 Subject: Fix another FTBFS when both upower and hal are enabled --- ksmserver/shutdowndlg.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 99ac8a5ff..f0f33a459 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -1028,6 +1028,9 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, KSMShutdownDlg::~KSMShutdownDlg() { +#ifdef WITH_UPOWER +#else // WITH_UPOWER + #ifdef COMPILE_HALBACKEND if (m_halCtx) { @@ -1037,6 +1040,8 @@ KSMShutdownDlg::~KSMShutdownDlg() libhal_ctx_free(m_halCtx); } #endif + +#endif // WITH_UPOWER } -- cgit v1.2.1