diff options
| author | Werner Koch <[email protected]> | 2013-02-12 18:17:42 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-02-12 18:17:42 +0000 |
| commit | caddeef4a7ffe5f2eb6453d364b6ae152e0f6625 (patch) | |
| tree | 5894e3f0e365b0c9035efecea2bbd5ad3042ca51 /common/status.h | |
| parent | kbx: Switch from MD5 to SHA-1 for the checksum. (diff) | |
| parent | gpg: Implement card_store_subkey again. (diff) | |
| download | gnupg-caddeef4a7ffe5f2eb6453d364b6ae152e0f6625.tar.gz gnupg-caddeef4a7ffe5f2eb6453d364b6ae152e0f6625.zip | |
Merge branch 'master' into key-storage-work
Diffstat (limited to '')
| -rw-r--r-- | common/status.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/status.h b/common/status.h index b6ac779e4..9219bf4d9 100644 --- a/common/status.h +++ b/common/status.h @@ -84,8 +84,6 @@ enum STATUS_NOTATION_NAME, STATUS_NOTATION_DATA, STATUS_POLICY_URL, - STATUS_BEGIN_STREAM, - STATUS_END_STREAM, STATUS_KEY_CREATED, STATUS_USERID_HINT, STATUS_UNEXPECTED, @@ -97,7 +95,6 @@ enum STATUS_ALREADY_SIGNED, STATUS_KEYEXPIRED, STATUS_KEYREVOKED, - STATUS_SIGEXPIRED, STATUS_EXPSIG, STATUS_EXPKEYSIG, @@ -125,6 +122,8 @@ enum STATUS_TRUNCATED, STATUS_MOUNTPOINT, + STATUS_PINENTRY_LAUNCHED, + STATUS_ERROR, STATUS_SUCCESS }; |