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
@@ -29,27 +29,25 @@
#include "transferserver.h"
#include "irserver.h"
#include "packageslave.h"
#include <qpe/applnk.h>
#include <qpe/mimetype.h>
#include <qpe/password.h>
#include <qpe/config.h>
#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>
#include <qtimer.h>
#include <qwindowsystem_qws.h>
#include <qvaluelist.h>
#include <stdlib.h>
#include <unistd.h>
@@ -760,25 +758,25 @@ void Desktop::keyClick()
void Desktop::screenClick()
{
#ifdef CUSTOM_SOUND_TOUCH
if ( touchclick )
CUSTOM_SOUND_TOUCH;
#endif
}
void Desktop::soundAlarm()
{
#ifdef CUSTOM_SOUND_ALARM
- if (alarmsound)
+ if (qpedesktop->alarmsound)
CUSTOM_SOUND_ALARM;
#endif
}
bool Desktop::eventFilter( QObject *w, QEvent *ev )
{
if ( ev->type() == QEvent::KeyPress ) {
QKeyEvent *ke = (QKeyEvent *)ev;
if ( ke->key() == Qt::Key_F11 ) { // menu key
QWidget *active = qApp->activeWindow();
if ( active && active->isPopup() ) {
active->close();