2002-07-25 Marcus Brinkmann <marcus@g10code.de>

	* key.c (gpgme_key_get_as_xml): Add OTRUST attribute.  Requested
	by St�phane Corth�sy.
	(gpgme_key_get_string_attr): Add GPGME_ATTR_SIG_SUMMARY case to
	silence gcc warning.

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index c0c772294abfdd357583c73bf5a87ece836f4c08..8dc46cbd1249499a25096ea9edb3b747d1fca383 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -6,6 +6,11 @@
        * rungpg.c (_gpgme_gpg_op_keylist_ext): Skip empty string
        patterns.  Reported by Stéphane Corthésy.
 
+       * key.c (gpgme_key_get_as_xml): Add OTRUST attribute.  Requested
+       by Stéphane Corthésy.
+       (gpgme_key_get_string_attr): Add GPGME_ATTR_SIG_SUMMARY case to
+       silence gcc warning.
+
 2002-07-03  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpgme.c (gpgme_set_io_cbs): Deal with CTX being NULL.

diff --git a/gpgme/key.c b/gpgme/key.c
index 879be144df61cfb1132ac2c86854b2aebef407f0..f65568d83545fa6141d5540324915b7705355a6e 100644 (file)
--- a/gpgme/key.c
+++ b/gpgme/key.c
@@ -783,6 +783,9 @@ gpgme_key_get_as_xml (GpgmeKey key)
   add_tag_and_uint (d, "len", key->keys.key_len);
   add_tag_and_time (d, "created", key->keys.timestamp);
   add_tag_and_time (d, "expire", key->keys.expires_at);
+  add_tag_and_string (d, "otrust",
+                     gpgme_key_get_string_attr (key, GPGME_ATTR_OTRUST,
+                                                NULL, 0));
   if (key->issuer_serial)
     add_tag_and_string (d, "serial", key->issuer_serial);
   if (key->issuer_name)
@@ -990,6 +993,7 @@ gpgme_key_get_string_attr (GpgmeKey key, GpgmeAttr what,
       val = key->chain_id;
       break;
     case GPGME_ATTR_SIG_STATUS:
+    case GPGME_ATTR_SIG_SUMMARY:
     case GPGME_ATTR_ERRTOK:
       /* Not of any use here.  */
       break;