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

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/07/27 10:02:38

Modified files:
        lisp/net       : dbus.el 

Log message:
        * net/dbus.el (dbus-call-method-non-blocking): Handle the case the
        function returns nil.
        (dbus-handle-event): Handle special return value :ignore.
        Reported by Jan Moringen <address@hidden>.

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

Patches:
Index: dbus.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/dbus.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- dbus.el     28 Jan 2009 16:10:02 -0000      1.28
+++ dbus.el     27 Jul 2009 10:02:38 -0000      1.29
@@ -184,7 +184,7 @@
          'dbus-call-method-non-blocking-handler args)))
     ;; Wait until `dbus-call-method-non-blocking-handler' has put the
     ;; result into `dbus-return-values-table'.
-    (while (not (gethash key dbus-return-values-table nil))
+    (while (eq (gethash key dbus-return-values-table :ignore) :ignore)
       (read-event nil nil 0.1))
 
     ;; Cleanup `dbus-return-values-table'.  Return the result.
@@ -368,9 +368,12 @@
        ;; Return a message when it is a message call.
        (when (= dbus-message-type-method-call (nth 2 event))
          (dbus-ignore-errors
+           (if (eq result :ignore)
+               (dbus-method-return-internal
+                (nth 1 event) (nth 3 event) (nth 4 event))
            (apply 'dbus-method-return-internal
             (nth 1 event) (nth 3 event) (nth 4 event)
-            (if (consp result) result (list result))))))
+                    (if (consp result) result (list result)))))))
     ;; Error handling.
     (dbus-error
      ;; Return an error message when it is a message call.