Timos fixes

diff --git a/TODO b/TODO
index 112a0210ebbd4e3708857344aa5f370a38be226e..7fb09837d8cde71ef3d09fd849090ee2ca76d6a2 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,3 +4,5 @@
 
 * Allow to use GTK's main loop instead of the select stuff in
   wait.c
+
+* add locking to the key cache?
\ No newline at end of file

diff --git a/configure.in b/configure.in
index b898e5777ffd6568cf28c626920c8d20ab3a32b4..0bf7855b4f2e7ee983e03ebf151cba6d054ed6b9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ AM_MAINTAINER_MODE
 #    AGE, set REVISION to 0.
 # 3. Interfaces removed (BAD, breaks upward compatibility): Increment
 #    CURRENT, set AGE and REVISION to 0.
-AM_INIT_AUTOMAKE(gpgme,0.2.2)
+AM_INIT_AUTOMAKE(gpgme,0.2.2a)
 LIBGPGME_LT_CURRENT=3
 LIBGPGME_LT_AGE=3
 LIBGPGME_LT_REVISION=1

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 6f29a64d6714fe28710cd7f08e0180dbd9e8131c..1c5261bb38ae4f10afdaf74c3c89ed85c98820b9 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-15  Werner Koch  <wk@gnupg.org>
+
+       * keylist.c (set_userid_flags): Fixed the assigned values. Kudos
+       to Timo for pointing this out.
+
 2001-06-01  Werner Koch  <wk@gnupg.org>
 
        * debug.c (_gpgme_debug_begin): Fixed a /tmp race.  Noted by

diff --git a/gpgme/keylist.c b/gpgme/keylist.c
index 11e10cf20b489492e6e8056e68bf1b75f73dddf8..c95f943a7efbfad094240396d06451c0aaf612f9 100644 (file)
--- a/gpgme/keylist.c
+++ b/gpgme/keylist.c
@@ -89,10 +89,10 @@ set_userid_flags ( GpgmeKey key, const char *s )
           case 'r': key->uids->revoked  = 1; break;
           case 'i': key->uids->invalid  = 1; break;
 
-          case 'n': key->uids->validity = 1; break;
-          case 'm': key->uids->validity = 2; break;
-          case 'f': key->uids->validity = 3; break;
-          case 'u': key->uids->validity = 4; break;
+          case 'n': key->uids->validity = GPGME_VALIDITY_NEVER; break;
+          case 'm': key->uids->validity = GPGME_VALIDITY_MARGINAL; break;
+          case 'f': key->uids->validity = GPGME_VALIDITY_FULL; break;
+          case 'u': key->uids->validity = GPGME_VALIDITY_ULTIMATE; break;
         }
     }
 }