2003-02-18 Marcus Brinkmann <marcus@g10code.de>
* engine-gpgsm.c (_gpgme_gpgsm_op_sign): Call gpgsm_assuan_simple_command with status handlers. * edit.c (_gpgme_op_edit_start): Check return value of _gpgme_engine_op_edit. * import.c (_gpgme_op_import_start): Likewise for _gpgme_engine_op_import. * sign.c (_gpgme_op_sign_start): Likewise for _gpgme_engine_op_sign.
This commit is contained in:
parent
12c461d1ea
commit
ad7abd9d9c
@ -1,3 +1,14 @@
|
|||||||
|
2003-02-18 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
|
* engine-gpgsm.c (_gpgme_gpgsm_op_sign): Call
|
||||||
|
gpgsm_assuan_simple_command with status handlers.
|
||||||
|
* edit.c (_gpgme_op_edit_start): Check return value of
|
||||||
|
_gpgme_engine_op_edit.
|
||||||
|
* import.c (_gpgme_op_import_start): Likewise for
|
||||||
|
_gpgme_engine_op_import.
|
||||||
|
* sign.c (_gpgme_op_sign_start): Likewise for
|
||||||
|
_gpgme_engine_op_sign.
|
||||||
|
|
||||||
2003-01-30 Marcus Brinkmann <marcus@g10code.de>
|
2003-01-30 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
* edit.c (_gpgme_edit_status_handler): Call the progress status
|
* edit.c (_gpgme_edit_status_handler): Call the progress status
|
||||||
|
@ -112,10 +112,11 @@ _gpgme_op_edit_start (GpgmeCtx ctx, int synchronous,
|
|||||||
|
|
||||||
_gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
|
_gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
|
||||||
|
|
||||||
_gpgme_engine_op_edit (ctx->engine, key, out, ctx);
|
err = _gpgme_engine_op_edit (ctx->engine, key, out, ctx);
|
||||||
|
|
||||||
/* And kick off the process. */
|
/* And kick off the process. */
|
||||||
err = _gpgme_engine_start (ctx->engine, ctx);
|
if (!err)
|
||||||
|
err = _gpgme_engine_start (ctx->engine, ctx);
|
||||||
|
|
||||||
leave:
|
leave:
|
||||||
if (err)
|
if (err)
|
||||||
|
@ -1138,7 +1138,8 @@ _gpgme_gpgsm_op_sign (GpgsmObject gpgsm, GpgmeData in, GpgmeData out,
|
|||||||
|
|
||||||
strcpy (stpcpy (buf, "SIGNER "), s);
|
strcpy (stpcpy (buf, "SIGNER "), s);
|
||||||
err = gpgsm_assuan_simple_command (gpgsm->assuan_ctx, buf,
|
err = gpgsm_assuan_simple_command (gpgsm->assuan_ctx, buf,
|
||||||
NULL, NULL);
|
gpgsm->status.fnc,
|
||||||
|
gpgsm->status.fnc_value);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
err = GPGME_Invalid_Key;
|
err = GPGME_Invalid_Key;
|
||||||
|
@ -196,7 +196,7 @@ _gpgme_op_import_start (GpgmeCtx ctx, int synchronous, GpgmeData keydata)
|
|||||||
_gpgme_engine_set_status_handler (ctx->engine, import_status_handler, ctx);
|
_gpgme_engine_set_status_handler (ctx->engine, import_status_handler, ctx);
|
||||||
_gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
|
_gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
|
||||||
|
|
||||||
_gpgme_engine_op_import (ctx->engine, keydata);
|
err = _gpgme_engine_op_import (ctx->engine, keydata);
|
||||||
|
|
||||||
if (!err)
|
if (!err)
|
||||||
err = _gpgme_engine_start (ctx->engine, ctx);
|
err = _gpgme_engine_start (ctx->engine, ctx);
|
||||||
|
@ -206,12 +206,13 @@ _gpgme_op_sign_start (GpgmeCtx ctx, int synchronous,
|
|||||||
ctx);
|
ctx);
|
||||||
_gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
|
_gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
|
||||||
|
|
||||||
_gpgme_engine_op_sign (ctx->engine, in, out, mode, ctx->use_armor,
|
err = _gpgme_engine_op_sign (ctx->engine, in, out, mode, ctx->use_armor,
|
||||||
ctx->use_textmode, ctx->include_certs,
|
ctx->use_textmode, ctx->include_certs,
|
||||||
ctx /* FIXME */);
|
ctx /* FIXME */);
|
||||||
|
|
||||||
/* And kick off the process. */
|
/* And kick off the process. */
|
||||||
err = _gpgme_engine_start (ctx->engine, ctx);
|
if (!err)
|
||||||
|
err = _gpgme_engine_start (ctx->engine, ctx);
|
||||||
|
|
||||||
leave:
|
leave:
|
||||||
if (err)
|
if (err)
|
||||||
|
Loading…
Reference in New Issue
Block a user