Fix memleak and add OBEX receive support

2 files changed, 18 insertions, 8 deletions

diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index a197957..67e7f22 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -24,8 +24,10 @@
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
+#include <qpe/ir.h>
+#include <qpe/qcopenvelope_qws.h>
 
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qpoint.h>
@@ -148,9 +150,12 @@ void IrdaApplet::mousePressEvent( QMouseEvent *)
 		menu->insertItem( tr("Disable Discovery"), 2 );
 	else
 		menu->insertItem( tr("Enable Discovery"), 3 );
 
-	QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) );
+	if( Ir::supported() ){
+	  menu->insertItem( tr("Enable Receive"), 4 );
+	}
+	QPoint p = mapToGlobal( QPoint(1, menu->sizeHint().height()-1) );
 	ret = menu->exec(p, 2);
 
 	qDebug("ret was %d\n", ret);
 
@@ -168,15 +173,21 @@ void IrdaApplet::mousePressEvent( QMouseEvent *)
 		timerEvent(NULL);
 		break;
 	case 3:
 		setIrdaDiscoveryStatus(1);
-		timerEvent(NULL);
+		timerEvent(NULL); // NULL is undefined in c++ use 0 or 0l
+		break;
+	case 4: { // enable receive{
+	  qWarning("Enable receive" );
+	  QCopEnvelope e("QPE/Obex", "receive(bool)" );
+	  e << true;
 		break;
-	case 4:
+	}
+	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 * )
 {
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h
index 2f84909..bb174e8 100644
--- a/core/applets/irdaapplet/irda.h
+++ b/core/applets/irdaapplet/irda.h
@@ -11,10 +11,10 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
-#ifndef __SCREENSHOT_APPLET_H__
-#define __SCREENSHOT_APPLET_H__
+#ifndef SCREENSHOT_APPLET_H__
+#define SCREENSHOT_APPLET_H__
 
 
 
 #include <qwidget.h>
@@ -34,9 +34,8 @@ public:
 
 protected:
     void timerEvent(QTimerEvent *te );
 
-public slots:
 private:
     void mousePressEvent( QMouseEvent * );
     void paintEvent( QPaintEvent* );
     int checkIrdaStatus();
@@ -48,9 +47,9 @@ private:
 private:
     QPixmap irdaOnPixmap;
     QPixmap irdaOffPixmap;
     QPixmap irdaDiscoveryOnPixmap;
-    int irdaactive;
+    int irdaactive; // bool and bitfields later bool irdaactive :1 ;
     int irdaDiscoveryActive;
 
 private slots: