summaryrefslogtreecommitdiff
authorsandman <sandman>2002-06-09 23:40:20 (UTC)
committer sandman <sandman>2002-06-09 23:40:20 (UTC)
commit4f04ef71be8f36e6251f4e6e7fafbfc36fba415c (patch) (side-by-side diff)
treefd4d907f36fc5291ff9d91237bebaf872313f18d
parent65b1a790493272a38b0ac44e219d5186168fabac (diff)
downloadopie-4f04ef71be8f36e6251f4e6e7fafbfc36fba415c.zip
opie-4f04ef71be8f36e6251f4e6e7fafbfc36fba415c.tar.gz
opie-4f04ef71be8f36e6251f4e6e7fafbfc36fba415c.tar.bz2
Fixed Alarm sound handling
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 6771a66..693e77f 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -37,11 +37,9 @@
#include <qpe/power.h>
#include <qpe/timeconversion.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/global.h>
-#ifdef QT_QWS_CUSTOM
-#include "qpe/custom.h"
-#endif
+#include <qpe/custom.h>
#include <qgfx_qws.h>
#include <qmainwindow.h>
#include <qmessagebox.h>
@@ -768,9 +766,9 @@ void Desktop::screenClick()
void Desktop::soundAlarm()
{
#ifdef CUSTOM_SOUND_ALARM
- if (alarmsound)
+ if (qpedesktop->alarmsound)
CUSTOM_SOUND_ALARM;
#endif
}