summaryrefslogtreecommitdiffstats
path: root/ksmserver
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-18 16:07:00 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-18 16:07:00 -0600
commit866f81ea56390a33df7e6b97116737b3324841ca (patch)
tree8a8d237352f908f1057cecec8847255c432edb2e /ksmserver
parentc3ac56c187138da7b2bed1a16d0a82656e306986 (diff)
downloadtdebase-866f81ea56390a33df7e6b97116737b3324841ca.tar.gz
tdebase-866f81ea56390a33df7e6b97116737b3324841ca.zip
Fix another FTBFS when both upower and hal are enabled
Diffstat (limited to 'ksmserver')
-rw-r--r--ksmserver/shutdowndlg.cpp5
1 files changed, 5 insertions, 0 deletions
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
}