From: Werner Koch <wk@gnupg.org>
Date: Sat, 16 Jun 2001 11:08:32 +0000 (+0000)
Subject: Timos fixes
X-Git-Tag: gpgme-1.2.0@1385~1318
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0373bf382936409694d131629e3d6b235aadd1cd;p=gpgme.git

Timos fixes
---

diff --git a/trunk/TODO b/trunk/TODO
index 112a021..7fb0983 100644
--- a/trunk/TODO
+++ b/trunk/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/trunk/configure.in b/trunk/configure.in
index b898e57..0bf7855 100644
--- a/trunk/configure.in
+++ b/trunk/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/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 6f29a64..1c5261b 100644
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/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/trunk/gpgme/keylist.c b/trunk/gpgme/keylist.c
index 11e10cf..c95f943 100644
--- a/trunk/gpgme/keylist.c
+++ b/trunk/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;
         }
     }
 }