Diffstat (limited to 'noncore/net/opietooth/applet/bluezapplet.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index 90b0c6d..6351d4e 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp @@ -95,102 +95,106 @@ namespace OpieTooth { } } int BluezApplet::position() { return 6; } bool BluezApplet::checkBluezStatus() { if (btDevice) { if (btDevice->isLoaded() ) { odebug << "btDevice isLoaded" << oendl; return true; } else { odebug << "btDevice is NOT loaded" << oendl; return false; } } else { odebug << "btDevice is ZERO" << oendl; return false; } } - int BluezApplet::setBluezStatus(int c) { + 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; #ifndef OPIE120 case Model_MyPal_716: btDevice = new Device( "/dev/ttyS1", "bcsp", "921600" ); break; #endif default: btDevice = new Device( "/dev/ttySB0", "bcsp", "230400" ); break; } + if (sync) { + ::system("/etc/init.d/bluetooth start >/dev/null 2>/dev/null"); + } else { QCopEnvelope e("QPE/System", "execute(QString)"); e << QString("/etc/init.d/bluetooth start"); + } } else { ::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; } int BluezApplet::checkBluezDiscoveryStatus() { return isScanning; } int BluezApplet::setBluezDiscoveryStatus(int d) { return bluezDiscoveryActive = d; } // FIXME mbhaynie // receiver for QCopChannel("QPE/Bluetooth") messages. void BluezApplet::slotMessage( const QCString& str, const QByteArray& ) { if ( str == "enableBluetooth()") { m_wasOn = checkBluezStatus(); if (!m_wasOn) { - setBluezStatus(1); + setBluezStatus(1, true); sleep(2); } } else if ( str == "disableBluetooth()") { /* * We can down BT only if it was started by qcop. We don't want * to down BT started from menu an break our networking connection */ if (checkBluezStatus() && !m_wasOn) setBluezStatus(0); doListDevice = false; } else if ( str == "listDevices()") { if (checkBluezStatus()) { doListDevice = false; timerEvent(0); if (!btManager) { btManager = new Manager("hci0"); connect( btManager, SIGNAL( foundDevices(const QString&, RemoteDevice::ValueList) ), this, SLOT( fillList(const QString&, RemoteDevice::ValueList) ) ) ; } btManager->searchDevices(); isScanning = true; |