diff options
| -rw-r--r-- | gpgme/ChangeLog | 6 | ||||
| -rw-r--r-- | gpgme/edit.c | 2 | ||||
| -rw-r--r-- | gpgme/engine.c | 5 | ||||
| -rw-r--r-- | gpgme/engine.h | 2 | ||||
| -rw-r--r-- | gpgme/rungpg.c | 3 | ||||
| -rw-r--r-- | gpgme/rungpg.h | 3 |
6 files changed, 15 insertions, 6 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index a235c97b..075eb46b 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -3,6 +3,12 @@ * rungpg.c (_gpgme_gpg_op_edit): Add args from signers. Suggested by Miguel Coca <[email protected]>. + * 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 <[email protected]> * engine-gpgsm.c (_gpgme_gpgsm_op_sign): Implement signer diff --git a/gpgme/edit.c b/gpgme/edit.c index 9b9ee740..e4dbba32 100644 --- a/gpgme/edit.c +++ b/gpgme/edit.c @@ -111,7 +111,7 @@ _gpgme_op_edit_start (GpgmeCtx ctx, int synchronous, _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. */ err = _gpgme_engine_start (ctx->engine, ctx); diff --git a/gpgme/engine.c b/gpgme/engine.c index 5c005e6b..ee56076f 100644 --- a/gpgme/engine.c +++ b/gpgme/engine.c @@ -331,7 +331,8 @@ _gpgme_engine_op_delete (EngineObject engine, GpgmeKey key, int allow_secret) 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) return mk_error (Invalid_Value); @@ -339,7 +340,7 @@ _gpgme_engine_op_edit (EngineObject engine, GpgmeKey key, GpgmeData out) switch (engine->protocol) { 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: /* FIXME */ return mk_error (Not_Implemented); diff --git a/gpgme/engine.h b/gpgme/engine.h index d2375094..be46ec7e 100644 --- a/gpgme/engine.h +++ b/gpgme/engine.h @@ -45,7 +45,7 @@ GpgmeError _gpgme_engine_op_decrypt (EngineObject engine, GpgmeData ciph, GpgmeError _gpgme_engine_op_delete (EngineObject engine, GpgmeKey key, int allow_secret); 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, GpgmeData plain, GpgmeData ciph, int use_armor); diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c index a2bc43b0..e0a4e218 100644 --- a/gpgme/rungpg.c +++ b/gpgme/rungpg.c @@ -1440,7 +1440,8 @@ _gpgme_gpg_op_delete (GpgObject gpg, GpgmeKey key, int allow_secret) 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; diff --git a/gpgme/rungpg.h b/gpgme/rungpg.h index f0e47f38..dcb6709a 100644 --- a/gpgme/rungpg.h +++ b/gpgme/rungpg.h @@ -56,7 +56,8 @@ GpgmeError _gpgme_gpg_set_command_handler (GpgObject gpg, GpgmeError _gpgme_gpg_op_decrypt (GpgObject gpg, GpgmeData ciph, GpgmeData plain); 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, GpgmeData plain, GpgmeData ciph, int use_armor); |