diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-06 20:22:28 +0200 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-06 20:25:35 +0200 |
| commit | cbb8612465ec8d809ff00fef38bcc6cad1d4dac0 (patch) | |
| tree | e037a175033a709d30c2cb5833c3073f8ca44da0 | |
| parent | 01129788745ae8591a3ff9d2b46a54aaa58844c1 (diff) | |
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
| -rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/DiscoveryService.cxx | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 170c51c73116..691951b588fb 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 53e649c64b79..51982a348907 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 ) { |