Mercurial > emacs
comparison lisp/net/dbus.el @ 101619:df3f6041e002
* net/dbus.el (dbus-event-error-hooks): Fix docstring. Describe
second parameter of hook functions.
(dbus-handle-event): Apply it.
author | Michael Albinus <michael.albinus@gmx.de> |
---|---|
date | Wed, 28 Jan 2009 16:10:02 +0000 |
parents | 5951f5343bb5 |
children | 4c431a52ce37 |
comparison
equal
deleted
inserted
replaced
101618:2259d23e6d85 | 101619:df3f6041e002 |
---|---|
97 (put 'dbus-ignore-errors 'edebug-form-spec '(form body)) | 97 (put 'dbus-ignore-errors 'edebug-form-spec '(form body)) |
98 (font-lock-add-keywords 'emacs-lisp-mode '("\\<dbus-ignore-errors\\>")) | 98 (font-lock-add-keywords 'emacs-lisp-mode '("\\<dbus-ignore-errors\\>")) |
99 | 99 |
100 (defvar dbus-event-error-hooks nil | 100 (defvar dbus-event-error-hooks nil |
101 "Functions to be called when a D-Bus error happens in the event handler. | 101 "Functions to be called when a D-Bus error happens in the event handler. |
102 Every function must accept one argument, the error variable | 102 Every function must accept two arguments, the event and the error variable |
103 catched in `condition-case' by `dbus-error'.") | 103 catched in `condition-case' by `dbus-error'.") |
104 | 104 |
105 | 105 |
106 ;;; Hash table of registered functions. | 106 ;;; Hash table of registered functions. |
107 | 107 |
377 (when (= dbus-message-type-method-call (nth 2 event)) | 377 (when (= dbus-message-type-method-call (nth 2 event)) |
378 (dbus-ignore-errors | 378 (dbus-ignore-errors |
379 (dbus-method-error-internal | 379 (dbus-method-error-internal |
380 (nth 1 event) (nth 3 event) (nth 4 event) (cadr err)))) | 380 (nth 1 event) (nth 3 event) (nth 4 event) (cadr err)))) |
381 ;; Propagate D-Bus error messages. | 381 ;; Propagate D-Bus error messages. |
382 (run-hook-with-args 'dbus-event-error-hooks err) | 382 (run-hook-with-args 'dbus-event-error-hooks event err) |
383 (when (or dbus-debug (= dbus-message-type-error (nth 2 event))) | 383 (when (or dbus-debug (= dbus-message-type-error (nth 2 event))) |
384 (signal (car err) (cdr err)))))) | 384 (signal (car err) (cdr err)))))) |
385 | 385 |
386 (defun dbus-event-bus-name (event) | 386 (defun dbus-event-bus-name (event) |
387 "Return the bus name the event is coming from. | 387 "Return the bus name the event is coming from. |