diff options
Diffstat (limited to '')
-rw-r--r-- | g10/options.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/g10/options.h b/g10/options.h index 5da785aaf..e050d0175 100644 --- a/g10/options.h +++ b/g10/options.h @@ -245,20 +245,24 @@ struct #define LIST_SHOW_PHOTOS (1<<0) #define LIST_SHOW_POLICY_URLS (1<<1) -#define LIST_SHOW_NOTATIONS (1<<2) -#define LIST_SHOW_KEYSERVER_URLS (1<<3) -#define LIST_SHOW_VALIDITY (1<<4) -#define LIST_SHOW_UNUSABLE_UIDS (1<<5) -#define LIST_SHOW_UNUSABLE_SUBKEYS (1<<6) -#define LIST_SHOW_KEYRING (1<<7) -#define LIST_SHOW_SIG_EXPIRE (1<<8) +#define LIST_SHOW_STD_NOTATIONS (1<<2) +#define LIST_SHOW_USER_NOTATIONS (1<<3) +#define LIST_SHOW_NOTATIONS (LIST_SHOW_STD_NOTATIONS|LIST_SHOW_USER_NOTATIONS) +#define LIST_SHOW_KEYSERVER_URLS (1<<4) +#define LIST_SHOW_VALIDITY (1<<5) +#define LIST_SHOW_UNUSABLE_UIDS (1<<6) +#define LIST_SHOW_UNUSABLE_SUBKEYS (1<<7) +#define LIST_SHOW_KEYRING (1<<8) +#define LIST_SHOW_SIG_EXPIRE (1<<9) #define VERIFY_SHOW_PHOTOS (1<<0) #define VERIFY_SHOW_POLICY_URLS (1<<1) -#define VERIFY_SHOW_NOTATIONS (1<<2) -#define VERIFY_SHOW_KEYSERVER_URLS (1<<3) -#define VERIFY_SHOW_VALIDITY (1<<4) -#define VERIFY_SHOW_UNUSABLE_UIDS (1<<5) +#define VERIFY_SHOW_STD_NOTATIONS (1<<2) +#define VERIFY_SHOW_USER_NOTATIONS (1<<3) +#define VERIFY_SHOW_NOTATIONS (VERIFY_SHOW_STD_NOTATIONS|VERIFY_SHOW_USER_NOTATIONS) +#define VERIFY_SHOW_KEYSERVER_URLS (1<<4) +#define VERIFY_SHOW_VALIDITY (1<<5) +#define VERIFY_SHOW_UNUSABLE_UIDS (1<<6) #define KEYSERVER_INCLUDE_REVOKED (1<<0) #define KEYSERVER_INCLUDE_DISABLED (1<<1) |