From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 26 Nov 2008 20:17:24 +0000 (+0000)
Subject: * net/dbus.el (dbus-handle-event): The result of a message call
X-Git-Tag: emacs-pretest-23.0.90~1491
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f7d20b3eac96b848904955fd0d3ca4867083772e;p=emacs.git

* 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 f5772568c98..612c1b41bbb 100644
--- 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 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."
 	(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.