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
@@ -57,3 +57,3 @@ using namespace Opie::Core;
 
-// #define OPIE120 // undefine it fo the latest OPIE
+#define OPIE120 // undefine it fo the latest OPIE
 
@@ -85,12 +85,3 @@ namespace OpieTooth {
                 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");
     }
@@ -106,6 +97,6 @@ namespace OpieTooth {
 
-int BluezApplet::position()
-{
+    int BluezApplet::position()
+    {
         return 6;
-}
+    }
 
@@ -115,4 +106,6 @@ int BluezApplet::position()
             if (btDevice->isLoaded() ) {
+                odebug << "btDevice isLoaded" << oendl;
                 return true;
             } else {
+                odebug << "btDevice is NOT loaded" << oendl;
                 return false;
@@ -120,2 +113,3 @@ int BluezApplet::position()
         } else {
+            odebug << "btDevice is ZERO" << oendl;
             return false;
@@ -126,3 +120,2 @@ int BluezApplet::position()
 
-        OProcess* btstart = new OProcess();
         if ( c == 1 ) {
@@ -147,18 +140,9 @@ int BluezApplet::position()
             }
-            *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;
             }
@@ -199,3 +183,3 @@ int BluezApplet::position()
             doListDevice = false;
-	    }
+        }
         else if ( str == "listDevices()") {
@@ -264,2 +248,3 @@ int BluezApplet::position()
         ret = menu->exec(p, 0);
+        menu->hide();
 
@@ -350,11 +335,2 @@ int BluezApplet::position()
     }
-
-/**
- * Implementation of the process finish
- * @param the finished process
- */
-    void BluezApplet::slotProcessExited(OProcess* proc) 
-    {
-        delete proc;
-    }
 };
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
@@ -75,4 +75,2 @@ private slots:
         void slotMessage( const QCString& , const QByteArray& );
-        void slotProcessExited(Opie::Core::OProcess* proc);
-
     };