diff options
| author | Marcus Brinkmann <[email protected]> | 2002-09-01 19:47:11 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2002-09-01 19:47:11 +0000 |
| commit | 1731657df0b638ae23c070cda23d70b98b59bc85 (patch) | |
| tree | 64a5c6b451325bbbc18f5d6bb480bc98a82328ca | |
| parent | 2002-08-30 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-1731657df0b638ae23c070cda23d70b98b59bc85.tar.gz gpgme-1731657df0b638ae23c070cda23d70b98b59bc85.zip | |
2002-09-01 Marcus Brinkmann <[email protected]>
* op-support.c (_gpgme_op_reset): Set CTX->pending after calling
_gpgme_engine_release, as this will reset pending to zero in the
event done callback on cancelled operations.
| -rw-r--r-- | gpgme/ChangeLog | 6 | ||||
| -rw-r--r-- | gpgme/op-support.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 075eb46b..a441c1ae 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,9 @@ +2002-09-01 Marcus Brinkmann <[email protected]> + + * op-support.c (_gpgme_op_reset): Set CTX->pending after calling + _gpgme_engine_release, as this will reset pending to zero in the + event done callback on cancelled operations. + 2002-08-30 Marcus Brinkmann <[email protected]> * rungpg.c (_gpgme_gpg_op_edit): Add args from signers. diff --git a/gpgme/op-support.c b/gpgme/op-support.c index 125b7230..bcaf8327 100644 --- a/gpgme/op-support.c +++ b/gpgme/op-support.c @@ -35,13 +35,12 @@ _gpgme_op_reset (GpgmeCtx ctx, int type) struct GpgmeIOCbs io_cbs; fail_on_pending_request (ctx); - ctx->pending = 1; - _gpgme_release_result (ctx); /* Create an engine object. */ _gpgme_engine_release (ctx->engine); ctx->engine = NULL; + ctx->pending = 1; err = _gpgme_engine_new (ctx->use_cms ? GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP, &ctx->engine); if (err) |