From: ueno <ueno>
Date: Wed, 26 Apr 2006 03:01:44 +0000 (+0000)
Subject: * epg.el (epg-status-GET_HIDDEN): Pass epg-context as the first
X-Git-Tag: riece-3_0_0~14
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b7bfd9d937beb754de8e78702e00f121669287d;p=elisp%2Friece.git

* epg.el (epg-status-GET_HIDDEN): Pass epg-context as the first
argument of passphrase-callback.
(epg-status-PROGRESS): Ditto.
---

diff --git a/lisp/riece-epg.el b/lisp/riece-epg.el
index b999eeb..8f7cf80 100644
--- a/lisp/riece-epg.el
+++ b/lisp/riece-epg.el
@@ -44,7 +44,7 @@
 
 (defvar riece-epg-passphrase-alist nil)
 
-(defun riece-epg-passphrase-callback-function (key-id identity)
+(defun riece-epg-passphrase-callback-function (context key-id identity)
   (if (eq key-id 'SYM)
       (let ((entry (riece-identity-assoc identity riece-epg-passphrase-alist))
 	    passphrase)
@@ -54,19 +54,21 @@
 		(setq entry (list identity)
 		      riece-epg-passphrase-alist (cons entry
 						 riece-epg-passphrase-alist)))
-	      (setq passphrase (epg-passphrase-callback-function key-id nil))
+	      (setq passphrase (epg-passphrase-callback-function context
+								 key-id nil))
 	      (setcdr entry (copy-sequence passphrase))
 	      passphrase)))
-    (epg-passphrase-callback-function key-id nil)))
+    (epg-passphrase-callback-function context key-id nil)))
 
-(defun riece-epg-passphrase-callback-function-for-decrypt (key-id identity)
+(defun riece-epg-passphrase-callback-function-for-decrypt (context key-id
+								   identity)
   (if (eq key-id 'SYM)
       (let ((entry (riece-identity-assoc identity riece-epg-passphrase-alist))
 	    passphrase)
 	(if (cdr entry)
 	    (copy-sequence (cdr entry))
-	  (epg-cancel epg-context)))
-    (epg-passphrase-callback-function key-id nil)))
+	  (epg-cancel context)))
+    (epg-passphrase-callback-function context key-id nil)))
 
 (defun riece-epg-funcall-clear-passphrase (identity function &rest args)
   (condition-case error