aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorMichael Albinus2008-11-26 20:17:24 +0000
committerMichael Albinus2008-11-26 20:17:24 +0000
commitf7d20b3eac96b848904955fd0d3ca4867083772e (patch)
tree6b570bac6ad35bfb583e1fee5ab434fb028c2efb /lisp/net
parent7b66ce51f497e0ed2f1bb1a36a987bfcd8b54726 (diff)
downloademacs-f7d20b3eac96b848904955fd0d3ca4867083772e.tar.gz
emacs-f7d20b3eac96b848904955fd0d3ca4867083772e.zip
* net/dbus.el (dbus-handle-event): The result of a message call
can also be an object, which is not a consp.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/dbus.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 5c7e719e305..13c2d39f6dd 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -362,7 +362,8 @@ If the HANDLER returns an `dbus-error', it is propagated as return message."
362 (when (= dbus-message-type-method-call (nth 2 event)) 362 (when (= dbus-message-type-method-call (nth 2 event))
363 (dbus-ignore-errors 363 (dbus-ignore-errors
364 (apply 'dbus-method-return-internal 364 (apply 'dbus-method-return-internal
365 (nth 1 event) (nth 3 event) (nth 4 event) result)))) 365 (nth 1 event) (nth 3 event) (nth 4 event)
366 (if (consp result) result (list result))))))
366 ;; Error handling. 367 ;; Error handling.
367 (dbus-error 368 (dbus-error
368 ;; Return an error message when it is a message call. 369 ;; Return an error message when it is a message call.