projects
/
riece
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
871be95
)
Use riece-identity-assoc.
author
Daiki Ueno
<ueno@unixuser.org>
Tue, 25 Apr 2006 08:56:53 +0000
(08:56 +0000)
committer
Daiki Ueno
<ueno@unixuser.org>
Tue, 25 Apr 2006 08:56:53 +0000
(08:56 +0000)
lisp/riece-epg.el
patch
|
blob
|
history
diff --git
a/lisp/riece-epg.el
b/lisp/riece-epg.el
index
e2de552
..
e2a5af9
100644
(file)
--- 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)
(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
passphrase)
(or (copy-sequence (cdr entry))
(progn
@@
-53,8
+53,8
@@
(condition-case error
(setq string (epg-encrypt-string context string nil))
(error
(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
(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
(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
(setcdr entry nil))
(message "%s" (cdr error))))
(riece-message-set-text