[Libreoffice-commits] .: sd/source

[Libreoffice Gerrit user]

 sd/source/ui/remotecontrol/BluetoothServer.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0d68487f10de1783974a41592526e6df55cf97e9
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Thu Aug 23 11:41:36 2012 +0200

    Disable bluetooth on Linux for glib < 2.26.
    
    Change-Id: If5fae4166b2f935f5d7613799370dd0de28b498c

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 556bc59..a2de11c 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