| -rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index 32560a1..91ab2e1 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp @@ -48,49 +48,49 @@ using namespace Opie::Core; #include <qlayout.h> #include <qframe.h> #include <qpixmap.h> #include <qstring.h> #include <qtimer.h> #include <qpopupmenu.h> #include <qmessagebox.h> /* STD */ #include <device.h> namespace OpieTooth { BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { setFixedHeight( AppLnk::smallIconSize() ); setFixedWidth( AppLnk::smallIconSize() ); #if OPIE_VERSION < 102010 bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass.png" ); bluezReceiveOnPixmap = Resource::loadPixmap( "bluetoothapplet/receive.png" ); #else bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon ); bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon ); bluezDiscoveryOnPixmap = OResource::loadImage( "bluetoothapplet/bluezondiscovery", Opie::Core::OResource::SmallIcon ); - bluezReceiveOnPixmap = )Resource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon ); + bluezReceiveOnPixmap = Resource::loadImage( "bluetoothapplet/bluezonreceive", Opie::Core::OResource::SmallIcon ); #endif startTimer(2000); btDevice = 0; btManager = 0; bluezactive = false; bluezDiscoveryActive = false; bluezReceiveActive = false; bluezReceiveChanged = false; doListDevice = false; isScanning = false; m_wasOn = false; m_sync = false; // TODO: determine whether this channel has to be closed at destruction time. QCopChannel* chan = new QCopChannel("QPE/Bluetooth", this ); connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), this, SLOT(slotMessage(const QCString&,const QByteArray&) ) ); ::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null"); } BluezApplet::~BluezApplet() { if ( btDevice ) { ::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null"); delete btDevice; @@ -117,51 +117,51 @@ namespace OpieTooth { } } else { odebug << "btDevice is ZERO" << oendl; return false; } } int BluezApplet::setBluezStatus(int c, bool sync) { if ( c == 1 ) { switch ( ODevice::inst()->model() ) { case Model_iPAQ_H39xx: btDevice = new Device( "/dev/tts/1", "bcsp", "921600" ); break; case Model_iPAQ_H5xxx: btDevice = new Device( "/dev/tts/1", "any", "921600" ); break; #if OPIE_VERSION >= 102010 case Model_MyPal_716: btDevice = new Device( "/dev/ttyS1", "bcsp", "921600" ); break; #endif - case Model_iPAQ_H22xx: - btDevice = new Device( "/dev/tts/3", "any", "921600" ); - break; + case Model_iPAQ_H22xx: + btDevice = new Device( "/dev/tts/3", "any", "921600" ); + break; default: btDevice = new Device( "/dev/ttySB0", "bcsp", "230400" ); break; } m_sync = sync; connect(btDevice, SIGNAL(device(const QString&, bool)), this, SLOT(slotDevice(const QString&, bool))); } else { setObexRecieveStatus(0); ::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null"); if ( btManager ) { delete btManager; btManager = 0; } if ( btDevice ) { delete btDevice; btDevice = 0; } } return 0; } |