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.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index a235c97b1414e12c8cf9ac0faf1af585a12b18ac..075eb46bae46215dc7959ab2a3db1bdc4572ebd3 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -3,6 +3,12 @@
        * rungpg.c (_gpgme_gpg_op_edit): Add args from signers.
        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>
 
        * engine-gpgsm.c (_gpgme_gpgsm_op_sign): Implement signer

diff --git a/trunk/gpgme/edit.c b/trunk/gpgme/edit.c
index 9b9ee7404273cd267791500d1467904990e714ff..e4dbba3241f8dce6a6895a72c32ee683b62d4b09 100644 (file)
--- a/trunk/gpgme/edit.c
+++ b/trunk/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/trunk/gpgme/engine.c b/trunk/gpgme/engine.c
index 5c005e6bf60b44e7ed13c155d48239c3a48ec9ea..ee56076fc8191872c3464e914f51860775d8a254 100644 (file)
--- a/trunk/gpgme/engine.c
+++ b/trunk/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/trunk/gpgme/engine.h b/trunk/gpgme/engine.h
index d2375094f4c40bb2fc7e1364f08a7c8ee49dfb6e..be46ec7ecc01ddc68b28cd766cb9ceeefcef38fd 100644 (file)
--- a/trunk/gpgme/engine.h
+++ b/trunk/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/trunk/gpgme/rungpg.c b/trunk/gpgme/rungpg.c
index a2bc43b0e85bff571d076f7346e99d07970bdbea..e0a4e2181784488cad6607aff22a396039a66f4f 100644 (file)
--- a/trunk/gpgme/rungpg.c
+++ b/trunk/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/trunk/gpgme/rungpg.h b/trunk/gpgme/rungpg.h
index f0e47f38ec6eb8b98412b1ad58e10757511b1299..dcb6709a8983f402d8e184700b5567ec270bc9f9 100644 (file)
--- a/trunk/gpgme/rungpg.h
+++ b/trunk/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);