bluez plugin: Emitting failed() when BlueZ disappears from D-Bus.

2 files changed, 11 insertions, 3 deletions

diff --git a/libcontextsubscriber/plugins/bluez/bluezinterface.cpp b/libcontextsubscriber/plugins/bluez/bluezinterface.cpp
index 91c52601..96637cd0 100644
--- a/libcontextsubscriber/plugins/bluez/bluezinterface.cpp
+++ b/libcontextsubscriber/plugins/bluez/bluezinterface.cpp
@@ -42,8 +42,16 @@ BluezInterface::BluezInterface() : manager(0), adapter(0)
 
 void BluezInterface::onNameOwnerChanged(QString name, QString /*oldOwner*/, QString newOwner)
 {
-    if (name == serviceName && newOwner != "") {
-        connectToBluez();
+    if (name == serviceName) {
+        if (newOwner != "") {
+            // BlueZ appeared -> connect to it. If successful, ready()
+            // will be emitted when the connection is established.
+            connectToBluez();
+        }
+        else {
+            // BlueZ disappeared
+            emit failed("BlueZ left D-Bus");
+        }
     }
 }
 
diff --git a/libcontextsubscriber/plugins/bluez/bluezplugin.cpp b/libcontextsubscriber/plugins/bluez/bluezplugin.cpp
index 0728dd75..f18f5007 100644
--- a/libcontextsubscriber/plugins/bluez/bluezplugin.cpp
+++ b/libcontextsubscriber/plugins/bluez/bluezplugin.cpp
@@ -35,7 +35,7 @@ BluezPlugin::BluezPlugin()
     // Connect signals from the Bluez interface. The events we listen to are:
     // - interface getting connected to Bluez
     // - interface failing to connect to Bluez
-    // - interface losing connection to Bluez         TODO: implement
+    // - interface losing connection to Bluez
     // - Bluez property changing
     sconnect(&bluezInterface, SIGNAL(ready()),
              this, SIGNAL(ready()));