doc/

2003-02-06  Marcus Brinkmann  <[email protected]>

	* gpgme.texi (Cancelling an Operation): Removed.
	(Passphrase Callback): Document new type for GpgmePassphraseCb.

gpgme/
2003-02-06  Marcus Brinkmann  <[email protected]>

	* gpgme.h (GpgmePassphraseCb): Change type to return GpgmeError,
	and add argument for returning the result string.
	(gpgme_cancel): Remove prototype.
	* gpgme.c (gpgme_cancel): Remove function.
	* context.h (struct gpgme_context_s): Remove member cancel.
	* passphrase.c (_gpgme_passphrase_command_handler): Call the
	passphrase callback in the new way.

tests/
2003-02-06  Marcus Brinkmann  <[email protected]>

	* gpg/t-decrypt.c (passphrase_cb): Fix to new prototype.
	* gpg/t-decrypt-verify.c (passphrase_cb): Likewise.
	* gpg/t-edit.c (passphrase_cb): Likewise.
	* gpg/t-encrypt-sign.c (passphrase_cb): Likewise.
	* gpg/t-encrypt-sym.c (passphrase_cb): Likewise.
	* gpg/t-sign.c (passphrase_cb): Likewise.
	* gpg/t-signers.c (passphrase_cb): Likewise.

1 files changed, 7 insertions, 9 deletions

diff --git a/gpgme/passphrase.c b/gpgme/passphrase.c
index 67fb43ba..fd492ac7 100644
--- a/gpgme/passphrase.c
+++ b/gpgme/passphrase.c
@@ -125,13 +125,11 @@ _gpgme_passphrase_command_handler (void *opaque, GpgmeStatusCode code,
     {
       /* We have been called for cleanup.  */
       if (ctx->passphrase_cb)
-	{ 
-	  /* Fixme: Take the key in account.  */
-	  ctx->passphrase_cb (ctx->passphrase_cb_value, NULL, 
-			      &result->last_pw_handle);
-        }
+	/* Fixme: Take the key in account.  */
+	err = ctx->passphrase_cb (ctx->passphrase_cb_value, NULL, 
+				  &result->last_pw_handle, NULL);
       *result_r = NULL;
-      return 0;
+      return err;
     }
 
   if (!key || !ctx->passphrase_cb)
@@ -160,10 +158,10 @@ _gpgme_passphrase_command_handler (void *opaque, GpgmeStatusCode code,
 	       bad_passphrase ? "TRY_AGAIN":"ENTER",
 	       userid_hint, passphrase_info);
 
-      *result_r = ctx->passphrase_cb (ctx->passphrase_cb_value, buf,
-				      &result->last_pw_handle);
+      err  = ctx->passphrase_cb (ctx->passphrase_cb_value, buf,
+				 &result->last_pw_handle, result_r);
       free (buf);
-      return 0;
+      return err;
     }
 
   *result_r = NULL;