* dbus.texi (Synchronous Methods): New parameter TIMEOUT for

dbus-call-method.
(Receiving Method Calls): The timeout can be set by the calling client.

2 files changed, 15 insertions, 2 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b2760fe4c97..5ee5d887a4c 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-30  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbus.texi (Synchronous Methods): New parameter TIMEOUT for
+        dbus-call-method.
+        (Receiving Method Calls): The timeout can be set by the calling client.
+
 2008-03-29  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus.texi (Top): Fix version.  Add SASL.
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index e303eb08599..b5e932a5256 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -425,7 +425,7 @@ which carries the input parameters to the object owning the method to
 be called, and a reply message returning the resulting output
 parameters from the object.
 
-@defun dbus-call-method bus service path interface method &rest args
+@defun dbus-call-method bus service path interface method &optional :timeout timeout &rest args
 This function calls @var{method} on the D-Bus @var{bus}.  @var{bus} is
 either the symbol @code{:system} or the symbol @code{:session}.
 
@@ -433,6 +433,12 @@ either the symbol @code{:system} or the symbol @code{:session}.
 D-Bus object path, @var{service} is registered at.  @var{interface} is
 an interface offered by @var{service}.  It must provide @var{method}.
 
+If the parameter @code{:timeout} is given, the following integer
+@var{timeout} specifies the maximun number of milliseconds the method
+call must return.  The default value is 25.000.  If the method call
+doesn't return in time, a D-Bus error is raised (@pxref{Errors and
+Events}).
+
 All other arguments args are passed to @var{method} as arguments.
 They are converted into D-Bus types as described in @ref{Type
 Conversion}.
@@ -546,7 +552,8 @@ used as arguments for the reply message of @var{method}.  This list
 can be composed like the input parameters in @ref{Type Conversion}.
 
 The default D-Bus timeout when waiting for a message reply is 25
-seconds.  Therefore, @var{handler} shall not last longer than
+seconds.  This value could be even smaller, depending on the calling
+client.  Therefore, @var{handler} shall not last longer than
 absolutely necessary.
 
 @code{dbus-register-method} returns a Lisp symbol, which can be used