OBEX push functionality moved to libbluetooth1.

Made some reformatting in device.cc
In bluezapplet.cpp /etc/init.d/bluetooth is started synchronously if it's called from QCopMessage.

2 files changed, 9 insertions, 5 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
@@ -118,3 +118,3 @@ namespace OpieTooth {
 
-    int BluezApplet::setBluezStatus(int c) {
+    int BluezApplet::setBluezStatus(int c, bool sync) {
 
@@ -140,4 +140,8 @@ namespace OpieTooth {
             }
-            QCopEnvelope e("QPE/System", "execute(QString)");
-            e << QString("/etc/init.d/bluetooth start");
+            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 {
@@ -171,3 +175,3 @@ namespace OpieTooth {
             if (!m_wasOn) {
-                setBluezStatus(1);
+                setBluezStatus(1, true);
                 sleep(2);
diff --git a/noncore/net/opietooth/applet/bluezapplet.h b/noncore/net/opietooth/applet/bluezapplet.h
index 90bee3b..1937934 100644
--- a/noncore/net/opietooth/applet/bluezapplet.h
+++ b/noncore/net/opietooth/applet/bluezapplet.h
@@ -57,3 +57,3 @@ public slots:
         bool checkBluezStatus();
-        int setBluezStatus(int);
+        int setBluezStatus(int, bool sync = false);
         int checkBluezDiscoveryStatus();