Stop fooling the user and allow receiving of files only if

Ir::supported returns true. This is the case if our
obex implementation is loaded

1 files changed, 5 insertions, 1 deletions

diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index 6148308..7709bed 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -1,48 +1,49 @@
 /**********************************************************************
 ** Copyright (C) 2002 David Woodhouse <dwmw2@infradead.org>
 **                    Max Reiss <harlekin@handhelds.org> [trivial stuff]
 **                    Robert Griebl <sandman@handhelds.org>
 **                    Holger Freyther <zecke@handhelds.org> QCOP Interface
 **
 ** 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"
 
 /* OPIE */
 #include <opie2/otaskbarapplet.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
-using namespace Opie::Ui;
+#include <qpe/ir.h>
+
 
 /* QT */
 #include <qpainter.h>
 #include <qfile.h>
 #include <qtimer.h>
 #include <qtextstream.h>
 
 /* STD */
 #include <unistd.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
 //===========================================================================
 
 IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
 		: QWidget ( parent, name )
 {
     setFixedHeight( AppLnk::smallIconSize() );
     setFixedWidth( AppLnk::smallIconSize() );
 
     m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP );
@@ -245,48 +246,51 @@ void IrdaApplet::showDiscovered ( )
 
 void IrdaApplet::mousePressEvent ( QMouseEvent * )
 {
 	QPopupMenu *menu = new QPopupMenu ( this );
 	QString cmd;
 
 	/* Refresh active state */
 	timerEvent ( 0 );
 
 	//	menu->insertItem( tr("More..."), 4 );
 
 	if ( m_irda_active && !m_devices. isEmpty ( )) {
 		menu-> insertItem ( tr( "Discovered Device:" ), 9 );
 
 		for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it )
 			menu-> insertItem ( *it );
 
 		menu-> insertSeparator ( );
 	}
 
 	menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 );
 
 	if ( m_irda_active ) {
 		menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 );
+		
+		/* Only Receive if OBEX is installed */
+		if( Ir::supported() )
 		menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 );
 	}
 
 	QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );
 	QSize s = menu-> sizeHint ( );
 
 	p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ));
 
 	switch (  menu-> exec ( p )) {
 		case 0:
 			setIrdaStatus ( !m_irda_active );
 			timerEvent ( 0 );
 			break;
 		case 1:
 			setIrdaDiscoveryStatus ( !m_irda_discovery_active );
 			timerEvent ( 0 );
 			break;
 		case 2:
 			setIrdaReceiveStatus ( !m_receive_active );
 			timerEvent( 0 );
 			break;
 	}
 
 	delete menu;