author | korovkin <korovkin> | 2006-05-09 12:38:24 (UTC) |
---|---|---|
committer | korovkin <korovkin> | 2006-05-09 12:38:24 (UTC) |
commit | 620d55ae3b94fa8d2fa696b6626893e4520c3a02 (patch) (side-by-side diff) | |
tree | ca1296808dfac6fa6c74086f4dda6af525d7b151 /noncore/net/opietooth/applet/bluezapplet.cpp | |
parent | dc719be35432469c24dd8d10136c1ea25c6861d2 (diff) | |
download | opie-620d55ae3b94fa8d2fa696b6626893e4520c3a02.zip opie-620d55ae3b94fa8d2fa696b6626893e4520c3a02.tar.gz opie-620d55ae3b94fa8d2fa696b6626893e4520c3a02.tar.bz2 |
Instead of calling a process, do ::system on stop and use QCopEnvelope on start.
Diffstat (limited to 'noncore/net/opietooth/applet/bluezapplet.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 48 |
1 files changed, 12 insertions, 36 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index 9c6c71d..90b0c6d 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp @@ -46,25 +46,25 @@ using namespace Opie::Core; #include <qpainter.h> #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> -// #define OPIE120 // undefine it fo the latest OPIE +#define OPIE120 // undefine it fo the latest OPIE namespace OpieTooth { BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { setFixedHeight( AppLnk::smallIconSize() ); setFixedWidth( AppLnk::smallIconSize() ); #ifdef OPIE120 bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass.png" ); #else bluezOnPixmap = OResource::loadImage( "bluetoothapplet/bluezon", OResource::SmallIcon ); bluezOffPixmap = OResource::loadImage( "bluetoothapplet/bluezoff", Opie::Core::OResource::SmallIcon ); @@ -74,102 +74,86 @@ namespace OpieTooth { btDevice = 0; btManager = 0; bluezactive = false; bluezDiscoveryActive = false; doListDevice = false; isScanning = false; m_wasOn = 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&) ) ); - - OProcess* btstart = new OProcess(); - *btstart << "/etc/init.d/bluetooth" << "stop"; - btstart->setUseShell(true); - if (!btstart->start(OProcess::DontCare, OProcess::AllOutput)) - delete btstart; - else { - connect(btstart, SIGNAL(processExited(Opie::Core::OProcess*)), - this, SLOT(slotProcessExited(Opie::Core::OProcess*))); - } + ::system("/etc/init.d/bluetooth stop >/dev/null 2>/dev/null"); } BluezApplet::~BluezApplet() { if ( btDevice ) { delete btDevice; } if ( btManager ) { delete btManager; } } 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) { - OProcess* btstart = new OProcess(); 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; } - *btstart << "/etc/init.d/bluetooth" << "start"; - btstart->setUseShell(true); - if (!btstart->start(OProcess::DontCare, OProcess::AllOutput)) - delete btstart; - else { - connect(btstart, SIGNAL(processExited(Opie::Core::OProcess*)), - this, SLOT(slotProcessExited(Opie::Core::OProcess*))); - } + QCopEnvelope e("QPE/System", "execute(QString)"); + e << QString("/etc/init.d/bluetooth start"); } else { - *btstart << "/etc/init.d/bluetooth" << "stop"; - btstart->setUseShell(true); - if (!btstart->start(OProcess::DontCare, OProcess::AllOutput)) - delete btstart; - else { - connect(btstart, SIGNAL(processExited(Opie::Core::OProcess*)), - this, SLOT(slotProcessExited(Opie::Core::OProcess*))); + ::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; } @@ -253,24 +237,25 @@ int BluezApplet::position() //menu->insertItem( tr("Signal strength"), signal, 5); //menu->insertSeparator(8); if (bluezDiscoveryActive) { menu->insertItem( tr("Disable discovery"), 3 ); } else { menu->insertItem( tr("Enable discovery"), 4 ); } QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) ); ret = menu->exec(p, 0); + menu->hide(); switch(ret) { case 0: setBluezStatus(0); timerEvent( 0 ); break; case 1: setBluezStatus(1); timerEvent( 0 ); break; case 2: // start bluetoothmanager @@ -339,26 +324,17 @@ int BluezApplet::position() } else { #ifdef OPIE120 p.drawPixmap( 0, -1, bluezOffPixmap ); #else p.drawPixmap( 0, 0, bluezOffPixmap ); #endif } if (bluezDiscoveryActive) { p.drawPixmap( 0, 0, bluezDiscoveryOnPixmap ); } } - -/** - * Implementation of the process finish - * @param the finished process - */ - void BluezApplet::slotProcessExited(OProcess* proc) - { - delete proc; - } }; EXPORT_OPIE_APPLET_v1( OpieTooth::BluezApplet ) |