Fix memleak and add OBEX receive support

2 files changed, 19 insertions, 9 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
@@ -4,48 +4,50 @@
 **  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "irda.h"
 #include <qapplication.h>
 #include <stdlib.h>
 
 
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/timestring.h>
 #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>
 #include <qpushbutton.h>
 #include <qpainter.h>
 #include <qcombobox.h>
 #include <qspinbox.h>
 #include <qslider.h>
 #include <qlayout.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qfile.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
 
@@ -128,75 +130,84 @@ int IrdaApplet::setIrdaDiscoveryStatus(int d)
 
 	return 0;
 }
 
 void IrdaApplet::mousePressEvent( QMouseEvent *)
 {
 	QPopupMenu *menu = new QPopupMenu();
 	QString cmd;
 	int ret=0;
 
 	/* Refresh active state */
 	timerEvent(NULL);
 
 //	menu->insertItem( tr("More..."), 4 );
 	if (irdaactive)
 		menu->insertItem( tr("Disable IrDA"), 0 );
 	else
 		menu->insertItem( tr("Enable IrDA"), 1 );
 
 	if (irdaDiscoveryActive)
 		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);
 
 	switch(ret) {
 	case 0:
 		setIrdaStatus(0);
 		timerEvent(NULL);
 		break;
 	case 1:
 		setIrdaStatus(1);
 		timerEvent(NULL);
 		break;
 	case 2:
 		setIrdaDiscoveryStatus(0);
 		timerEvent(NULL);
 		break;
 	case 3:
 		setIrdaDiscoveryStatus(1);
-		timerEvent(NULL);
+		timerEvent(NULL); // NULL is undefined in c++ use 0 or 0l
 		break;
-	case 4:
+	case 4: { // enable receive{
+	  qWarning("Enable receive" );
+	  QCopEnvelope e("QPE/Obex", "receive(bool)" );
+	  e << true;
+	  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;
     int olddiscovery = irdaDiscoveryActive;
 
     irdaactive = checkIrdaStatus();
     irdaDiscoveryActive = checkIrdaDiscoveryStatus();
 
     if ((irdaactive != oldactive) || (irdaDiscoveryActive != olddiscovery))
 	    paintEvent(NULL);
     
 }
 
 void IrdaApplet::paintEvent( QPaintEvent* )
 {
 	QPainter p(this);
 	qDebug("paint irda pixmap");
 
 	p.eraseRect ( 0, 0, this->width(), this->height() );
 	if (irdaactive > 0)
 		p.drawPixmap( 0, 1,  irdaOnPixmap );
 	else
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
@@ -1,62 +1,61 @@
 /**********************************************************************
 ** Copyright (C) 2002 L.J. Potter ljp@llornkcor.com
 **  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** 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>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qguardedptr.h>
 #include <qtimer.h>
 #include <qfile.h>
 
 
 class IrdaApplet : public QWidget
 {
     Q_OBJECT
 public:
     IrdaApplet( QWidget *parent = 0, const char *name=0 );
     ~IrdaApplet();
 
 protected:
     void timerEvent(QTimerEvent *te );
 
-public slots:
 private:
     void mousePressEvent( QMouseEvent * );
     void paintEvent( QPaintEvent* );
     int checkIrdaStatus();
     int setIrdaStatus(int);
     int checkIrdaDiscoveryStatus();
     int setIrdaDiscoveryStatus(int);
     int sockfd;
 
 private:
     QPixmap irdaOnPixmap;
     QPixmap irdaOffPixmap;
     QPixmap irdaDiscoveryOnPixmap;
-    int irdaactive;
+    int irdaactive; // bool and bitfields later bool irdaactive :1 ;
     int irdaDiscoveryActive;
 
 private slots:
 
         
 };
 
 
 #endif // __SCREENSHOT_APPLET_H__