From 21ee9a5ef710250de587ba203f327338d3abbe77 Mon Sep 17 00:00:00 2001
From: pd <shackan@aris-ubuntu804.(none)>
Date: Sat, 16 Aug 2008 16:09:11 +0200
Subject: =?UTF-8?q?interface.cpp=20and=20object.cpp=20now=20will=20only=20?=
 =?UTF-8?q?fill=20the=20interface=20names=20if=20they=20were=20left=20blan?=
 =?UTF-8?q?k=20(Jo=C3=A3o=20Xavier)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface.cpp | 8 ++++++--
 src/object.cpp    | 7 +++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/interface.cpp b/src/interface.cpp
index 89a4573..6a47cf6 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -70,7 +70,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);
 }
 
@@ -147,6 +149,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 8bf22a8..970fcf7 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -320,8 +320,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);
 }
-- 
cgit v1.2.1


From 1a95b536de3492f94b4b97a20c7936781dd897e6 Mon Sep 17 00:00:00 2001
From: pd <shackan@aris-ubuntu804.(none)>
Date: Mon, 18 Aug 2008 23:29:37 +0200
Subject: Make phtread a non-optional requirement

---
 src/eventloop.cpp | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'src')

diff --git a/src/eventloop.cpp b/src/eventloop.cpp
index c6f95ef..1d4aa2a 100644
--- a/src/eventloop.cpp
+++ b/src/eventloop.cpp
@@ -74,42 +74,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()
-- 
cgit v1.2.1