summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2012-08-23 11:41:36 +0200
committerAndrzej J.R. Hunt <andrzej@ahunt.org>2012-08-23 11:42:57 +0200
commit0d68487f10de1783974a41592526e6df55cf97e9 (patch)
tree58987f9066aae16cb77769b8a8bfd12295ac1c00 /sd
parentc02e838ec21408cd5ba70e0e7b53309411d49db2 (diff)
Disable bluetooth on Linux for glib < 2.26.
Change-Id: If5fae4166b2f935f5d7613799370dd0de28b498c
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/remotecontrol/BluetoothServer.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 556bc590f717..a2de11ce351f 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -10,6 +10,7 @@
#include <stdio.h>
#ifdef LINUX
+#include <glib.h>
#include <gio/gio.h>
#include <sys/unistd.h>
#include <sys/socket.h>
@@ -53,6 +54,7 @@ struct oslSocketImpl {
void BluetoothServer::execute()
{
#ifdef LINUX
+#ifdef GLIB_VERSION_2_26
g_type_init();
GError* aError = NULL;
GDBusConnection* aConnection = g_bus_get_sync( G_BUS_TYPE_SYSTEM, NULL, &aError );
@@ -191,7 +193,8 @@ void BluetoothServer::execute()
}
-#endif
+#endif // GLIB_VERSION_2_26
+#endif // LINUX
#ifdef WIN32