* net/dbus.el (dbus-handle-event): The result of a message call

can also be an object, which is not a consp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5772568c989e7a2f34b05908872e5186bdb42cc..612c1b41bbb6fc49cfd30272180e5ec29ec629b3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-26  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/dbus.el (dbus-handle-event): The result of a message call
+       can also be an object, which is not a consp.
+
 2008-11-25  Alan Mackenzie  <acm@muc.de>
 
        * emacs-lisp/lisp.el (forward-sexp, backward-sexp, mark-sexp)

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 5c7e719e3050aceac04234f090a065c884feb542..13c2d39f6dda374ad96d163dd13d7a4cea4a0669 100644 (file)
--- 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."
        (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.