From fa4003dab3bf8ef7fd3fabc6e9c5534b280c2d2f Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 10 Jun 2010 14:44:59 +0200 Subject: [PATCH] * net/notifications.el (notifications-on-action-signal) (notifications-on-closed-signal): Pass notification id as first argument to the callback functions. Add docstrings. (notifications-notify): Fix docstring. --- lisp/ChangeLog | 7 +++++++ lisp/net/notifications.el | 15 ++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c5b72d2d173..035902e1021 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2010-06-10 Julien Danjou + + * net/notifications.el (notifications-on-action-signal) + (notifications-on-closed-signal): Pass notification id as first + argument to the callback functions. Add docstrings. + (notifications-notify): Fix docstring. + 2010-06-10 Glenn Morris * emacs-lisp/authors.el (authors-ignored-files) diff --git a/lisp/net/notifications.el b/lisp/net/notifications.el index ef246c7408e..beb63a6311b 100644 --- a/lisp/net/notifications.el +++ b/lisp/net/notifications.el @@ -86,9 +86,10 @@ "Mapping between notification and close callback functions.") (defun notifications-on-action-signal (id action) + "Dispatch signals to callback functions from `notifications-on-action-map'." (let ((entry (assoc id notifications-on-action-map))) (when entry - (funcall (cadr entry) action) + (funcall (cadr entry) id action) (remove entry 'notifications-on-action-map)))) (dbus-register-signal @@ -100,9 +101,11 @@ 'notifications-on-action-signal) (defun notifications-on-closed-signal (id reason) + "Dispatch signals to callback functions from `notifications-on-closed-map'." (let ((entry (assoc id notifications-on-close-map))) (when entry - (funcall (cadr entry) (cadr (assoc reason notifications-closed-reason))) + (funcall (cadr entry) + id (cadr (assoc reason notifications-closed-reason))) (remove entry 'notifications-on-close-map)))) (dbus-register-signal @@ -155,11 +158,13 @@ Various PARAMS can be set: should point to. The \"y\" hint must also be specified. :y Specifies the Y location on the screen that the notification should point to. The \"x\" hint must also be specified. - :on-action Function to call when an action is invoked. The key of the - action is passed as argument to the function. + :on-action Function to call when an action is invoked. + The notification id and the key of the action are passed + as arguments to the function. :on-close Function to call when the notification has been closed by timeout or by the user. - The function receives the closing reason as argument: + The function receive the notification id and the closing + reason as arguments: - `expired' if the notification has expired - `dismissed' if the notification was dismissed by the user - `close-notification' if the notification was closed -- 2.39.2