GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

doc/

Browse Source 
2004-09-29  Marcus Brinkmann  <marcus@g10code.de>

	* gpgme.texi (Key Management): Change type of keylist_mode in
	gpgme_key_t to gpgme_keylist_mode_t.

gpgme/
2004-09-29  Marcus Brinkmann  <marcus@g10code.de>

	* gpgme.h (GPGME_IMPORT_NEW, GPGME_IMPORT_UID, GPGME_IMPORT_SIG,
	GPGME_IMPORT_SUBKEY, GPGME_IMPORT_SECRET,
	(GPGME_KEYLIST_MODE_LOCAL, GPGME_KEYLIST_MODERN_EXTERN,
	GPGME_KEYLIST_MODE_SIGS, GPGME_KEYLIST_MODE_VALIDATE): Change from
	enum to macros.
	(gpgme_keylist_mode_t): Define as unsigned int.
	(gpgme_key_t): Change type of keylist_mode to
	gpgme_keylist_mode_t.
This commit is contained in:
Marcus Brinkmann 2004-09-28 23:15:39 +00:00
parent 9a2a72db08
commit cc769c66ed
4 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/ChangeLog
View File

@ -1,3 +1,8 @@
2004-09-29 Marcus Brinkmann <marcus@g10code.de>
* gpgme.texi (Key Management): Change type of keylist_mode in
gpgme_key_t to gpgme_keylist_mode_t.
2004-09-28 Marcus Brinkmann <marcus@g10code.de> 2004-09-28 Marcus Brinkmann <marcus@g10code.de>
* gpgme.texi (Passphrase Callback): Fix last change. * gpgme.texi (Passphrase Callback): Fix last change.

2
doc/gpgme.texi
View File

@ -2351,7 +2351,7 @@ The @code{gpgme_key_t} type is a pointer to a key object. It has the
following members: following members:
@table @code @table @code
@item unsigned int keylist_mode @item gpgme_keylist_mode_t keylist_mode
The keylist mode that was active when the key was retrieved. The keylist mode that was active when the key was retrieved.
@item unsigned int revoked : 1 @item unsigned int revoked : 1

11
gpgme/ChangeLog
View File

@ -1,3 +1,14 @@
2004-09-29 Marcus Brinkmann <marcus@g10code.de>
* gpgme.h (GPGME_IMPORT_NEW, GPGME_IMPORT_UID, GPGME_IMPORT_SIG,
GPGME_IMPORT_SUBKEY, GPGME_IMPORT_SECRET,
(GPGME_KEYLIST_MODE_LOCAL, GPGME_KEYLIST_MODERN_EXTERN,
GPGME_KEYLIST_MODE_SIGS, GPGME_KEYLIST_MODE_VALIDATE): Change from
enum to macros.
(gpgme_keylist_mode_t): Define as unsigned int.
(gpgme_key_t): Change type of keylist_mode to
gpgme_keylist_mode_t.
2004-09-23 Marcus Brinkmann <marcus@g10code.de> 2004-09-23 Marcus Brinkmann <marcus@g10code.de>
* data.c (_gpgme_data_outbound_handler): Close the file descriptor * data.c (_gpgme_data_outbound_handler): Close the file descriptor

44
gpgme/gpgme.h
View File

@ -306,14 +306,12 @@ gpgme_protocol_t;
/* The available keylist mode flags. */ /* The available keylist mode flags. */
typedef enum #define GPGME_KEYLIST_MODE_LOCAL 1
{ #define GPGME_KEYLIST_MODE_EXTERN 2
GPGME_KEYLIST_MODE_LOCAL = 1, #define GPGME_KEYLIST_MODE_SIGS 4
GPGME_KEYLIST_MODE_EXTERN = 2, #define GPGME_KEYLIST_MODE_VALIDATE 256
GPGME_KEYLIST_MODE_SIGS = 4,
GPGME_KEYLIST_MODE_VALIDATE = 256 typedef unsigned int gpgme_keylist_mode_t;
}
gpgme_keylist_mode_t;
/* The possible stati for the edit operation. */ /* The possible stati for the edit operation. */
@ -653,10 +651,7 @@ struct _gpgme_key
gpgme_user_id_t _last_uid; gpgme_user_id_t _last_uid;
/* The keylist mode that was active when listing the key. */ /* The keylist mode that was active when listing the key. */
/* Implementation note: We are using unsigned int here, and not gpgme_keylist_mode_t keylist_mode;
gpgme_keylist_mode_t, as the latter is currently an enum of
unknown size. */
unsigned int keylist_mode;
}; };
typedef struct _gpgme_key *gpgme_key_t; typedef struct _gpgme_key *gpgme_key_t;
@ -1229,23 +1224,22 @@ gpgme_error_t gpgme_op_verify (gpgme_ctx_t ctx, gpgme_data_t sig,
/* Import. */ /* Import. */
enum
{
/* The key was new. */
GPGME_IMPORT_NEW = 1,
/* The key contained new user IDs. */ /* The key was new. */
GPGME_IMPORT_UID = 2, #define GPGME_IMPORT_NEW 1
/* The key contained new signatures. */ /* The key contained new user IDs. */
GPGME_IMPORT_SIG = 4, #define GPGME_IMPORT_UID 2
/* The key contained new sub keys. */ /* The key contained new signatures. */
GPGME_IMPORT_SUBKEY = 8, #define GPGME_IMPORT_SIG 4
/* The key contained new sub keys. */
#define GPGME_IMPORT_SUBKEY 8
/* The key contained a secret key. */
#define GPGME_IMPORT_SECRET 16
/* The key contained a secret key. */
GPGME_IMPORT_SECRET = 16
};
struct _gpgme_import_status struct _gpgme_import_status
{ {