aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2008-11-26 20:14:09 +0000
committerMichael Albinus2008-11-26 20:14:09 +0000
commit7b66ce51f497e0ed2f1bb1a36a987bfcd8b54726 (patch)
tree3ee377407485138f07c0525301a77c3c30548ba8
parent2674569bd519c4e489ed39d67b5c41bc86d45e93 (diff)
downloademacs-7b66ce51f497e0ed2f1bb1a36a987bfcd8b54726.tar.gz
emacs-7b66ce51f497e0ed2f1bb1a36a987bfcd8b54726.zip
* dbus.texi (Receiving Method Calls): Precise return values of
`dbus-register-method'.
-rw-r--r--doc/misc/ChangeLog2
-rw-r--r--doc/misc/dbus.texi3
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 693998e0917..55d36c54100 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -4,7 +4,7 @@
4 `dbus-escape-as-identifier', `dbus-byte-array-to-string' and 4 `dbus-escape-as-identifier', `dbus-byte-array-to-string' and
5 `dbus-unescape-from-identifier'. 5 `dbus-unescape-from-identifier'.
6 (Receiving Method Calls): New constants `dbus-service-emacs' and 6 (Receiving Method Calls): New constants `dbus-service-emacs' and
7 `dbus-path-emacs'. 7 `dbus-path-emacs'. Precise return values of `dbus-register-method'.
8 (Signals): Use the constants in the example. 8 (Signals): Use the constants in the example.
9 9
102008-11-24 Carsten Dominik <dominik@science.uva.nl> 102008-11-24 Carsten Dominik <dominik@science.uva.nl>
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 672ac86f8dd..b93f29a3a65 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1259,6 +1259,9 @@ call is is received. It must accept as arguments the input arguments
1259of @var{method}. @var{handler} must return a list, which elements are 1259of @var{method}. @var{handler} must return a list, which elements are
1260used as arguments for the reply message of @var{method}. This list 1260used as arguments for the reply message of @var{method}. This list
1261can be composed like the input parameters in @ref{Type Conversion}. 1261can be composed like the input parameters in @ref{Type Conversion}.
1262If only one Lisp object is returned, and this object is not a consp,
1263then @var{handler} can return this object directly, instead of of list
1264of this object.
1262 1265
1263The default D-Bus timeout when waiting for a message reply is 25 1266The default D-Bus timeout when waiting for a message reply is 25
1264seconds. This value could be even smaller, depending on the calling 1267seconds. This value could be even smaller, depending on the calling