author | korovkin <korovkin> | 2006-05-14 15:38:20 (UTC) |
---|---|---|
committer | korovkin <korovkin> | 2006-05-14 15:38:20 (UTC) |
commit | 782a34192c2c879a80fd319153a2b2f48ded1c99 (patch) (side-by-side diff) | |
tree | 55f9d66e747876ffa2e87cf30eaafaf33864597a /noncore/net/opietooth/applet/bluezapplet.cpp | |
parent | 273ffc42b3f0ce593e0d20874a7f224328416445 (diff) | |
download | opie-782a34192c2c879a80fd319153a2b2f48ded1c99.zip opie-782a34192c2c879a80fd319153a2b2f48ded1c99.tar.gz opie-782a34192c2c879a80fd319153a2b2f48ded1c99.tar.bz2 |
Script must be started after device is started up.
We should wait for 1 second after device is brought up.
Fixed an error in hcicongig hci0 up.
Diffstat (limited to 'noncore/net/opietooth/applet/bluezapplet.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index f7774f0..127b0af 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp @@ -77,6 +77,7 @@ namespace OpieTooth { 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 ); @@ -87,6 +88,7 @@ namespace OpieTooth { BluezApplet::~BluezApplet() { if ( btDevice ) { + ::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null"); delete btDevice; } if ( btManager ) { @@ -127,7 +129,7 @@ namespace OpieTooth { btDevice = new Device( "/dev/tts/1", "any", "921600" ); break; -#ifndef OPIE120 +#if OPIE_VERSION >= 102010 case Model_MyPal_716: btDevice = new Device( "/dev/ttyS1", "bcsp", "921600" ); break; @@ -137,12 +139,10 @@ namespace OpieTooth { 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"); - } + m_sync = sync; + connect(btDevice, SIGNAL(device(const QString&, bool)), + this, SLOT(slotDevice(const QString&, bool))); + } else { ::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null"); if ( btManager ) { @@ -336,6 +336,23 @@ namespace OpieTooth { p.drawPixmap( 0, 0, bluezDiscoveryOnPixmap ); } } + /** + * Reacts on device up + * @param name device name + * @param up if device was brought up + */ + void BluezApplet::slotDevice(const QString& name, bool up) + { + if (!up) + return; + odebug << name << " is up" << oendl; + if (m_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"); + } + } }; |