From d88baadbcef92a03274b7ef0bfb61cc19dc9211d Mon Sep 17 00:00:00 2001 From: ueno Date: Tue, 25 Apr 2006 08:56:53 +0000 Subject: [PATCH] Use riece-identity-assoc. --- lisp/riece-epg.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/riece-epg.el b/lisp/riece-epg.el index e2de552..e2a5af9 100644 --- a/lisp/riece-epg.el +++ b/lisp/riece-epg.el @@ -21,7 +21,7 @@ (defun riece-epg-passphrase-callback-function (key-id identity) (if (eq key-id 'SYM) - (let ((entry (assoc identity riece-epg-passphrase-alist)) + (let ((entry (riece-identity-assoc identity riece-epg-passphrase-alist)) passphrase) (or (copy-sequence (cdr entry)) (progn @@ -53,8 +53,8 @@ (condition-case error (setq string (epg-encrypt-string context string nil)) (error - (if (setq entry (assoc riece-current-channel - riece-epg-passphrase-alist)) + (if (setq entry (riece-identity-assoc riece-current-channel + riece-epg-passphrase-alist)) (setcdr entry nil)) (signal (car error) (cdr error)))) (riece-command-send-message @@ -81,8 +81,9 @@ (setq string (epg-decrypt-string context (base64-decode-string string))) (error - (if (setq entry (assoc (riece-message-target message) - riece-epg-passphrase-alist)) + (if (setq entry (riece-identity-assoc + (riece-message-target message) + riece-epg-passphrase-alist)) (setcdr entry nil)) (message "%s" (cdr error)))) (riece-message-set-text -- 1.7.10.4