summaryrefslogtreecommitdiff
path: root/core
authorzecke <zecke>2004-11-20 18:11:28 (UTC)
committer zecke <zecke>2004-11-20 18:11:28 (UTC)
commit244e3fd05f01859a82243347ddc11318788cefb2 (patch) (unidiff)
tree2dc49366e4cc6f704b6e7c15f579df87a7099579 /core
parentd6ca3f9c89204880938391c0b5a70a33b6808f18 (diff)
downloadopie-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
Diffstat (limited to 'core') (more/less context) (show whitespace changes)
-rw-r--r--core/applets/irdaapplet/irda.cpp6
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
@@ -18,13 +18,14 @@
18 18
19/* OPIE */ 19/* OPIE */
20#include <opie2/otaskbarapplet.h> 20#include <opie2/otaskbarapplet.h>
21#include <qpe/applnk.h> 21#include <qpe/applnk.h>
22#include <qpe/resource.h> 22#include <qpe/resource.h>
23#include <qpe/qcopenvelope_qws.h> 23#include <qpe/qcopenvelope_qws.h>
24using namespace Opie::Ui; 24#include <qpe/ir.h>
25
25 26
26/* QT */ 27/* QT */
27#include <qpainter.h> 28#include <qpainter.h>
28#include <qfile.h> 29#include <qfile.h>
29#include <qtimer.h> 30#include <qtimer.h>
30#include <qtextstream.h> 31#include <qtextstream.h>
@@ -263,12 +264,15 @@ void IrdaApplet::mousePressEvent ( QMouseEvent * )
263 } 264 }
264 265
265 menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 ); 266 menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 );
266 267
267 if ( m_irda_active ) { 268 if ( m_irda_active ) {
268 menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 ); 269 menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 );
270
271 /* Only Receive if OBEX is installed */
272 if( Ir::supported() )
269 menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 ); 273 menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 );
270 } 274 }
271 275
272 QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); 276 QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );
273 QSize s = menu-> sizeHint ( ); 277 QSize s = menu-> sizeHint ( );
274 278