* epg.el: Reverted a change by Hiroya Murata on 2006-11-22.

diff --git a/ChangeLog b/ChangeLog
index 77ca024..ee59ea2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2008-02-05  Daiki Ueno  <ueno@unixuser.org>
 
+       * epg.el: Reverted a change by Hiroya Murata on 2006-11-22.
        * epa.el: Reverted a change by Hiroya Murata on 2006-12-20.
 
 2008-01-22  Daiki Ueno  <ueno@unixuser.org>

diff --git a/epg.el b/epg.el
index 723c222..54a0d0d 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -327,25 +327,20 @@ This function is for internal use only."
     (signal 'wrong-type-argument (list 'epg-context-p context)))
   (aset (cdr context) 6 compress-algorithm))
 
-(defun epg-context-set-passphrase-callback (context passphrase-callback
-                                                   &optional handback)
-  "Set the function used to query passphrase.
-If optional argument HANDBACK is specified, it is passed to PASSPHRASE-CALLBACK."
+(defun epg-context-set-passphrase-callback (context
+                                           passphrase-callback)
+  "Set the function used to query passphrase."
   (unless (eq (car-safe context) 'epg-context)
     (signal 'wrong-type-argument (list 'epg-context-p context)))
-  (aset (cdr context) 7 (if handback
-                           (cons passphrase-callback handback)
-                         passphrase-callback)))
+  (aset (cdr context) 7 passphrase-callback))
 
-(defun epg-context-set-progress-callback (context progress-callback
-                                                 &optional handback)
+(defun epg-context-set-progress-callback (context
+                                         progress-callback)
   "Set the function which handles progress update.
 If optional argument HANDBACK is specified, it is passed to PROGRESS-CALLBACK."
   (unless (eq (car-safe context) 'epg-context)
     (signal 'wrong-type-argument (list 'epg-context-p context)))
-  (aset (cdr context) 8 (if handback
-                           (cons progress-callback handback)
-                         progress-callback)))
+  (aset (cdr context) 8 progress-callback))
 
 (defun epg-context-set-signers (context signers)
   "Set the list of key-id for singning."