mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace DBusGObjectPath with char to hopefully compile on older dbus-glib.

Browse Source 
The typedef for DBusGObjectPath is only present in newer versions of dbus-glib.
It is equivalent to a gchar.

Change-Id: I1660234760fde7c7d88721f39d86a820c89040cc
This commit is contained in:
Andrzej J.R. Hunt
2012-09-06 20:22:28 +02:00
parent 0112978874
commit cbb8612465
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sd/source/ui/remotecontrol/BluetoothServer.cxx
View File

@@ -64,7 +64,9 @@ void BluetoothServer::execute()
} }
gboolean aResult; 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, aResult = dbus_g_proxy_call( aManager, "DefaultAdapter", &aError,
G_TYPE_INVALID, G_TYPE_INVALID,
DBUS_TYPE_G_OBJECT_PATH, &aAdapterPath, DBUS_TYPE_G_OBJECT_PATH, &aAdapterPath,

6
sd/source/ui/remotecontrol/DiscoveryService.cxx
View File

@@ -65,14 +65,16 @@ DiscoveryService::~DiscoveryService()
void DiscoveryService::execute() void DiscoveryService::execute()
{ {
char aBuffer[BUFFER_SIZE]; char aBuffer[BUFFER_SIZE];
fprintf( stderr,"Created\n" );
while ( true ) while ( true )
{ {
memset( aBuffer, 0, sizeof(char) * BUFFER_SIZE ); memset( aBuffer, 0, sizeof(char) * BUFFER_SIZE );
sockaddr_in aAddr; sockaddr_in aAddr;
socklen_t aLen = sizeof( aAddr ); socklen_t aLen = sizeof( aAddr );
fprintf( stderr,"REcing\n" );
recvfrom( mSocket, aBuffer, BUFFER_SIZE, 0, (sockaddr*) &aAddr, &aLen ); recvfrom( mSocket, aBuffer, BUFFER_SIZE, 0, (sockaddr*) &aAddr, &aLen );
fprintf( stderr,"Reced\n" );
fprintf( stderr, "Received from\n" );
OString aString( aBuffer, strlen( "LOREMOTE_SEARCH" ) ); OString aString( aBuffer, strlen( "LOREMOTE_SEARCH" ) );
if ( aString.compareTo( "LOREMOTE_SEARCH" ) == 0 ) if ( aString.compareTo( "LOREMOTE_SEARCH" ) == 0 )
{ {