(defvar notifications-on-action-map nil
"Mapping between notification and action callback functions.")
+(defvar notifications-on-action-object nil
+ "Object for registered on-action signal.")
+
(defvar notifications-on-close-map nil
"Mapping between notification and close callback functions.")
+(defvar notifications-on-close-object nil
+ "Object for registered on-close signal.")
+
(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)))
+ (let* ((unique-name (dbus-event-service-name last-input-event))
+ (entry (assoc (cons unique-name id) notifications-on-action-map)))
(when entry
(funcall (cadr entry) id action)
- (remove entry 'notifications-on-action-map))))
-
-(when (fboundp 'dbus-register-signal)
- (dbus-register-signal
- :session
- notifications-service
- notifications-path
- notifications-interface
- notifications-action-signal
- 'notifications-on-action-signal))
-
-(defun notifications-on-closed-signal (id reason)
+ (when (and (not (setq notifications-on-action-map
+ (remove entry notifications-on-action-map)))
+ notifications-on-action-object)
+ (dbus-unregister-object notifications-on-action-object)
+ (setq notifications-on-action-object nil)))))
+
+(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* ((unique-name (dbus-event-service-name last-input-event))
+ (entry (assoc (cons unique-name id) notifications-on-close-map))
+ (reason (or reason 4)))
(when entry
(funcall (cadr entry)
id (cadr (assoc reason notifications-closed-reason)))
- (remove entry 'notifications-on-close-map))))
-
-(when (fboundp 'dbus-register-signal)
- (dbus-register-signal
- :session
- notifications-service
- notifications-path
- notifications-interface
- notifications-closed-signal
- 'notifications-on-closed-signal))
+ (when (and (not (setq notifications-on-close-map
+ (remove entry notifications-on-close-map)))
+ notifications-on-close-object)
+ (dbus-unregister-object notifications-on-close-object)
+ (setq notifications-on-close-object nil)))))
(defun notifications-notify (&rest params)
"Send notification via D-Bus using the Freedesktop notification protocol.
- `dismissed' if the notification was dismissed by the user
- `close-notification' if the notification was closed
by a call to CloseNotification
+ - `undefined' if the notification server hasn't provided
+ a reason
This function returns a notification id, an integer, which can be
used to manipulate the notification item with
-`notifications-close-notification'."
+`notifications-close-notification' or the `:replaces-id' argument
+of another `notifications-notify' call."
(let ((title (plist-get params :title))
(body (plist-get params :body))
(app-name (plist-get params :app-name))
(or hints '(:array :signature "{sv}"))
:int32 (or timeout -1)))
- ;; Register close/action callback function
+ ;; Register close/action callback function. We must also remember
+ ;; the daemon's unique name, because the daemon could have
+ ;; restarted.
(let ((on-action (plist-get params :on-action))
- (on-close (plist-get params :on-close)))
+ (on-close (plist-get params :on-close))
+ (unique-name (dbus-get-name-owner :session notifications-service)))
(when on-action
- (add-to-list 'notifications-on-action-map (list id on-action)))
+ (add-to-list 'notifications-on-action-map
+ (list (cons unique-name id) on-action))
+ (unless notifications-on-action-object
+ (setq notifications-on-action-object
+ (dbus-register-signal
+ :session
+ nil
+ notifications-path
+ notifications-interface
+ notifications-action-signal
+ 'notifications-on-action-signal))))
+
(when on-close
- (add-to-list 'notifications-on-close-map (list id on-close))))
+ (add-to-list 'notifications-on-close-map
+ (list (cons unique-name id) on-close))
+ (unless notifications-on-close-object
+ (setq notifications-on-close-object
+ (dbus-register-signal
+ :session
+ nil
+ notifications-path
+ notifications-interface
+ notifications-closed-signal
+ 'notifications-on-closed-signal)))))
;; Return notification id
id))