* notifications.el (notifications-on-closed-signal): Make `reason'

  optional.  (Bug#10744)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f69b94fdb7b35aca72374a1d184e1a0be4a64ef3..e04126bf4ee383642dd4f7b441bb196044512ee1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-07  Michael Albinus  <michael.albinus@gmx.de>
+
+       * notifications.el (notifications-on-closed-signal): Make `reason'
+       optional.  (Bug#10744)
+
 2012-02-07  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/easy-mmode.el (define-minor-mode):

diff --git a/lisp/notifications.el b/lisp/notifications.el
index c3b6c759506646286f9650719c3d5fd157f22ed9..9f7576b3f5dac6266837c2e30cf001ea535daa0d 100644 (file)
--- a/lisp/notifications.el
+++ b/lisp/notifications.el
@@ -107,9 +107,12 @@
    notifications-action-signal
    'notifications-on-action-signal))
 
-(defun notifications-on-closed-signal (id reason)
+(defun notifications-on-closed-signal (id &optional reason)
   "Dispatch signals to callback functions from `notifications-on-closed-map'."
-  (let ((entry (assoc id notifications-on-close-map)))
+  ;; notification-daemon prior 0.4.0 does not send a reason.  So we
+  ;; make it optional, and assume `undefined' as default.
+  (let ((entry (assoc id notifications-on-close-map))
+       (reason (or reason 4)))
     (when entry
       (funcall (cadr entry)
               id (cadr (assoc reason notifications-closed-reason)))