jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

merge from official dbus-c++ fd.org repo

Browse source 
Merge git://anongit.freedesktop.org/git/dbus/dbus-c++

Conflicts:

	configure.ac
	examples/Makefile.am
This commit is contained in:
Andreas Volz 2008-08-30 11:06:07 +02:00
commit fc54ec2a0b
17 changed files with 275 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/eventloop.cpp
View file

@ -78,42 +78,22 @@ DefaultWatch::~DefaultWatch()
DefaultMutex::DefaultMutex()
{
#if defined HAVE_PTHREAD_H
pthread_mutex_init(&_mutex, NULL);
#elif defined HAVE_WIN32
#endif
}
DefaultMutex::~DefaultMutex()
{
#if defined HAVE_PTHREAD_H
pthread_mutex_destroy(&_mutex);
#elif defined HAVE_WIN32
#endif
}
void DefaultMutex::lock()
{
#if defined HAVE_PTHREAD_H
pthread_mutex_lock(&_mutex);
#elif defined HAVE_WIN32
#endif
}
void DefaultMutex::unlock()
{
#if defined HAVE_PTHREAD_H
pthread_mutex_unlock(&_mutex);
#elif defined HAVE_WIN32
#endif
}
DefaultMainLoop::DefaultMainLoop()

8
src/interface.cpp
View file

@ -74,7 +74,9 @@ void InterfaceAdaptor::emit_signal(const SignalMessage &sig)
{
SignalMessage &sig2 = const_cast<SignalMessage &>(sig);
sig2.interface(name().c_str());
if (sig2.interface() == NULL)
sig2.interface(name().c_str());
_emit_signal(sig2);
}
@ -151,6 +153,8 @@ Message InterfaceProxy::invoke_method(const CallMessage &call)
{
CallMessage &call2 = const_cast<CallMessage &>(call);
call2.interface(name().c_str());
if (call.interface() == NULL)
call2.interface(name().c_str());
return _invoke_method(call2);
}

7
src/object.cpp
View file

@ -324,8 +324,11 @@ void ObjectProxy::unregister_obj()
Message ObjectProxy::_invoke_method(CallMessage &call)
{
call.path(path().c_str());
call.destination(service().c_str());
if (call.path() == NULL)
call.path(path().c_str());
if (call.destination() == NULL)
call.destination(service().c_str());
return conn().send_blocking(call);
}