3 files changed, 15 insertions, 4 deletions

diff --git a/noncore/unsupported/mail2/bend/bend.cpp b/noncore/unsupported/mail2/bend/bend.cpp
index b4da3ac..fe3b736 100644
--- a/noncore/unsupported/mail2/bend/bend.cpp
+++ b/noncore/unsupported/mail2/bend/bend.cpp
@@ -1,6 +1,7 @@
 #include <qlayout.h>
 #include <qpixmap.h>
 #include <qlabel.h>
+#include <qsound.h>
 #include <qtimer.h>
 #include <qdir.h>
 
@@ -19,6 +20,9 @@
 BenD::BenD(QWidget *parent, const char *name, WFlags fl)
         : QButton(parent, name, fl)
 {
+        _zaurus = false;
+        if (QFile("/dev/sharp_buz").exists()) _zaurus = true;
+
         _config = new Config("mail");
         _config->setGroup("Settings");
 
@@ -66,6 +70,9 @@ void BenD::slotCheck()
         if (newIntervalMs != _intervalMs) {
                 _intervalTimer->changeInterval(newIntervalMs);
                 _intervalMs = newIntervalMs;
+#ifndef QT_NO_DEBUG
+                qWarning("BenD: Detected interval change");
+#endif
         }
 
         QValueList<Account> acList = ConfigFile::getAccounts();
@@ -95,8 +102,12 @@ void BenD::slotIMAPStatus(IMAPResponse &response)
                         if (_config->readBoolEntry("BlinkLed", true)) 
                                 ZaurusStuff::blinkLedOn();
                         if (_config->readBoolEntry("PlaySound", false)) {
-                                ZaurusStuff::buzzerOn();
-                                QTimer::singleShot(3000, this, SLOT(slotSoundOff()));
+                                if (_zaurus) {
+                                        ZaurusStuff::buzzerOn();
+                                        QTimer::singleShot(3000, this, SLOT(slotSoundOff()));
+                                } else {
+                                        QSound::play(Resource::findSound("mail/newmail"));
+                                }
                         }
                 } else {
                         if (!isHidden()) hide();
diff --git a/noncore/unsupported/mail2/bend/bend.h b/noncore/unsupported/mail2/bend/bend.h
index cf50bc5..7972929 100644
--- a/noncore/unsupported/mail2/bend/bend.h
+++ b/noncore/unsupported/mail2/bend/bend.h
@@ -30,7 +30,7 @@ private:
         Config *_config;
         QTimer *_intervalTimer;
         int _intervalMs;
-        bool _ledOn;
+        bool _zaurus, _ledOn;
 
 };
 
diff --git a/noncore/unsupported/mail2/configdiagbase.ui b/noncore/unsupported/mail2/configdiagbase.ui
index 754458a..dfe0db8 100644
--- a/noncore/unsupported/mail2/configdiagbase.ui
+++ b/noncore/unsupported/mail2/configdiagbase.ui
@@ -252,7 +252,7 @@
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
-                                            <string>Play sound (Zaurus only)</string>
+                                            <string>Play sound</string>
                                         </property>
                                     </widget>
                                     <widget row="2"  column="0" >