aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2012-02-02 13:47:09 +0100
committerMichael Albinus2012-02-02 13:47:09 +0100
commit6bee44d6400c47201de3abfef17b63ce9acfb8c9 (patch)
tree92e7e83a6c9eef6d5e9323dbd25459b9c24259c3
parent9f6e692e6490ff5a71b4394b8621fbea2f627d72 (diff)
downloademacs-6bee44d6400c47201de3abfef17b63ce9acfb8c9.tar.gz
emacs-6bee44d6400c47201de3abfef17b63ce9acfb8c9.zip
* dbusbind.c (Fdbus_register_method): Mention the return value
:ignore in the docstring.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/dbusbind.c11
2 files changed, 12 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7ccdca9f347..2667f4ce4fe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-02-02 Michael Albinus <michael.albinus@gmx.de>
2
3 * dbusbind.c (Fdbus_register_method): Mention the return value
4 :ignore in the docstring.
5
12012-02-02 Glenn Morris <rgm@gnu.org> 62012-02-02 Glenn Morris <rgm@gnu.org>
2 7
3 * callproc.c (Fcall_process, Fcall_process_region): Doc fix. 8 * callproc.c (Fcall_process, Fcall_process_region): Doc fix.
diff --git a/src/dbusbind.c b/src/dbusbind.c
index c89867fbae6..ad1a3f3cbe8 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -2162,10 +2162,13 @@ DONT-REGISTER-SERVICE below).
2162 2162
2163PATH is the D-Bus object path SERVICE is registered (See discussion of 2163PATH is the D-Bus object path SERVICE is registered (See discussion of
2164DONT-REGISTER-SERVICE below). INTERFACE is the interface offered by 2164DONT-REGISTER-SERVICE below). INTERFACE is the interface offered by
2165SERVICE. It must provide METHOD. HANDLER is a Lisp function to be 2165SERVICE. It must provide METHOD.
2166called when a method call is received. It must accept the input 2166
2167arguments of METHOD. The return value of HANDLER is used for 2167HANDLER is a Lisp function to be called when a method call is
2168composing the returning D-Bus message. 2168received. It must accept the input arguments of METHOD. The return
2169value of HANDLER is used for composing the returning D-Bus message.
2170In case HANDLER shall return a reply message with an empty argument
2171list, HANDLER must return the symbol `:ignore'.
2169 2172
2170When DONT-REGISTER-SERVICE is non-nil, the known name SERVICE is not 2173When DONT-REGISTER-SERVICE is non-nil, the known name SERVICE is not
2171registered. This means that other D-Bus clients have no way of 2174registered. This means that other D-Bus clients have no way of