diff options
| -rw-r--r-- | doc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/gpgme.texi | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index e7f113d6..a6adbdb6 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2008-06-25 Werner Koch <[email protected]> + + * gpgme.texi (Listing Keys): Updated example to the current API. + Noted by Nico Schottelius. + 2008-06-05 Werner Koch <[email protected]> * uiserver.texi (Miscellaneous UI Server Commands): Describe diff --git a/doc/gpgme.texi b/doc/gpgme.texi index b5fba15b..2b96d873 100644 --- a/doc/gpgme.texi +++ b/doc/gpgme.texi @@ -2772,6 +2772,7 @@ and e-mail address of the main user ID: @example gpgme_ctx_t ctx; +gpgme_key_t key; gpgme_error_t err = gpgme_new (&ctx); if (!err) @@ -2782,15 +2783,19 @@ if (!err) err = gpgme_op_keylist_next (ctx, &key); if (err) break; - printf ("%s: %s <%s>\n", key->keyid, key->name, key->email); + printf ("%s:", key->subkeys->keyid); + if (key->uids && key->uids->name) + printf (" %s", key->uids->name); + if (key->uids && key->uids->email) + printf (" <%s>", key->uids->email); + putchar ('\n'); gpgme_key_release (key); @} gpgme_release (ctx); @} if (gpg_err_code (err) != GPG_ERR_EOF) @{ - fprintf (stderr, "%s: can not list keys: %s\n", - argv[0], gpgme_strerror (err)); + fprintf (stderr, "can not list keys: %s\n", gpgme_strerror (err)); exit (1); @} @end example |