Instead of calling a process, do ::system on stop and use QCopEnvelope on start.

2 files changed, 16 insertions, 42 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
@@ -52,13 +52,13 @@ using namespace Opie::Core;
 #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
@@ -80,54 +80,47 @@ namespace OpieTooth {
         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()
-{
+    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;
 
@@ -142,28 +135,19 @@ int BluezApplet::position()
 #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;
             }
        }
@@ -194,13 +178,13 @@ int BluezApplet::position()
              * 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");
@@ -259,12 +243,13 @@ int BluezApplet::position()
             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;
@@ -345,20 +330,11 @@ int BluezApplet::position()
         }
 
         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 )
 
diff --git a/noncore/net/opietooth/applet/bluezapplet.h b/noncore/net/opietooth/applet/bluezapplet.h
index 85022bb..90bee3b 100644
--- a/noncore/net/opietooth/applet/bluezapplet.h
+++ b/noncore/net/opietooth/applet/bluezapplet.h
@@ -70,14 +70,12 @@ public slots:
         bool doListDevice; //If I have to list devices after bringing BT up?
         bool isScanning; //If I'm scanning devices
         bool m_wasOn; //If BT was started by menu?
 
 private slots:
         void slotMessage( const QCString& , const QByteArray& );
-        void slotProcessExited(Opie::Core::OProcess* proc);
-
     };
 };
 
 
 #endif