[Libreoffice-commits] .: sd/source

[Libreoffice Gerrit user]

 sd/source/ui/remotecontrol/BluetoothServer.cxx  |    4 +++-
 sd/source/ui/remotecontrol/DiscoveryService.cxx |    6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit cbb8612465ec8d809ff00fef38bcc6cad1d4dac0
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Thu Sep 6 20:22:28 2012 +0200

    Replace DBusGObjectPath with char to hopefully compile on older dbus-glib.
    
    The typedef for DBusGObjectPath is only present in newer versions of dbus-glib.
    It is equivalent to a gchar.
    
    Change-Id: I1660234760fde7c7d88721f39d86a820c89040cc

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 170c51c..691951b 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -64,7 +64,9 @@ void BluetoothServer::execute()
     }
 
     gboolean aResult;
-    DBusGObjectPath *aAdapterPath = NULL;
+    // The following should be a DBusGObjectPath, however the necessary
+    // typedef is missing in older version of dbus-glib.
+    char *aAdapterPath = NULL;
     aResult = dbus_g_proxy_call( aManager, "DefaultAdapter", &aError,
                                  G_TYPE_INVALID,
                                  DBUS_TYPE_G_OBJECT_PATH, &aAdapterPath,
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 53e649c..51982a3 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -65,14 +65,16 @@ DiscoveryService::~DiscoveryService()
 void DiscoveryService::execute()
 {
     char aBuffer[BUFFER_SIZE];
-
+    fprintf( stderr,"Created\n" );
     while ( true )
     {
         memset( aBuffer, 0, sizeof(char) * BUFFER_SIZE );
         sockaddr_in aAddr;
         socklen_t aLen = sizeof( aAddr );
+            fprintf( stderr,"REcing\n" );
         recvfrom( mSocket, aBuffer, BUFFER_SIZE, 0, (sockaddr*) &aAddr, &aLen );
-
+            fprintf( stderr,"Reced\n" );
+        fprintf( stderr, "Received from\n" );
         OString aString( aBuffer, strlen( "LOREMOTE_SEARCH" ) );
         if ( aString.compareTo( "LOREMOTE_SEARCH" ) == 0 )
         {