* epg.el (epg-status-GET_HIDDEN): Pass epg-context as the first
authorDaiki Ueno <ueno@unixuser.org>
Wed, 26 Apr 2006 03:01:44 +0000 (03:01 +0000)
committerDaiki Ueno <ueno@unixuser.org>
Wed, 26 Apr 2006 03:01:44 +0000 (03:01 +0000)
argument of passphrase-callback.
(epg-status-PROGRESS): Ditto.

lisp/riece-epg.el

index b999eeb..8f7cf80 100644 (file)
@@ -44,7 +44,7 @@
 
 (defvar riece-epg-passphrase-alist nil)
 
 
 (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)
   (if (eq key-id 'SYM)
       (let ((entry (riece-identity-assoc identity riece-epg-passphrase-alist))
            passphrase)
                (setq entry (list identity)
                      riece-epg-passphrase-alist (cons entry
                                                 riece-epg-passphrase-alist)))
                (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)))
              (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))
   (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
 
 (defun riece-epg-funcall-clear-passphrase (identity function &rest args)
   (condition-case error