fixed a segfault if a device is discovered on opie start and added sounds

4 files changed, 36 insertions, 28 deletions

diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index c0f11c0..42bed5e 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -41,12 +41,13 @@
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qfile.h>
 #include <qtimer.h>
 #include <qtextstream.h>
 #include <qpopupmenu.h>
+#include <qsound.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
@@ -61,18 +62,21 @@ IrdaApplet::IrdaApplet( QWidget *parent, const char *name )
     sockfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
     irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" );
     irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" );
     irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" );
     receiveActivePixmap = Resource::loadPixmap("irdaapplet/receive");
     receiveActive = false;
-    startTimer(5000);
-    timerEvent(NULL);
     popupMenu = 0;
     devicesAvailable.setAutoDelete(TRUE);
 }
 
+void IrdaApplet::show() {
+    QWidget::show();
+    startTimer(2000);
+}
+
 IrdaApplet::~IrdaApplet() {
     close(sockfd);
     if( popupMenu ) { delete popupMenu; }
 }
 
 void IrdaApplet::popup(QString message, QString icon="") {
@@ -203,35 +207,37 @@ void IrdaApplet::showDiscovered() {
             //qDebug("IrdaMon: " + it.currentKey());
             //qDebug("  =" + *devicesAvailable[it.currentKey()] );
             ++it;
         }
 
         for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) {
-            qDebug( (*line) );
+            // qDebug( (*line) );
             if( (*line).startsWith("nickname:") ){
                 discoveredDevice  = (*line).mid(((*line).find(':'))+2,(*line).find(',')-(*line).find(':')-2);
                 deviceAddr = (*line).mid( (*line).find( "daddr:" )+9, 8 );
 
-                qDebug(discoveredDevice + "(" + deviceAddr + ")");
+                // qDebug(discoveredDevice + "(" + deviceAddr + ")");
 
                 if( ! devicesAvailable.find(deviceAddr) ) {
                     popup( tr("Found:") + " " + discoveredDevice );
+                    QSound::play(Resource::findSound("irdaapplet/irdaon"));
                     qcopsend = TRUE;
                 }
                 devicesAvailable.replace( deviceAddr, new QString(discoveredDevice) );
-                //qDebug("IrdaMon: " + deviceAddr + "=" + *devicesAvailable[deviceAddr] );
+                // qDebug("IrdaMon: " + deviceAddr + "=" + *devicesAvailable[deviceAddr] );
             }
         }
 
         it.toFirst();
         while ( it.current() ) {
-            qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?");
+            // qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?");
             if ( (*it.current()).left(3) == "+++" ) {
                 popup( tr("Lost:") + " " + (*devicesAvailable[it.currentKey()]).mid(3) );
+                QSound::play(Resource::findSound("irdaapplet/irdaoff"));
                 devicesAvailable.remove( it.currentKey() );
-                qDebug("IrdaMon: delete " + it.currentKey() + "!");
+                // qDebug("IrdaMon: delete " + it.currentKey() + "!");
                 qcopsend = TRUE;
             }
             ++it;
         }
         /* XXX if( qcopsend ) {
             QCopEnvelope e("QPE/Network", "irdaSend(bool)" );
@@ -248,14 +254,13 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) {
     /* Refresh active state */
     timerEvent(NULL);
 
         //menu->insertItem( tr("More..."), 4 );
 
     if (irdaactive && devicesAvailable.count() > 0) {
-        menu->insertItem( tr("Discovered Device:"),  9);
-
+        menu->insertItem( tr("Discovered Device:"), 9);
         QDictIterator<QString> it( devicesAvailable );
         while ( it.current() ) {
             menu->insertItem( *devicesAvailable[it.currentKey()]);
             ++it;
         }
         menu->insertSeparator();
@@ -313,15 +318,12 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) {
     }
     case 5: { // disable receive
         setIrdaReceiveStatus(1);
         timerEvent(NULL);
         break;
     }
-    case 6:
-        qDebug("FIXME: Bring up pretty menu...\n");
-        // With table of currently-detected devices.
     }
     delete menu; // Can somebody explain why use a QPopupMenu* and not QPopupMenu nor QAction. with out delete we will leak cause QPopupMenu doesn't have a parent in this case
 }
 
 void IrdaApplet::timerEvent( QTimerEvent * ) {
     int oldactive = irdaactive;
@@ -346,13 +348,13 @@ void IrdaApplet::timerEvent( QTimerEvent * ) {
     }
 
 }
 
 void IrdaApplet::paintEvent( QPaintEvent* ) {
     QPainter p(this);
-    qDebug("paint irda pixmap");
+    // qDebug("paint irda pixmap");
 
     p.eraseRect ( 0, 0, this->width(), this->height() );
     if (irdaactive > 0) {
         p.drawPixmap( 0, 0,  irdaOnPixmap );
     } else {
         p.drawPixmap( 0, 0,  irdaOffPixmap );
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h
index 7b37847..e878946 100644
--- a/core/applets/irdaapplet/irda.h
+++ b/core/applets/irdaapplet/irda.h
@@ -44,12 +44,15 @@ private:
     int checkIrdaDiscoveryStatus();
     int setIrdaDiscoveryStatus(int);
     int setIrdaReceiveStatus(int);
     void showDiscovered();
     int sockfd;
 
+public slots:
+    void show();
+
 private slots:
     void popupTimeout();
 
 private:
     QPixmap irdaOnPixmap;
     QPixmap irdaOffPixmap;
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro
index 035b0c1..47267f7 100644
--- a/core/applets/irdaapplet/irdaapplet.pro
+++ b/core/applets/irdaapplet/irdaapplet.pro
@@ -6,20 +6,23 @@ TARGET    = irdaapplet
 DESTDIR   = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 
-TRANSLATIONS = ../../i18n/de/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/en/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/es/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/fr/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/hu/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/ja/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/ko/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/no/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/pl/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/pt/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/pt_BR/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/sl/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/zh_CN/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/zh_TW/libirdaapplet.ts
+
+
+TRANSLATIONS = ../../../i18n/de/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/en/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/es/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/fr/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/hu/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/ja/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/ko/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/no/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/pl/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/pt/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/pt_BR/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/sl/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/zh_CN/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/zh_TW/libirdaapplet.ts
+
diff --git a/core/applets/irdaapplet/opie-irdaapplet.control b/core/applets/irdaapplet/opie-irdaapplet.control
index 85c3386..5b901de 100644
--- a/core/applets/irdaapplet/opie-irdaapplet.control
+++ b/core/applets/irdaapplet/opie-irdaapplet.control
@@ -1,7 +1,7 @@
-Files: plugins/applets/libirdaapplet.so* pics/irdaapplet/*
+Files: plugins/applets/libirdaapplet.so* pics/irdaapplet/* sounds/irdaapplet/*.wav
 Priority: optional
 Section: opie/system
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: opie-base ($QPE_VERSION), libopieobex