2005-08-26 Marcus Brinkmann <[email protected]>

	* engine.h (engine_command_handler_t): Add new argument processed.
	* ops.h (_gpgme_passphrase_command_handler_internal): Rename
	prototype to ...
	(_gpgme_passphrase_command_handler): ... this one.
	* passphrase.c (_gpgme_passphrase_command_handler_internal):
	Rename to ...
	(_gpgme_passphrase_command_handler): ... this one.
	* edit.c (command_handler): Add new argument processed.  Remove
	local variable with the same name.  Always return processed as
	true.
	* rungpg.c (command_handler): Send a newline character if the
	handler did not.

1 files changed, 2 insertions, 13 deletions

diff --git a/gpgme/passphrase.c b/gpgme/passphrase.c
index 74214fb1..71326845 100644
--- a/gpgme/passphrase.c
+++ b/gpgme/passphrase.c
@@ -116,10 +116,8 @@ _gpgme_passphrase_status_handler (void *priv, gpgme_status_code_t code,
 
 
 gpgme_error_t
-_gpgme_passphrase_command_handler_internal (void *priv,
-					    gpgme_status_code_t code,
-					    const char *key, int fd,
-					    int *processed)
+_gpgme_passphrase_command_handler (void *priv, gpgme_status_code_t code,
+				   const char *key, int fd, int *processed)
 {
   gpgme_ctx_t ctx = (gpgme_ctx_t) priv;
   gpgme_error_t err;
@@ -153,12 +151,3 @@ _gpgme_passphrase_command_handler_internal (void *priv,
 
   return 0;
 }
-
-
-gpgme_error_t
-_gpgme_passphrase_command_handler (void *priv, gpgme_status_code_t code,
-				   const char *key, int fd)
-{
-  return _gpgme_passphrase_command_handler_internal (priv, code, key, fd,
-						     NULL);
-}