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

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

Conflicts:

	configure.ac
	examples/Makefile.am

3 files changed, 11 insertions, 24 deletions

diff --git a/src/eventloop.cpp b/src/eventloop.cpp
index 5112231..7d96777 100644
--- a/src/eventloop.cpp
+++ b/src/eventloop.cpp
@@ -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()
diff --git a/src/interface.cpp b/src/interface.cpp
index 63bc443..f1cd68f 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -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);
 }
diff --git a/src/object.cpp b/src/object.cpp
index 13b7052..9148cb2 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -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);
 }