--- a/src/dbus/qdbusconnection.cpp Tue Feb 02 00:43:10 2010 +0200
+++ b/src/dbus/qdbusconnection.cpp Wed Mar 31 11:06:36 2010 +0300
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -491,6 +491,12 @@
its return value, which will be either of type
QDBusMessage::ReplyMessage or QDBusMessage::ErrorMessage.
+ If no reply is received within \a timeout milliseconds, an automatic
+ error will be delivered indicating the expiration of the call.
+ The default \a timeout is -1, which will be replaced with an
+ implementation-defined value that is suitable for inter-process
+ communications (generally, 25 seconds).
+
See the QDBusInterface::call() function for a more friendly way
of placing calls.
@@ -526,9 +532,14 @@
Sends the \a message over this connection and returns
immediately. This function is suitable for method calls only. It
returns an object of type QDBusPendingCall which can be used to
- track the status of the reply. The \a timeout parameter is used to
- determine when an auto-generated error reply may be emitted and is
- also the upper limit for waiting in QDBusPendingCall::waitForFinished().
+ track the status of the reply.
+
+ If no reply is received within \a timeout milliseconds, an automatic
+ error will be delivered indicating the expiration of the call. The
+ default \a timeout is -1, which will be replaced with an
+ implementation-defined value that is suitable for inter-process
+ communications (generally, 25 seconds). This timeout is also the
+ upper limit for waiting in QDBusPendingCall::waitForFinished().
See the QDBusInterface::asyncCall() function for a more friendly way
of placing calls.
@@ -619,10 +630,8 @@
if (interface.isEmpty() && name.isEmpty())
return false;
- QString owner = d->getNameOwner(service); // we don't care if the owner is empty
- // it might get started later
QDBusWriteLocker locker(ConnectAction, d);
- return d->connectSignal(service, owner, path, interface, name, argumentMatch, signature, receiver, slot);
+ return d->connectSignal(service, path, interface, name, argumentMatch, signature, receiver, slot);
}
/*!