From 7c8c73dd5cf84050a8a2c51b04d7f5278b409fd7 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Sun, 21 Oct 2012 14:54:53 +0200
Subject: fix sdremote related configure switches

sdremote itself apparently works also over IP (WLAN), so we don't need to
disable it when we just don't want/have bluetooth. And also dbus is also
needed in the bluez case

Change-Id: I55ba07cd715d1e9bd641ef28e2391e4fe85b85e0
---
 sd/source/ui/remotecontrol/Server.cxx | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'sd/source/ui/remotecontrol')

diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index deb881431f82..220a3b237ac5 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -175,7 +175,9 @@ void RemoteServer::setup()
     spServer = new RemoteServer();
     spServer->launch();
 
+#ifdef ENABLE_BLUETOOTH
     sd::BluetoothServer::setup( &(spServer->mCommunicators) );
+#endif
 }
 
 
@@ -307,11 +309,17 @@ void SdDLL::RegisterRemotes()
 
 bool RemoteServer::isBluetoothDiscoverable()
 {
+#ifdef ENABLE_BLUETOOTH
     return BluetoothServer::isDiscoverable();
+#else
+    return false;
+#endif
 }
 
 void RemoteServer::setBluetoothDiscoverable( bool aDiscoverable )
 {
+#ifdef ENABLE_BLUETOOTH
     BluetoothServer::setDiscoverable( aDiscoverable );
+#endif
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit