2003-04-24 Marcus Brinkmann <marcus@g10code.de>

	* context.h (struct gpgme_context_s): Remove member verbosity.
	* gpgme.c (gpgme_new): Do not set member verbosity.
	* engine.h (_gpgme_engine_set_verbosity): Remove prototype.
	* engine.c (_gpgme_engine_set_verbosity): Remove function.
	* engine-backend.h (struct engine_ops): Remove set_verbosity.
	* engine-gpgsm.c (_gpgme_engine_ops_gpgsm): Remove set_verbosity member.
	* rungpg.c (_gpgme_engine_ops_gpg): Likewise.
	(gpg_set_verbosity): Remove function.
	* decrypt.c (_gpgme_decrypt_start): Don't call
	_gpgme_engine_set_verbosity.
	* delete.c (_gpgme_op_delete_start): Likewise.
	* edit.c (_gpgme_op_edit_start): Likewise.
	* encrypt.c (_gpgme_op_encrypt_start): Likewise.
	* encrypt-sign.c (_gpgme_op_encrypt_sign_start): Likewise.
	* export.c (_gpgme_op_export_start): Likewise.
	* genkey.c (_gpgme_op_genkey_start): Likewise.
	* import.c (_gpgme_op_import_start): Likewise.
	* keylist.c (gpgme_op_keylist_start): Likewise.
	(gpgme_op_keylist_ext_start): Likewise.
	* sign.c (_gpgme_op_sign_start): Likewise.
	* verify.c (_gpgme_op_verify_start): Likewise.

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 1b4d0b5f7c88c0b19473ff5d25afef33edd630a5..af28e5a4f564ee9453b65570a18255f92fa3ee0e 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,27 @@
 2003-04-24  Marcus Brinkmann  <marcus@g10code.de>
        
+       * context.h (struct gpgme_context_s): Remove member verbosity.
+       * gpgme.c (gpgme_new): Do not set member verbosity.
+       * engine.h (_gpgme_engine_set_verbosity): Remove prototype.
+       * engine.c (_gpgme_engine_set_verbosity): Remove function.
+       * engine-backend.h (struct engine_ops): Remove set_verbosity.
+       * engine-gpgsm.c (_gpgme_engine_ops_gpgsm): Remove set_verbosity member.
+       * rungpg.c (_gpgme_engine_ops_gpg): Likewise.
+       (gpg_set_verbosity): Remove function.
+       * decrypt.c (_gpgme_decrypt_start): Don't call
+       _gpgme_engine_set_verbosity.
+       * delete.c (_gpgme_op_delete_start): Likewise.
+       * edit.c (_gpgme_op_edit_start): Likewise.
+       * encrypt.c (_gpgme_op_encrypt_start): Likewise.
+       * encrypt-sign.c (_gpgme_op_encrypt_sign_start): Likewise.
+       * export.c (_gpgme_op_export_start): Likewise.
+       * genkey.c (_gpgme_op_genkey_start): Likewise.
+       * import.c (_gpgme_op_import_start): Likewise.
+       * keylist.c (gpgme_op_keylist_start): Likewise.
+       (gpgme_op_keylist_ext_start): Likewise.
+       * sign.c (_gpgme_op_sign_start): Likewise.
+       * verify.c (_gpgme_op_verify_start): Likewise.
+
        * Makefile.am (libgpgme_la_SOURCES): Add key-cache.c.
        * key.c (key_cache_initialized, key_cache_size,
        key_cache_max_chain_length, ): Removed.
@@ -3294,4 +3316,3 @@
  This file is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-       

diff --git a/gpgme/context.h b/gpgme/context.h
index 41f25c628bd1648cb96ddea0c962320ada535748..748dd2e189dd36e1a4878b0b9fceb9de02eb4b68 100644 (file)
--- a/gpgme/context.h
+++ b/gpgme/context.h
@@ -81,8 +81,6 @@ struct gpgme_context_s
   /* The running engine process.  */
   EngineObject engine;
 
-  /* Level of verbosity to use.  */
-  int verbosity;
   int use_armor;  
   int use_textmode;
   int keylist_mode;

diff --git a/gpgme/decrypt.c b/gpgme/decrypt.c
index 40ae932b0ee21447e423435c9975196eca246409..a27e156136d8932cc23f3f3222f11b5a53aadb8b 100644 (file)
--- a/gpgme/decrypt.c
+++ b/gpgme/decrypt.c
@@ -188,7 +188,6 @@ _gpgme_decrypt_start (GpgmeCtx ctx, int synchronous,
     goto leave;
 
   _gpgme_engine_set_status_handler (ctx->engine, status_handler, ctx);
-  _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
   err = _gpgme_engine_op_decrypt (ctx->engine, ciph, plain);
 

diff --git a/gpgme/delete.c b/gpgme/delete.c
index 1bed6d5f1e11f7382094a08ff29ce1bd81488908..9e8ebe9ddf8fa058d89ce12e3f0964ce73024c0c 100644 (file)
--- a/gpgme/delete.c
+++ b/gpgme/delete.c
@@ -75,7 +75,6 @@ _gpgme_op_delete_start (GpgmeCtx ctx, int synchronous,
     goto leave;
 
   _gpgme_engine_set_status_handler (ctx->engine, delete_status_handler, ctx);
-  _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
   err = _gpgme_engine_op_delete (ctx->engine, key, allow_secret);
 

diff --git a/gpgme/edit.c b/gpgme/edit.c
index e46f42bcfd2ea6a168ebf649a0963f0feb99bcfe..f729196d27b5af66a6830cedb3f2e8c7bc5cea9e 100644 (file)
--- a/gpgme/edit.c
+++ b/gpgme/edit.c
@@ -121,8 +121,6 @@ _gpgme_op_edit_start (GpgmeCtx ctx, int synchronous,
 
   _gpgme_engine_set_status_handler (ctx->engine, edit_status_handler, ctx);
 
-  _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
-
   err = _gpgme_engine_op_edit (ctx->engine, key, out, ctx);
 
  leave:

diff --git a/gpgme/encrypt-sign.c b/gpgme/encrypt-sign.c
index b20f2b327373f6658f0c999a7b0daf2e6c51dc81..2ed1b1c626e58ef17e91e46537ac173b7999ab1f 100644 (file)
--- a/gpgme/encrypt-sign.c
+++ b/gpgme/encrypt-sign.c
@@ -59,7 +59,6 @@ _gpgme_op_encrypt_sign_start (GpgmeCtx ctx, int synchronous,
 
   _gpgme_engine_set_status_handler (ctx->engine,
                                    encrypt_sign_status_handler, ctx);
-  _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
   /* Check the supplied data */
   if (!plain)

diff --git a/gpgme/encrypt.c b/gpgme/encrypt.c
index 7679d74779c7ff09af6c73b87f1584ed22c66fde..86de371e160114e20ff9520e02a7b8b59a737ace 100644 (file)
--- a/gpgme/encrypt.c
+++ b/gpgme/encrypt.c
@@ -188,7 +188,6 @@ _gpgme_op_encrypt_start (GpgmeCtx ctx, int synchronous,
                                    ? _gpgme_encrypt_sym_status_handler
                                    : _gpgme_encrypt_status_handler,
                                    ctx);
-  _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
   /* Check the supplied data */
   if (!plain)

diff --git a/gpgme/engine-backend.h b/gpgme/engine-backend.h
index 2a832b3caa2fea8e030867723eed4969f375fbbb..0262ad69e21764ff8bb2d2edc6f2e2cf38b6aa73 100644 (file)
--- a/gpgme/engine-backend.h
+++ b/gpgme/engine-backend.h
@@ -44,7 +44,6 @@ struct engine_ops
   GpgmeError (*set_colon_line_handler) (void *engine,
                                        EngineColonLineHandler fnc,
                                        void *fnc_value);
-  GpgmeError (*set_verbosity) (void *engine, int verbosity);
   GpgmeError (*decrypt) (void *engine, GpgmeData ciph, GpgmeData plain);
   GpgmeError (*delete) (void *engine, GpgmeKey key, int allow_secret);
   GpgmeError (*edit) (void *engine, GpgmeKey key, GpgmeData out,

diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index 3f78ef90707b8c4df69ec55d4735c8d31d573a4f..a09d234cd9e3c3bcd31f18b3d3863ce5f143a5e3 100644 (file)
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -1439,7 +1439,6 @@ struct engine_ops _gpgme_engine_ops_gpgsm =
     gpgsm_set_status_handler,
     NULL,              /* set_command_handler */
     gpgsm_set_colon_line_handler,
-    NULL,              /* set_verbosity */
     gpgsm_decrypt,
     gpgsm_delete,
     NULL,              /* edit */

diff --git a/gpgme/engine.c b/gpgme/engine.c
index f5891b9ac9d39ebed7cc2cb94a2a1c1b3e798304..c3b70c2e5859fe97589dfb807116c6f3b578b102 100644 (file)
--- a/gpgme/engine.c
+++ b/gpgme/engine.c
@@ -206,17 +206,6 @@ _gpgme_engine_release (EngineObject engine)
 }
 
 
-void
-_gpgme_engine_set_verbosity (EngineObject engine, int verbosity)
-{
-  if (!engine)
-    return;
-
-  if (engine->ops->set_verbosity)
-    (*engine->ops->set_verbosity) (engine->engine, verbosity);
-}
-
-
 void
 _gpgme_engine_set_status_handler (EngineObject engine,
                                  EngineStatusHandler fnc, void *fnc_value)

diff --git a/gpgme/engine.h b/gpgme/engine.h
index 25870ba1907b3ca4b53894cd81d87d43f351c69e..754640290e42195faa7b202ea547e99e782936bc 100644 (file)
--- a/gpgme/engine.h
+++ b/gpgme/engine.h
@@ -45,7 +45,6 @@ GpgmeError _gpgme_engine_set_command_handler (EngineObject engine,
 GpgmeError _gpgme_engine_set_colon_line_handler (EngineObject engine,
                                                 EngineColonLineHandler fnc,
                                                 void *fnc_value);
-void _gpgme_engine_set_verbosity (EngineObject engine, int verbosity);
 GpgmeError _gpgme_engine_op_decrypt (EngineObject engine, GpgmeData ciph,
                                     GpgmeData plain);
 GpgmeError _gpgme_engine_op_delete (EngineObject engine, GpgmeKey key,

diff --git a/gpgme/export.c b/gpgme/export.c
index 4031986278408cf408adeadbf00fc9a38d271570..3fda60279ce25f4c1b1a5bccd81e7d3d9f8a4cbe 100644 (file)
--- a/gpgme/export.c
+++ b/gpgme/export.c
@@ -54,7 +54,6 @@ _gpgme_op_export_start (GpgmeCtx ctx, int synchronous,
     }
 
   _gpgme_engine_set_status_handler (ctx->engine, export_status_handler, ctx);
-  _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
   err = _gpgme_engine_op_export (ctx->engine, recp, keydata, ctx->use_armor);
 

diff --git a/gpgme/genkey.c b/gpgme/genkey.c
index 1d078b0e76f991f0d0e9ce39fdfec75cbec98365..caca6cb2f28089462a919e9f13078d120b7bdb2d 100644 (file)
--- a/gpgme/genkey.c
+++ b/gpgme/genkey.c
@@ -127,7 +127,6 @@ _gpgme_op_genkey_start (GpgmeCtx ctx, int synchronous, const char *parms,
     goto leave;
 
   _gpgme_engine_set_status_handler (ctx->engine, genkey_status_handler, ctx);
-  _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
   err = _gpgme_engine_op_genkey (ctx->engine, ctx->help_data_1, ctx->use_armor,
                                 pubkey, seckey);

diff --git a/gpgme/gpgme.c b/gpgme/gpgme.c
index 6deb627a5f9e9b589c422bea1315329d7bf2bde7..5f62b59e8d58bd4935fa052a2a1122edaf3e4e86 100644 (file)
--- a/gpgme/gpgme.c
+++ b/gpgme/gpgme.c
@@ -52,7 +52,6 @@ gpgme_new (GpgmeCtx *r_ctx)
   if (!ctx)
     return GPGME_Out_Of_Core;
   ctx->keylist_mode = GPGME_KEYLIST_MODE_LOCAL;
-  ctx->verbosity = 1;
   ctx->include_certs = 1;
   _gpgme_fd_table_init (&ctx->fdt);
   *r_ctx = ctx;

diff --git a/gpgme/import.c b/gpgme/import.c
index 30138bcd0d59a3ea2c54be899fb41eafd743244a..3c050b198656a480a7134238aed01f8f7fbd3679 100644 (file)
--- a/gpgme/import.c
+++ b/gpgme/import.c
@@ -197,7 +197,6 @@ _gpgme_op_import_start (GpgmeCtx ctx, int synchronous, GpgmeData keydata)
     }
 
   _gpgme_engine_set_status_handler (ctx->engine, import_status_handler, ctx);
-  _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
   err = _gpgme_engine_op_import (ctx->engine, keydata);
 

diff --git a/gpgme/keylist.c b/gpgme/keylist.c
index 29e2459f8481153bc74aee7720b664daca4c09af..85f1ff370a585f3b77115a59af3bbd01376755d0 100644 (file)
--- a/gpgme/keylist.c
+++ b/gpgme/keylist.c
@@ -744,11 +744,6 @@ gpgme_op_keylist_start (GpgmeCtx ctx, const char *pattern, int secret_only)
   if (err)
     goto leave;
 
-  /* We don't want to use the verbose mode as this will also print the
-     key signatures which is in most cases not needed and furthermore
-     we just ignore those lines - This should speed up things.  */
-  _gpgme_engine_set_verbosity (ctx->engine, 0);
-
   err = _gpgme_engine_op_keylist (ctx->engine, pattern, secret_only,
                                  ctx->keylist_mode);
 
@@ -794,11 +789,6 @@ gpgme_op_keylist_ext_start (GpgmeCtx ctx, const char *pattern[],
   if (err)
     goto leave;
 
-  /* We don't want to use the verbose mode as this will also print the
-     key signatures which is in most cases not needed and furthermore
-     we just ignore those lines - This should speed up things.  */
-  _gpgme_engine_set_verbosity (ctx->engine, 0);
-
   err = _gpgme_engine_op_keylist_ext (ctx->engine, pattern, secret_only,
                                      reserved, ctx->keylist_mode);
 

diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
index d55fbc69a3560a3adbff3e59de351b3c615eee3a..e25336ad81df3082707cfbb9925226d4453ba251 100644 (file)
--- a/gpgme/rungpg.c
+++ b/gpgme/rungpg.c
@@ -394,17 +394,6 @@ gpg_new (void **engine)
 }
 
 
-static GpgmeError
-gpg_set_verbosity (void *engine, int verbosity)
-{
-  GpgObject gpg = engine;
-
-  GpgmeError err = 0;
-  while (!err && verbosity-- > 0)
-    err = add_arg (gpg, "--verbose");
-  return err;
-}
-
 /* Note, that the status_handler is allowed to modifiy the args
    value.  */
 static void
@@ -1660,7 +1649,6 @@ struct engine_ops _gpgme_engine_ops_gpg =
     gpg_set_status_handler,
     gpg_set_command_handler,
     gpg_set_colon_line_handler,
-    gpg_set_verbosity,
     gpg_decrypt,
     gpg_delete,
     gpg_edit,

diff --git a/gpgme/sign.c b/gpgme/sign.c
index f45879a75bb576bd86b4c2f0355a4cc30a31a9c3..68f6855988e425c03bb9b8f47d18cc4992080df3 100644 (file)
--- a/gpgme/sign.c
+++ b/gpgme/sign.c
@@ -214,7 +214,6 @@ _gpgme_op_sign_start (GpgmeCtx ctx, int synchronous,
 
   _gpgme_engine_set_status_handler (ctx->engine, _gpgme_sign_status_handler,
                                    ctx);
-  _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
   err = _gpgme_engine_op_sign (ctx->engine, in, out, mode, ctx->use_armor,
                               ctx->use_textmode, ctx->include_certs,

diff --git a/gpgme/verify.c b/gpgme/verify.c
index 190418f4ee1d58d2a8fea0e137fe93eee0ad91b1..3b63491f0a9e26f77806c12cacfdeca38012a61b 100644 (file)
--- a/gpgme/verify.c
+++ b/gpgme/verify.c
@@ -382,7 +382,6 @@ _gpgme_op_verify_start (GpgmeCtx ctx, int synchronous,
 
   _gpgme_engine_set_status_handler (ctx->engine, _gpgme_verify_status_handler,
                                    ctx);
-  _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
   /* Check the supplied data.  */
   if (!sig)