2002-08-30 Marcus Brinkmann <marcus@g10code.de>

* rungpg.c (_gpgme_gpg_op_edit): Add bogus ctx argument.
	* rungpg.h: Also to prototype.
	* engine.c (_gpgme_engine_op_edit): Likewise.
	* engine.h: Likewise.
	* edit.c (_gpgme_op_edit_start): Likewise.
This commit is contained in:
Marcus Brinkmann 2002-08-31 02:34:26 +00:00
parent 6f9f516830
commit ee97cfaa5d
6 changed files with 15 additions and 6 deletions

View File

@ -3,6 +3,12 @@
* rungpg.c (_gpgme_gpg_op_edit): Add args from signers. * rungpg.c (_gpgme_gpg_op_edit): Add args from signers.
Suggested by Miguel Coca <e970095@zipi.fi.upm.es>. Suggested by Miguel Coca <e970095@zipi.fi.upm.es>.
* rungpg.c (_gpgme_gpg_op_edit): Add bogus ctx argument.
* rungpg.h: Also to prototype.
* engine.c (_gpgme_engine_op_edit): Likewise.
* engine.h: Likewise.
* edit.c (_gpgme_op_edit_start): Likewise.
2002-08-29 Werner Koch <wk@gnupg.org> 2002-08-29 Werner Koch <wk@gnupg.org>
* engine-gpgsm.c (_gpgme_gpgsm_op_sign): Implement signer * engine-gpgsm.c (_gpgme_gpgsm_op_sign): Implement signer

View File

@ -111,7 +111,7 @@ _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); _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); err = _gpgme_engine_start (ctx->engine, ctx);

View File

@ -331,7 +331,8 @@ _gpgme_engine_op_delete (EngineObject engine, GpgmeKey key, int allow_secret)
GpgmeError GpgmeError
_gpgme_engine_op_edit (EngineObject engine, GpgmeKey key, GpgmeData out) _gpgme_engine_op_edit (EngineObject engine, GpgmeKey key, GpgmeData out,
GpgmeCtx ctx /* FIXME */)
{ {
if (!engine) if (!engine)
return mk_error (Invalid_Value); return mk_error (Invalid_Value);
@ -339,7 +340,7 @@ _gpgme_engine_op_edit (EngineObject engine, GpgmeKey key, GpgmeData out)
switch (engine->protocol) switch (engine->protocol)
{ {
case GPGME_PROTOCOL_OpenPGP: case GPGME_PROTOCOL_OpenPGP:
return _gpgme_gpg_op_edit (engine->engine.gpg, key, out); return _gpgme_gpg_op_edit (engine->engine.gpg, key, out, ctx);
case GPGME_PROTOCOL_CMS: case GPGME_PROTOCOL_CMS:
/* FIXME */ /* FIXME */
return mk_error (Not_Implemented); return mk_error (Not_Implemented);

View File

@ -45,7 +45,7 @@ GpgmeError _gpgme_engine_op_decrypt (EngineObject engine, GpgmeData ciph,
GpgmeError _gpgme_engine_op_delete (EngineObject engine, GpgmeKey key, GpgmeError _gpgme_engine_op_delete (EngineObject engine, GpgmeKey key,
int allow_secret); int allow_secret);
GpgmeError _gpgme_engine_op_edit (EngineObject engine, GpgmeKey key, GpgmeError _gpgme_engine_op_edit (EngineObject engine, GpgmeKey key,
GpgmeData out); GpgmeData out, GpgmeCtx ctx /* FIXME */);
GpgmeError _gpgme_engine_op_encrypt (EngineObject engine, GpgmeRecipients recp, GpgmeError _gpgme_engine_op_encrypt (EngineObject engine, GpgmeRecipients recp,
GpgmeData plain, GpgmeData ciph, GpgmeData plain, GpgmeData ciph,
int use_armor); int use_armor);

View File

@ -1440,7 +1440,8 @@ _gpgme_gpg_op_delete (GpgObject gpg, GpgmeKey key, int allow_secret)
GpgmeError GpgmeError
_gpgme_gpg_op_edit (GpgObject gpg, GpgmeKey key, GpgmeData out) _gpgme_gpg_op_edit (GpgObject gpg, GpgmeKey key, GpgmeData out,
GpgmeCtx ctx /* FIXME */)
{ {
GpgmeError err; GpgmeError err;

View File

@ -56,7 +56,8 @@ GpgmeError _gpgme_gpg_set_command_handler (GpgObject gpg,
GpgmeError _gpgme_gpg_op_decrypt (GpgObject gpg, GpgmeData ciph, GpgmeError _gpgme_gpg_op_decrypt (GpgObject gpg, GpgmeData ciph,
GpgmeData plain); GpgmeData plain);
GpgmeError _gpgme_gpg_op_delete (GpgObject gpg, GpgmeKey key, int allow_secret); GpgmeError _gpgme_gpg_op_delete (GpgObject gpg, GpgmeKey key, int allow_secret);
GpgmeError _gpgme_gpg_op_edit (GpgObject gpg, GpgmeKey key, GpgmeData out); GpgmeError _gpgme_gpg_op_edit (GpgObject gpg, GpgmeKey key, GpgmeData out,
GpgmeCtx ctx /* FIXME */);
GpgmeError _gpgme_gpg_op_encrypt (GpgObject gpg, GpgmeRecipients recp, GpgmeError _gpgme_gpg_op_encrypt (GpgObject gpg, GpgmeRecipients recp,
GpgmeData plain, GpgmeData ciph, GpgmeData plain, GpgmeData ciph,
int use_armor); int use_armor);