2003-07-29 Marcus Brinkmann <[email protected]>

	* decrypt-verify.c (decrypt_verify_status_handler): Expand silly
	and wrong expression.
	* encrypt-sign.c (encrypt_sign_status_handler): Likewise.
	* encrypt.c (encrypt_sym_status_handler): Likewise.
	* sign.c (sign_status_handler): Likewise.
	* verify.c (verify_status_handler): Likewise.
	* decrypt.c (decrypt_status_handler): Likewise.

1 files changed, 6 insertions, 2 deletions

diff --git a/gpgme/encrypt.c b/gpgme/encrypt.c
index 61619ed9..6eb177e0 100644
--- a/gpgme/encrypt.c
+++ b/gpgme/encrypt.c
@@ -117,8 +117,12 @@ _gpgme_encrypt_status_handler (void *priv, gpgme_status_code_t code,
 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);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_passphrase_status_handler (priv, code, args);
+  return err;
 }