2002-02-06 Marcus Brinkmann <marcus@g10code.de>

	* rungpg.c (_gpgme_gpg_op_keylist): Remove handling of keylist
	mode (for now).

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 86506efd804c3f9809a6c4f066ba44ac33c1f44f..df4f84039803be1e5d8da37c4330a05707d0433c 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-06  Marcus Brinkmann  <marcus@g10code.de>
+
+       * rungpg.c (_gpgme_gpg_op_keylist): Remove handling of keylist
+       mode (for now).
+
 2002-02-06  Marcus Brinkmann  <marcus@g10code.de>
 
        * wait.c (gpgme_wait): Add new argument STATUS, in which the

diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
index 02de00463eec3257bdf9c7f084f109bc4cdfe878..8358144585258939f48eec3a80f5eb36df4d0a66 100644 (file)
--- a/gpgme/rungpg.c
+++ b/gpgme/rungpg.c
@@ -1374,8 +1374,6 @@ _gpgme_gpg_op_keylist (GpgObject gpg, const char *pattern, int secret_only,
     err = _gpgme_gpg_add_arg (gpg, "--fixed-list-mode");
   if (!err)
     err = _gpgme_gpg_add_arg (gpg, "--with-fingerprint");
-  if (!err && keylist_mode == 1)
-    err = _gpgme_gpg_add_arg (gpg, "--no-expensive-trust-checks");
   if (!err)
     err = _gpgme_gpg_add_arg (gpg, secret_only ? "--list-secret-keys"
                              : "--list-keys");