Mercurial > emacs
changeset 99968:6d3b706e1a28
* net/dbus.el (dbus-handle-event): The result of a message call
can also be an object, which is not a consp.
author | Michael Albinus <michael.albinus@gmx.de> |
---|---|
date | Wed, 26 Nov 2008 20:16:46 +0000 |
parents | eb46f9cbb4a0 |
children | 6f9450a05b12 |
files | lisp/net/dbus.el |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/net/dbus.el Wed Nov 26 20:14:09 2008 +0000 +++ b/lisp/net/dbus.el Wed Nov 26 20:16:46 2008 +0000 @@ -362,7 +362,8 @@ (when (= dbus-message-type-method-call (nth 2 event)) (dbus-ignore-errors (apply 'dbus-method-return-internal - (nth 1 event) (nth 3 event) (nth 4 event) result)))) + (nth 1 event) (nth 3 event) (nth 4 event) + (if (consp result) result (list result)))))) ;; Error handling. (dbus-error ;; Return an error message when it is a message call.