author | zecke <zecke> | 2004-11-20 18:11:28 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-11-20 18:11:28 (UTC) |
commit | 244e3fd05f01859a82243347ddc11318788cefb2 (patch) (side-by-side diff) | |
tree | 2dc49366e4cc6f704b6e7c15f579df87a7099579 | |
parent | d6ca3f9c89204880938391c0b5a70a33b6808f18 (diff) | |
download | opie-244e3fd05f01859a82243347ddc11318788cefb2.zip opie-244e3fd05f01859a82243347ddc11318788cefb2.tar.gz opie-244e3fd05f01859a82243347ddc11318788cefb2.tar.bz2 |
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
-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 8 |
1 files changed, 6 insertions, 2 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 @@ -18,13 +18,14 @@ /* 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> @@ -263,13 +264,16 @@ void IrdaApplet::mousePressEvent ( QMouseEvent * ) } 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 ); - menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 ); + + /* 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 ( )); |