From dcc65b17260abc0560b82ee19c178cb38902d2f6 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Mon, 26 May 2003 21:50:45 +0000 Subject: 2003-05-26 Marcus Brinkmann * configure.ac (NEED_GPG_VERSION): Bump up to 1.2.2. gpgme/ 2003-05-26 Marcus Brinkmann * rungpg.c (gpg_new): Add --enable-progress-filter to gpg invocation. * decrypt-verify.c (_gpgme_op_decrypt_verify_start): Rename to decrypt_verify_start. (gpgme_op_decrypt_verify_start): Call decrypt_verify_start. (gpgme_op_decrypt_verify): Likewise. * verify.c (verify_status_handler): New function that also calls progress status handler. (_gpgme_op_verify_start): Set status handler to verify_status_handler. Rename to (verify_start). (gpgme_op_verify_start): Call verify_start. (gpgme_op_verify): Likewise. * encrypt.c (encrypt_status_handler): New function. (_gpgme_encrypt_sym_status_handler): Call progress status handler. Make static. Rename to encrypt_sym_status_handler. (encrypt_start): Set status handler to encrypt_sym_status_handler or encrypt_status_handler. * sign.c (sign_status_handler): New function. (sign_start): Set status handler to sign_status_handler. * decrypt.c (decrypt_status_handler): New function that also calls progress status handler. (decrypt_start): Set status handler to decrypt_status_handler. * encrypt-sign.c (encrypt_sign_status_handler): Likewise. * decrypt-verify.c (decrypt_verify_status_handler): Call _gpgme_progress_status_handler. --- gpgme/encrypt.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'gpgme/encrypt.c') diff --git a/gpgme/encrypt.c b/gpgme/encrypt.c index a5be70bf..b98f55a5 100644 --- a/gpgme/encrypt.c +++ b/gpgme/encrypt.c @@ -109,11 +109,19 @@ _gpgme_encrypt_status_handler (void *priv, gpgme_status_code_t code, } -gpgme_error_t -_gpgme_encrypt_sym_status_handler (void *priv, gpgme_status_code_t code, - char *args) +static gpgme_error_t +encrypt_sym_status_handler (void *priv, gpgme_status_code_t code, char *args) +{ + return _gpgme_progress_status_handler (priv, code, args) + || _gpgme_passphrase_status_handler (priv, code, args); +} + + +static gpgme_error_t +encrypt_status_handler (void *priv, gpgme_status_code_t code, char *args) { - return _gpgme_passphrase_status_handler (priv, code, args); + return _gpgme_progress_status_handler (priv, code, args) + || _gpgme_encrypt_status_handler (priv, code, args); } @@ -168,8 +176,8 @@ encrypt_start (gpgme_ctx_t ctx, int synchronous, gpgme_recipients_t recp, _gpgme_engine_set_status_handler (ctx->engine, symmetric - ? _gpgme_encrypt_sym_status_handler - : _gpgme_encrypt_status_handler, + ? encrypt_sym_status_handler + : encrypt_status_handler, ctx); return _gpgme_engine_op_encrypt (ctx->engine, recp, plain, cipher, -- cgit v1.2.3