* notifications.el: Fix previous patch.

2 files changed, 22 insertions, 28 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 102ef01d772..e338a6d2ebf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,11 +6,11 @@
 
 2012-03-04  Michael Albinus  <michael.albinus@gmx.de>
 
-        * notifications.el (notifications-unique-name): New defvar.
-        (notifications-on-action-signal, notifications-on-closed-signal):
-        Check for unique service name of incoming event.
+        * notifications.el (notifications-on-action-signal)
+        (notifications-on-closed-signal): Check for unique service name of
+        incoming event.  Fix error in removing entry.
         (top): Register for signals with wildcard service name.
-        (notifications-notify): Remember daemon unique service name.
+        (notifications-notify): Use daemon unique service name for map entries.
 
 2012-03-04  Chong Yidong  <cyd@gnu.org>
 
diff --git a/lisp/notifications.el b/lisp/notifications.el
index e0817631140..c85f8799856 100644
--- a/lisp/notifications.el
+++ b/lisp/notifications.el
@@ -91,19 +91,13 @@
 (defvar notifications-on-close-map nil
   "Mapping between notification and close callback functions.")
 
-(defvar notifications-unique-name ""
-  "Unique service name of notification daemon.
-This must be kept, because the notification daemon could be
-restarted, and the registered signals cannot be identified anymore.")
-
 (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 (and entry
-               (string-equal notifications-unique-name
-                             (dbus-event-service-name last-input-event)))
+  (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))))
+      (remove entry notifications-on-action-map))))
 
 (when (fboundp 'dbus-register-signal)
   (dbus-register-signal
@@ -118,14 +112,13 @@ restarted, and the registered signals cannot be identified anymore.")
   "Dispatch signals to callback functions from `notifications-on-closed-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 (and entry
-               (string-equal notifications-unique-name
-                             (dbus-event-service-name last-input-event)))
+  (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))))
+      (remove entry notifications-on-close-map))))
 
 (when (fboundp 'dbus-register-signal)
   (dbus-register-signal
@@ -286,17 +279,18 @@ used to manipulate the notification item with
                             (or hints '(:array :signature "{sv}"))
                             :int32 (or timeout -1)))
 
-    ;; Remember daemon unique service name.
-    (setq notifications-unique-name
-          (dbus-get-name-owner :session notifications-service))
-
-    ;; Register close/action callback function
+    ;; Register close/action callback function.  We must also
+    ;; remmember 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)))
       (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))))
 
     ;; Return notification id
     id))