Add 6 new GPGME_STATUS_ codes.
authorWerner Koch <wk@gnupg.org>
Tue, 13 May 2014 13:44:52 +0000 (15:44 +0200)
committerWerner Koch <wk@gnupg.org>
Tue, 13 May 2014 14:08:01 +0000 (16:08 +0200)
* src/status-table.c: Also add missing DECRYPTION_INFO entry.

NEWS
src/gpgme.h.in
src/status-table.c

diff --git a/NEWS b/NEWS
index 9433356..3eaca19 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,12 @@ Noteworthy changes in version 1.5.0 (unreleased)
  GPGME_PK_ECC                   NEW.
  GPGME_MD_SHA224                NEW.
  gpgme_subkey_t                 EXTENDED: New field curve.
+ GPGME_STATUS_PLAINTEXT_LENGTH  NEW.
+ GPGME_STATUS_MOUNTPOINT        NEW.
+ GPGME_STATUS_PINENTRY_LAUNCHED NEW.
+ GPGME_STATUS_ATTRIBUTE         NEW.
+ GPGME_STATUS_BEGIN_SIGNING     NEW.
+ GPGME_STATUS_KEY_NOT_CREATED   NEW.
 
 
 Noteworthy changes in version 1.4.3 (2013-08-12)
index 170d7dd..d47f4ba 100644 (file)
@@ -455,7 +455,7 @@ typedef enum
 
     GPGME_STATUS_BADARMOR = 7,
 
-    GPGME_STATUS_RSA_OR_IDEA = 8,
+    GPGME_STATUS_RSA_OR_IDEA = 8,      /* (legacy) */
     GPGME_STATUS_KEYEXPIRED = 9,
     GPGME_STATUS_KEYREVOKED = 10,
 
@@ -465,10 +465,10 @@ typedef enum
     GPGME_STATUS_TRUST_FULLY = 14,
     GPGME_STATUS_TRUST_ULTIMATE = 15,
 
-    GPGME_STATUS_SHM_INFO = 16,
-    GPGME_STATUS_SHM_GET = 17,
-    GPGME_STATUS_SHM_GET_BOOL = 18,
-    GPGME_STATUS_SHM_GET_HIDDEN = 19,
+    GPGME_STATUS_SHM_INFO = 16,        /* (legacy) */
+    GPGME_STATUS_SHM_GET = 17,         /* (legacy) */
+    GPGME_STATUS_SHM_GET_BOOL = 18,    /* (legacy) */
+    GPGME_STATUS_SHM_GET_HIDDEN = 19,  /* (legacy) */
 
     GPGME_STATUS_NEED_PASSPHRASE = 20,
     GPGME_STATUS_VALIDSIG = 21,
@@ -510,15 +510,15 @@ typedef enum
     GPGME_STATUS_NOTATION_NAME = 55,
     GPGME_STATUS_NOTATION_DATA = 56,
     GPGME_STATUS_POLICY_URL = 57,
-    GPGME_STATUS_BEGIN_STREAM = 58,
-    GPGME_STATUS_END_STREAM = 59,
+    GPGME_STATUS_BEGIN_STREAM = 58,    /* (legacy) */
+    GPGME_STATUS_END_STREAM = 59,      /* (legacy) */
     GPGME_STATUS_KEY_CREATED = 60,
     GPGME_STATUS_USERID_HINT = 61,
     GPGME_STATUS_UNEXPECTED = 62,
     GPGME_STATUS_INV_RECP = 63,
     GPGME_STATUS_NO_RECP = 64,
     GPGME_STATUS_ALREADY_SIGNED = 65,
-    GPGME_STATUS_SIGEXPIRED = 66,
+    GPGME_STATUS_SIGEXPIRED = 66,      /* (legacy) */
     GPGME_STATUS_EXPSIG = 67,
     GPGME_STATUS_EXPKEYSIG = 68,
     GPGME_STATUS_TRUNCATED = 69,
@@ -537,7 +537,13 @@ typedef enum
     GPGME_STATUS_INV_SGNR = 82,
     GPGME_STATUS_NO_SGNR = 83,
     GPGME_STATUS_SUCCESS = 84,
-    GPGME_STATUS_DECRYPTION_INFO = 85
+    GPGME_STATUS_DECRYPTION_INFO = 85,
+    GPGME_STATUS_PLAINTEXT_LENGTH = 86,
+    GPGME_STATUS_MOUNTPOINT = 87,
+    GPGME_STATUS_PINENTRY_LAUNCHED = 88,
+    GPGME_STATUS_ATTRIBUTE = 89,
+    GPGME_STATUS_BEGIN_SIGNING = 90,
+    GPGME_STATUS_KEY_NOT_CREATED = 91
   }
 gpgme_status_code_t;
 
index 8060bdb..b936997 100644 (file)
@@ -39,17 +39,21 @@ struct status_table_s {
    sorted at start up, too.  */
 static struct status_table_s status_table[] =
 {
+  { "ABORT", GPGME_STATUS_ABORT },
   { "ALREADY_SIGNED", GPGME_STATUS_ALREADY_SIGNED },
+  { "ATTRIBUTE",         GPGME_STATUS_ATTRIBUTE        },
   { "BACKUP_KEY_CREATED", GPGME_STATUS_BACKUP_KEY_CREATED },
+  { "BAD_PASSPHRASE", GPGME_STATUS_BAD_PASSPHRASE },
   { "BADARMOR", GPGME_STATUS_BADARMOR },
   { "BADMDC", GPGME_STATUS_BADMDC },
   { "BADSIG", GPGME_STATUS_BADSIG },
-  { "BAD_PASSPHRASE", GPGME_STATUS_BAD_PASSPHRASE },
   { "BEGIN_DECRYPTION", GPGME_STATUS_BEGIN_DECRYPTION },
   { "BEGIN_ENCRYPTION", GPGME_STATUS_BEGIN_ENCRYPTION },
+  { "BEGIN_SIGNING",     GPGME_STATUS_BEGIN_SIGNING    },
   { "BEGIN_STREAM", GPGME_STATUS_BEGIN_STREAM },
   { "CARDCTRL", GPGME_STATUS_CARDCTRL },
   { "DECRYPTION_FAILED", GPGME_STATUS_DECRYPTION_FAILED },
+  { "DECRYPTION_INFO",   GPGME_STATUS_DECRYPTION_INFO  },
   { "DECRYPTION_OKAY", GPGME_STATUS_DECRYPTION_OKAY },
   { "DELETE_PROBLEM", GPGME_STATUS_DELETE_PROBLEM },
   { "ENC_TO", GPGME_STATUS_ENC_TO },
@@ -68,35 +72,39 @@ static struct status_table_s status_table[] =
   { "GET_BOOL", GPGME_STATUS_GET_BOOL },
   { "GET_HIDDEN", GPGME_STATUS_GET_HIDDEN },
   { "GET_LINE", GPGME_STATUS_GET_LINE },
+  { "GOOD_PASSPHRASE", GPGME_STATUS_GOOD_PASSPHRASE },
   { "GOODMDC", GPGME_STATUS_GOODMDC },
   { "GOODSIG", GPGME_STATUS_GOODSIG },
-  { "GOOD_PASSPHRASE", GPGME_STATUS_GOOD_PASSPHRASE },
   { "GOT_IT", GPGME_STATUS_GOT_IT },
-  { "IMPORTED", GPGME_STATUS_IMPORTED },
   { "IMPORT_OK", GPGME_STATUS_IMPORT_OK },
   { "IMPORT_PROBLEM", GPGME_STATUS_IMPORT_PROBLEM },
   { "IMPORT_RES", GPGME_STATUS_IMPORT_RES },
+  { "IMPORTED", GPGME_STATUS_IMPORTED },
   { "INV_RECP", GPGME_STATUS_INV_RECP },
   { "INV_SGNR", GPGME_STATUS_INV_SGNR },
+  { "KEY_CREATED", GPGME_STATUS_KEY_CREATED },
+  { "KEY_NOT_CREATED",   GPGME_STATUS_KEY_NOT_CREATED  },
   { "KEYEXPIRED", GPGME_STATUS_KEYEXPIRED },
   { "KEYREVOKED", GPGME_STATUS_KEYREVOKED },
-  { "KEY_CREATED", GPGME_STATUS_KEY_CREATED },
   { "LEAVE", GPGME_STATUS_LEAVE },
   { "MISSING_PASSPHRASE", GPGME_STATUS_MISSING_PASSPHRASE },
+  { "MOUNTPOINT",        GPGME_STATUS_MOUNTPOINT       },
   { "NEED_PASSPHRASE", GPGME_STATUS_NEED_PASSPHRASE },
   { "NEED_PASSPHRASE_PIN", GPGME_STATUS_NEED_PASSPHRASE_PIN },
   { "NEED_PASSPHRASE_SYM", GPGME_STATUS_NEED_PASSPHRASE_SYM },
   { "NEWSIG", GPGME_STATUS_NEWSIG },
-  { "NODATA", GPGME_STATUS_NODATA },
-  { "NOTATION_DATA", GPGME_STATUS_NOTATION_DATA },
-  { "NOTATION_NAME", GPGME_STATUS_NOTATION_NAME },
   { "NO_PUBKEY", GPGME_STATUS_NO_PUBKEY },
   { "NO_RECP", GPGME_STATUS_NO_RECP },
   { "NO_SECKEY", GPGME_STATUS_NO_SECKEY },
   { "NO_SGNR", GPGME_STATUS_NO_SGNR },
+  { "NODATA", GPGME_STATUS_NODATA },
+  { "NOTATION_DATA", GPGME_STATUS_NOTATION_DATA },
+  { "NOTATION_NAME", GPGME_STATUS_NOTATION_NAME },
+  { "PINENTRY_LAUNCHED", GPGME_STATUS_PINENTRY_LAUNCHED},
   { "PKA_TRUST_BAD", GPGME_STATUS_PKA_TRUST_BAD },
   { "PKA_TRUST_GOOD", GPGME_STATUS_PKA_TRUST_GOOD },
   { "PLAINTEXT", GPGME_STATUS_PLAINTEXT },
+  { "PLAINTEXT_LENGTH",  GPGME_STATUS_PLAINTEXT_LENGTH },
   { "POLICY_URL", GPGME_STATUS_POLICY_URL },
   { "PROGRESS", GPGME_STATUS_PROGRESS },
   { "REVKEYSIG", GPGME_STATUS_REVKEYSIG },
@@ -108,10 +116,10 @@ static struct status_table_s status_table[] =
   { "SHM_GET_BOOL", GPGME_STATUS_SHM_GET_BOOL },
   { "SHM_GET_HIDDEN", GPGME_STATUS_SHM_GET_HIDDEN },
   { "SHM_INFO", GPGME_STATUS_SHM_INFO },
-  { "SIGEXPIRED", GPGME_STATUS_SIGEXPIRED },
   { "SIG_CREATED", GPGME_STATUS_SIG_CREATED },
   { "SIG_ID", GPGME_STATUS_SIG_ID },
   { "SIG_SUBPACKET", GPGME_STATUS_SIG_SUBPACKET },
+  { "SIGEXPIRED", GPGME_STATUS_SIGEXPIRED },
   { "SUCCESS", GPGME_STATUS_SUCCESS },
   { "TRUNCATED", GPGME_STATUS_TRUNCATED },
   { "TRUST_FULLY", GPGME_STATUS_TRUST_FULLY },
@@ -122,7 +130,6 @@ static struct status_table_s status_table[] =
   { "UNEXPECTED", GPGME_STATUS_UNEXPECTED },
   { "USERID_HINT", GPGME_STATUS_USERID_HINT },
   { "VALIDSIG", GPGME_STATUS_VALIDSIG },
-  { "ABORT", GPGME_STATUS_ABORT },
   {NULL, 0}
 };