GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-11-10 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* op-support.c (_gpgme_op_reset): Instead of last change, only set
	sub protocol if it is not the default.
This commit is contained in:
Marcus Brinkmann 2009-11-10 18:05:04 +00:00
parent d173e6e010
commit aff1ed3fb6
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2009-11-10 Marcus Brinkmann <marcus@g10code.de>
* op-support.c (_gpgme_op_reset): Instead of last change, only set
sub protocol if it is not the default.
2009-11-10 Werner Koch <wk@g10code.com>
* op-support.c (_gpgme_op_reset): Ignore GPG_ERR_NOT_IMPLEMENTED

11
src/op-support.c
View File

@ -130,11 +130,12 @@ _gpgme_op_reset (gpgme_ctx_t ctx, int type)
}
}
err = _gpgme_engine_set_protocol (ctx->engine, ctx->sub_protocol);
if (gpg_err_code (err) == GPG_ERR_NOT_IMPLEMENTED)
err = 0;
if (err)
return err;
if (ctx->sub_protocol != GPGME_PROTOCOL_DEFAULT)
{
err = _gpgme_engine_set_protocol (ctx->engine, ctx->sub_protocol);
if (err)
return err;
}
if (type == 1 || (type == 2 && !ctx->io_cbs.add))
{