Merge branch 'disable_bluez4' into 'master'

[buteo-syncfw] Disable Bluez(4) usage. Contributes to JB#50145 See merge request mer-core/buteo-syncfw!50
sailfishos · Jun 5, 2020 · 7cb81e5 · 7cb81e5
2 parents 5f1db61 + afab121
commit 7cb81e5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/libbuteosyncfw/common/TransportTracker.cpp b/libbuteosyncfw/common/TransportTracker.cpp
@@ -64,6 +64,7 @@ TransportTracker::TransportTracker(QObject *aParent) :
     }
 #endif
 
+#if HAVE_BLUEZ_4
     // BT
     // Set the bluetooth state
     iTransportStates[Sync::CONNECTIVITY_BT] = btConnectivityStatus();
@@ -76,6 +77,7 @@ TransportTracker::TransportTracker(QObject *aParent) :
     {
         LOG_WARNING("Unable to connect to system bus for org.bluez.Adapter");
     }
+#endif
 
     // Internet
     // @todo: enable when internet state is reported correctly.
@@ -160,6 +162,7 @@ void TransportTracker::updateState(Sync::ConnectivityType aType,
 
 bool TransportTracker::btConnectivityStatus()
 {
+#if HAVE_BLUEZ_4
     FUNCTION_CALL_TRACE;
 
     bool btOn = false;
@@ -211,4 +214,7 @@ bool TransportTracker::btConnectivityStatus()
         }
     }
     return btOn;
+#else
+    return false;
+#endif
 }
diff --git a/libbuteosyncfw/common/TransportTracker.h b/libbuteosyncfw/common/TransportTracker.h
@@ -89,7 +89,7 @@ class TransportTracker : public QObject
 
 private slots:
 
-        void onUsbStateChanged(bool aConnected);
+    void onUsbStateChanged(bool aConnected);
 
     void onBtStateChanged(QString aKey, QDBusVariant aValue);