2002-11-19 Marcus Brinkmann <marcus@g10code.de>

	* rungpg.c (gpg_keylist): Add --with-fingerprint to gpg invocation
	twice, to get fingerprints on subkeys.  Suggested by Timo Schulz
	<twoaday@freakmail.de>.
	(gpg_keylist_ext): Likewise.

diff --git a/branches/gpgme-0-3-branch/gpgme/ChangeLog b/branches/gpgme-0-3-branch/gpgme/ChangeLog
index b754dc233ffaa9e5dacf3004549d1dfbcbe238b1..f37c566b7d01dc419656cbb1666edc994cad0d74 100644 (file)
--- a/branches/gpgme-0-3-branch/gpgme/ChangeLog
+++ b/branches/gpgme-0-3-branch/gpgme/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-19  Marcus Brinkmann  <marcus@g10code.de>
+
+       * rungpg.c (gpg_keylist): Add --with-fingerprint to gpg invocation
+       twice, to get fingerprints on subkeys.  Suggested by Timo Schulz
+       <twoaday@freakmail.de>.
+       (gpg_keylist_ext): Likewise.
+
 2002-11-05  Marcus Brinkmann  <marcus@g10code.de>
 
        * import.c (append_xml_impinfo): Use

diff --git a/branches/gpgme-0-3-branch/gpgme/rungpg.c b/branches/gpgme-0-3-branch/gpgme/rungpg.c
index f67f68fdebc73a6d61982bde2cfea0ed3ea3f488..6cffe35e9fa9fc3dcb1a448f941787e083044b10 100644 (file)
--- a/branches/gpgme-0-3-branch/gpgme/rungpg.c
+++ b/branches/gpgme-0-3-branch/gpgme/rungpg.c
@@ -1668,6 +1668,8 @@ _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)
+    err = _gpgme_gpg_add_arg (gpg, "--with-fingerprint");
   if (!err)
     err = _gpgme_gpg_add_arg (gpg, 
                               (keylist_mode & GPGME_KEYLIST_MODE_SIGS)?
@@ -1699,6 +1701,8 @@ _gpgme_gpg_op_keylist_ext (GpgObject gpg, const char *pattern[],
     err = _gpgme_gpg_add_arg (gpg, "--fixed-list-mode");
   if (!err)
     err = _gpgme_gpg_add_arg (gpg, "--with-fingerprint");
+  if (!err)
+    err = _gpgme_gpg_add_arg (gpg, "--with-fingerprint");
   if (!err)
     err = _gpgme_gpg_add_arg (gpg, secret_only ? "--list-secret-keys"
                              : "--list-keys");