author | zecke <zecke> | 2004-11-20 18:11:28 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-11-20 18:11:28 (UTC) |
commit | 244e3fd05f01859a82243347ddc11318788cefb2 (patch) (unidiff) | |
tree | 2dc49366e4cc6f704b6e7c15f579df87a7099579 /core | |
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 | 6 |
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 | |||
@@ -12,25 +12,26 @@ | |||
12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
14 | ** | 14 | ** |
15 | **********************************************************************/ | 15 | **********************************************************************/ |
16 | 16 | ||
17 | #include "irda.h" | 17 | #include "irda.h" |
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> |
24 | using 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> |
31 | 32 | ||
32 | /* STD */ | 33 | /* STD */ |
33 | #include <unistd.h> | 34 | #include <unistd.h> |
34 | #include <net/if.h> | 35 | #include <net/if.h> |
35 | #include <netinet/in.h> | 36 | #include <netinet/in.h> |
36 | #include <sys/types.h> | 37 | #include <sys/types.h> |
@@ -257,24 +258,27 @@ void IrdaApplet::mousePressEvent ( QMouseEvent * ) | |||
257 | menu-> insertItem ( tr( "Discovered Device:" ), 9 ); | 258 | menu-> insertItem ( tr( "Discovered Device:" ), 9 ); |
258 | 259 | ||
259 | for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it ) | 260 | for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it ) |
260 | menu-> insertItem ( *it ); | 261 | menu-> insertItem ( *it ); |
261 | 262 | ||
262 | menu-> insertSeparator ( ); | 263 | menu-> insertSeparator ( ); |
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 | ||
275 | p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( )); | 279 | p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( )); |
276 | 280 | ||
277 | switch ( menu-> exec ( p )) { | 281 | switch ( menu-> exec ( p )) { |
278 | case 0: | 282 | case 0: |
279 | setIrdaStatus ( !m_irda_active ); | 283 | setIrdaStatus ( !m_irda_active ); |
280 | timerEvent ( 0 ); | 284 | timerEvent ( 0 ); |