diff options
| author | Rene Engelhard <rene@debian.org> | 2012-10-21 14:54:53 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2012-10-21 23:01:47 +0200 |
| commit | 7c8c73dd5cf84050a8a2c51b04d7f5278b409fd7 (patch) | |
| tree | cd340ea358a42b8638377102306b7e12df011e7e /sd/source/ui | |
| parent | 22238981b9f271d75f4d4c8b39b56cbc3616bff2 (diff) | |
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
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/dlg/RemoteDialog.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/Server.cxx | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx index c04e77b3bf54..1d52dc5448ef 100644 --- a/sd/source/ui/dlg/RemoteDialog.cxx +++ b/sd/source/ui/dlg/RemoteDialog.cxx @@ -28,9 +28,13 @@ RemoteDialog::RemoteDialog( Window *pWindow ) : #ifdef ENABLE_SDREMOTE FreeResource(); +#ifdef ENABLE_BLUETOOTH mPreviouslyDiscoverable = RemoteServer::isBluetoothDiscoverable(); if ( !mPreviouslyDiscoverable ) RemoteServer::setBluetoothDiscoverable( true ); +#else + RemoteServer::setBluetoothDiscoverable( false ); +#endif vector<ClientInfo*> aClients( RemoteServer::getClients() ); @@ -57,7 +61,7 @@ IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton) { // setBusy( true ); // Fixme: Try and connect -#ifdef ENABLE_SDREMOTE +#if defined(ENABLE_SDREMOTE) && defined(ENABLE_BLUETOOTH) long aSelected = mClientBox.GetActiveEntryIndex(); if ( aSelected < 0 ) return 1; @@ -75,7 +79,7 @@ IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton) IMPL_LINK_NOARG( RemoteDialog, CloseHdl ) { -#ifdef ENABLE_SDREMOTE +#if defined(ENABLE_SDREMOTE) && defined(ENABLE_BLUETOOTH) if ( !mPreviouslyDiscoverable ) { RemoteServer::setBluetoothDiscoverable( false ); 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: */ |