[Emacs-diffs] emacs/lisp/net dbus.el

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       08/11/26 20:16:47

Modified files:
        lisp/net       : dbus.el 

Log message:
        * net/dbus.el (dbus-handle-event): The result of a message call
        can also be an object, which is not a consp.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/dbus.el?cvsroot=emacs&r1=1.24&r2=1.25

Patches:
Index: dbus.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/dbus.el,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- dbus.el     26 Nov 2008 06:09:44 -0000      1.24
+++ dbus.el     26 Nov 2008 20:16:46 -0000      1.25
@@ -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.