doc/

2003-06-06  Marcus Brinkmann  <[email protected]>

	* gpgme.texi (Crypto Operations): Rename gpgme_invalid_user_id_t
	to gpgme_invalid_key_t.

gpgme/
2003-06-06  Marcus Brinkmann  <[email protected]>

	* op-support.c (_gpgme_parse_inv_userid): Rename to
	_gpgme_parse_inv_recp and change to new datatype.
	* ops.h (_gpgme_parse_inv_key): Fix prototype.
	* gpgme.h (struct _gpgme_invalid_user_id): Rename to
	__gpgme_invalid_key.  Rename field ID to KEY.
	(gpgme_invalid_user_id_t): Rename to gpgme_invalid_key_t.
	(struct _gpgme_op_encrypt_result): Here, too.
	(struct _gpgme_op_sign_result): Likewise.
	* encrypt.c (struct op_data): Likewise.
	(release_op_data): Likewise.
	* sign.c (struct op_data): Likewise.
	(release_op_data): Likewise.

2 files changed, 17 insertions, 12 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5e239e76..dfd4f45e 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,10 @@
 2003-06-06  Marcus Brinkmann  <[email protected]>
 
+	* gpgme.texi (Crypto Operations): Rename gpgme_invalid_user_id_t
+	to gpgme_invalid_key_t.
+
+2003-06-06  Marcus Brinkmann  <[email protected]>
+
 	* gpgme.texi: Change error codes to GPG_ERR_* variants.
 	(Error Handling): Rewritten.
 
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 39dfffb3..b516047b 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -3252,24 +3252,24 @@ The function @code{gpgme_trust_item_release} is an alias for
 @cindex cryptographic operation
 
 Sometimes, the result of a crypto operation returns a list of invalid
-user IDs encountered in processing the request.  The following
-structure is used to hold information about such an user ID.
+keys encountered in processing the request.  The following structure
+is used to hold information about such a key.
 
-@deftp {Data type} {gpgme_invalid_user_id_t}
+@deftp {Data type} {gpgme_invalid_key_t}
 This is a pointer to a structure used to store a part of the result of
 a crypto operation which takes user IDs as one input parameter.  The
 structure contains the following members:
 
 @table @code
-@item gpgme_invalid_user_id_t next
-This is a pointer to the next invalid user ID structure in the linked
+@item gpgme_invalid_key_t next
+This is a pointer to the next invalid key structure in the linked
 list, or @code{NULL} if this is the last element.
 
-@item char *id
-The invalid user ID encountered.
+@item char *fpr
+The fingerprint or key ID of the invalid key encountered.
 
 @item gpgme_error_t reason
-An error code describing the reason why the user ID was found invalid.
+An error code describing the reason why the key was found invalid.
 @end table
 @end deftp
 
@@ -3946,8 +3946,8 @@ signature, you can retrieve the pointer to the result with
 members:
 
 @table @code
-@item gpgme_invalid_user_id_t invalid_signers
-A linked list with information about all invalid user IDs for which a
+@item gpgme_invalid_key_t invalid_signers
+A linked list with information about all invalid keys for which a
 signature could not be created.
 
 @item gpgme_new_signature_t signatures
@@ -4053,8 +4053,8 @@ data, you can retrieve the pointer to the result with
 members:
 
 @table @code
-@item gpgme_invalid_user_id_t invalid_recipients
-A linked list with information about all invalid user IDs for which
+@item gpgme_invalid_key_t invalid_recipients
+A linked list with information about all invalid keys for which
 the data could not be encrypted.
 @end table
 @end deftp