2003-04-25 Marcus Brinkmann <marcus@g10code.de>

* gpgme.h (GpgmeError): Add GPGME_Busy, GPGME_No_Request.
	(GPGME_No_Recipients, GPGME_Invalid_Recipient,
	GPGME_No_Passphrase): New macros.
This commit is contained in:
Marcus Brinkmann 2003-04-25 11:31:14 +00:00
parent 8c359e5416
commit bd07371233
4 changed files with 47 additions and 22 deletions

14
NEWS
View File

@ -41,6 +41,9 @@ Noteworthy changes in version 0.4.1 (unreleased)
function has been removed, just return GPGME_Canceled in the function has been removed, just return GPGME_Canceled in the
passphrase callback directly. passphrase callback directly.
* The status of a context operation is not checked anymore, so the
errors GPGME_Busy and GPGME_No_Request can not occur anymore.
* For clarity and better reusability, the error codes * For clarity and better reusability, the error codes
GPGME_No_Recipients, GPGME_Invalid_Recipient and GPGME_No_Recipients, GPGME_Invalid_Recipient and
GPGME_No_Passphrase have been renamed to GPGME_No_UserID, GPGME_No_Passphrase have been renamed to GPGME_No_UserID,
@ -85,9 +88,14 @@ gpgme_get_engine_info CHANGED: Return info structure instead XML.
gpgme_get_protocol_name NEW gpgme_get_protocol_name NEW
GpgmePassphraseCb CHANGED: Return error value, new argument. GpgmePassphraseCb CHANGED: Return error value, new argument.
gpgme_cancel REMOVED: Return error in callback directly. gpgme_cancel REMOVED: Return error in callback directly.
GPGME_No_Recipients CHANGED: Now GPGME_No_UserID. GPGME_Busy DEPRECATED: Not in use.
GPGME_Invalid_Recipient CHANGED: Now GPGME_Invalid_UserID. GPGME_No_Request DEPRECATED: Not in use.
GPGME_No_Passphrase CHANGED: Now GPGME_Bad_Passphrase. GPGME_No_Recipients DEPRECATED: Use GPGME_No_UserID.
GPGME_No_UserID NEW
GPGME_Invalid_Recipient DEPRECATED: Use GPGME_Invalid_UserID.
GPGME_Invalid_UserID NEW
GPGME_No_Passphrase DEPRECATED: Use GPGME_Bad_Passphrase.
GPGME_Bad_Passphrase NEW
gpgme_op_genkey CHANGED: FPR argument dropped. gpgme_op_genkey CHANGED: FPR argument dropped.
gpgme_op_genkey_result NEW gpgme_op_genkey_result NEW
GpgmeGenKeyResult NEW GpgmeGenKeyResult NEW

8
TODO
View File

@ -6,6 +6,14 @@ Hey Emacs, this is -*- outline -*- mode!
returning information in the blocking version as function arguments). returning information in the blocking version as function arguments).
** Drop the support for finding out if an operation is pending. After all, one ** Drop the support for finding out if an operation is pending. After all, one
or two more ways for a user to shoot themselves in the foot don't matter. or two more ways for a user to shoot themselves in the foot don't matter.
** Compatibility interfaces that can be removed in future versions:
*** gpgme_data_new_from_filepart
*** gpgme_data_new_from_file
*** gpgme_data_new_with_read_cb
*** gpgme_data_rewind
*** GPGME_Busy, GPGME_No_Request
*** GPGME_No_Passphrase
*** GPGME_Invalid_Recipient, GPGME_No_Recipients
* Thread support: * Thread support:
** Build thread modules for static linking (which just suck in the ** Build thread modules for static linking (which just suck in the

View File

@ -1,5 +1,9 @@
2003-04-25 Marcus Brinkmann <marcus@g10code.de> 2003-04-25 Marcus Brinkmann <marcus@g10code.de>
* gpgme.h (GpgmeError): Add GPGME_Busy, GPGME_No_Request.
(GPGME_No_Recipients, GPGME_Invalid_Recipient,
GPGME_No_Passphrase): New macros.
* key.c (gpgme_key_get_string_attr): Fix validity attribute. * key.c (gpgme_key_get_string_attr): Fix validity attribute.
2003-04-24 Marcus Brinkmann <marcus@g10code.de> 2003-04-24 Marcus Brinkmann <marcus@g10code.de>

View File

@ -78,28 +78,33 @@ typedef enum
GPGME_General_Error = 0x0001, GPGME_General_Error = 0x0001,
GPGME_Out_Of_Core = 0x0002, GPGME_Out_Of_Core = 0x0002,
GPGME_Invalid_Value = 0x0003, GPGME_Invalid_Value = 0x0003,
GPGME_No_Request = 0x0004, GPGME_Exec_Error = 0x0004,
GPGME_Exec_Error = 0x0005, GPGME_Too_Many_Procs = 0x0005,
GPGME_Too_Many_Procs = 0x0006, GPGME_Pipe_Error = 0x0006,
GPGME_Pipe_Error = 0x0007, GPGME_No_Data = 0x0007,
GPGME_No_Data = 0x0008, GPGME_Conflict = 0x0008,
GPGME_Conflict = 0x0009, GPGME_Not_Implemented = 0x0009,
GPGME_Not_Implemented = 0x000a, GPGME_Read_Error = 0x000a,
GPGME_Read_Error = 0x000b, GPGME_Write_Error = 0x000b,
GPGME_Write_Error = 0x000c, GPGME_Invalid_Type = 0x000c,
GPGME_Invalid_Type = 0x000d, GPGME_Invalid_Mode = 0x000d,
GPGME_Invalid_Mode = 0x000e, GPGME_File_Error = 0x000e, /* errno is set in this case. */
GPGME_File_Error = 0x000f, /* errno is set in this case. */ GPGME_Decryption_Failed = 0x000f,
GPGME_Decryption_Failed = 0x0010, GPGME_Bad_Passphrase = 0x0010,
GPGME_Bad_Passphrase = 0x0011, GPGME_Canceled = 0x0011,
GPGME_Canceled = 0x0012, GPGME_Invalid_Key = 0x0012,
GPGME_Invalid_Key = 0x0013, GPGME_Invalid_Engine = 0x0013,
GPGME_Invalid_Engine = 0x0014, GPGME_No_UserID = 0x0014,
GPGME_No_UserID = 0x0015, GPGME_Invalid_UserID = 0x0015,
GPGME_Invalid_UserID = 0x0016, GPGME_Busy = -2,
GPGME_No_Request = -3,
} }
GpgmeError; GpgmeError;
#define GPGME_No_Recipients GPGME_No_UserID
#define GPGME_Invalid_Recipient GPGME_Invalid_UserID
#define GPGME_No_Passphrase GPGME_Bad_Passphrase
/* The possible types of GpgmeData objects. */ /* The possible types of GpgmeData objects. */
typedef enum typedef enum
{ {