From: ueno <ueno>
Date: Wed, 27 Sep 2006 06:12:20 +0000 (+0000)
Subject: * epa.el (epa-decrypt-file): Set progress callback.
X-Git-Tag: epg-0_0_6~11
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=cf55e3ecd6ea978ba38185b2d5e411149d87008a;p=elisp%2Fepg.git

* epa.el (epa-decrypt-file): Set progress callback.
(epa-sign-file): Ditto.
(epa-encrypt-file): Ditto.
(epa-decrypt-region): Ditto.
(epa-sign-region): Ditto.
(epa-encrypt-region): Ditto.
(epa-sign-keys): Ditto.
---

diff --git a/ChangeLog b/ChangeLog
index 62d6ab1..2b55423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2006-09-27  Daiki Ueno  <ueno@unixuser.org>
 
-	* epa.el (epa-decrypt-file): Set passphrase-callback.
+	* epa.el (epa-decrypt-file): Set callbacks.
 	(epa-sign-file): Ditto.
 	(epa-encrypt-file): Ditto.
 	(epa-decrypt-region): Ditto.
diff --git a/epa.el b/epa.el
index d5c1601..cbed315 100644
--- a/epa.el
+++ b/epa.el
@@ -566,6 +566,8 @@ If SECRET is non-nil, list secret keys instead of public keys."
 	 (context (epg-make-context)))
     (epg-context-set-passphrase-callback context
 					 #'epa-passphrase-callback-function)
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
     (message "Decrypting %s..." (file-name-nondirectory file))
     (epg-decrypt-file context file plain)
     (message "Decrypting %s...done" (file-name-nondirectory file))
@@ -579,6 +581,8 @@ If SECRET is non-nil, list secret keys instead of public keys."
   (let* ((context (epg-make-context))
 	 (plain (if (equal (file-name-extension file) "sig")
 		    (file-name-sans-extension file))))
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
     (message "Verifying %s..." (file-name-nondirectory file))
     (epg-verify-file context file plain)
     (message "Verifying %s...done" (file-name-nondirectory file))
@@ -610,6 +614,8 @@ If no one is selected, default secret key is used.  "
     (epg-context-set-signers context signers)
     (epg-context-set-passphrase-callback context
 					 #'epa-passphrase-callback-function)
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
     (message "Signing %s..." (file-name-nondirectory file))
     (epg-sign-file context file signature mode)
     (message "Signing %s...done" (file-name-nondirectory file))))
@@ -627,6 +633,8 @@ If no one is selected, symmetric encryption will be performed.  ")))
     (epg-context-set-textmode context epa-textmode)
     (epg-context-set-passphrase-callback context
 					 #'epa-passphrase-callback-function)
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
     (message "Encrypting %s..." (file-name-nondirectory file))
     (epg-encrypt-file context file recipients cipher)
     (message "Encrypting %s...done" (file-name-nondirectory file))))
@@ -642,6 +650,8 @@ Don't use this command in Lisp programs!"
 	  plain)
       (epg-context-set-passphrase-callback context
 					   #'epa-passphrase-callback-function)
+      (epg-context-set-progress-callback context
+					 #'epa-progress-callback-function)
       (message "Decrypting...")
       (setq plain (epg-decrypt-string context (buffer-substring start end)))
       (message "Decrypting...done")
@@ -686,6 +696,8 @@ Don't use this command in Lisp programs!"
 Don't use this command in Lisp programs!"
   (interactive "r")
   (let ((context (epg-make-context)))
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
     (epg-verify-string context
 		       (encode-coding-string
 			(buffer-substring start end)
@@ -744,6 +756,8 @@ If no one is selected, default secret key is used.  "
       (epg-context-set-signers context signers)
       (epg-context-set-passphrase-callback context
 					   #'epa-passphrase-callback-function)
+      (epg-context-set-progress-callback context
+					 #'epa-progress-callback-function)
       (message "Signing...")
       (setq signature (epg-sign-string context
 				       (encode-coding-string
@@ -770,6 +784,8 @@ If no one is selected, symmetric encryption will be performed.  ")))
       (epg-context-set-textmode context epa-textmode)
       (epg-context-set-passphrase-callback context
 					   #'epa-passphrase-callback-function)
+      (epg-context-set-progress-callback context
+					 #'epa-progress-callback-function)
       (message "Encrypting...")
       (setq cipher (epg-encrypt-string context
 				       (encode-coding-string
@@ -844,6 +860,8 @@ If LOCAL is non-nil, the signature is marked as non exportable."
   (let ((context (epg-make-context)))
     (epg-context-set-passphrase-callback context
 					 #'epa-passphrase-callback-function)
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
     (message "Signing keys...")
     (epg-sign-keys context keys local)
     (message "Signing keys...done")))