Re: notifications-notify resets idle-time

[Michael Albinus]

Peter Münster <pmlists@free.fr> writes:

Hi Peter,

> It seems, that I rather need dbus-unregister-object, because I only want
> to unregister the closed-signal, not the action-signal. So I patched
> notifications.el:

I have generalized your patch. It is not needed anymore to call
`dbus-unregister-object' in your code.

Could you, please, check whether it fits your needs? Note that this
patch is based on notifications.el as I have committed to the trunk two
days ago,

--8<---------------cut here---------------start------------->8---
*** /home/albinus/src/emacs/lisp/notifications.el.~107516~      2012-03-06 
11:18:32.000000000 +0100
--- /home/albinus/src/emacs/lisp/notifications.el       2012-03-06 
11:18:32.000000000 +0100
***************
*** 88,112 ****
  (defvar notifications-on-action-map nil
    "Mapping between notification and action callback functions.")

  (defvar notifications-on-close-map nil
    "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* ((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
!    nil
!    notifications-path
!    notifications-interface
!    notifications-action-signal
!    'notifications-on-action-signal))

  (defun notifications-on-closed-signal (id &optional reason)
    "Dispatch signals to callback functions from `notifications-on-closed-map'."
--- 88,113 ----
  (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* ((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)
!       (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'."
***************
*** 118,133 ****
      (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
!    nil
!    notifications-path
!    notifications-interface
!    notifications-closed-signal
!    'notifications-on-closed-signal))

  (defun notifications-notify (&rest params)
    "Send notification via D-Bus using the Freedesktop notification protocol.
--- 119,129 ----
      (when entry
        (funcall (cadr entry)
               id (cadr (assoc reason notifications-closed-reason)))
!       (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.
***************
*** 287,296 ****
          (unique-name (dbus-get-name-owner :session notifications-service)))
        (when on-action
          (add-to-list 'notifications-on-action-map
!                    (list (cons unique-name id) on-action)))
        (when on-close
          (add-to-list 'notifications-on-close-map
!                    (list (cons unique-name id) on-close))))

      ;; Return notification id
      id))
--- 283,311 ----
          (unique-name (dbus-get-name-owner :session notifications-service)))
        (when 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 (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))
--8<---------------cut here---------------end--------------->8---

If that works for you, I would be willing to commit it to the trunk,
still for Emacs 24.1. We could close then also bug#10807.

Best regards, Michael.