From c898d18ad8c653657cf45238f46df47aacdc0993 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sat, 16 Jun 2001 11:08:32 +0000 Subject: [PATCH] Timos fixes --- TODO | 2 ++ configure.in | 2 +- gpgme/ChangeLog | 5 +++++ gpgme/keylist.c | 8 ++++---- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/TODO b/TODO index 112a0210..7fb09837 100644 --- 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 b898e577..0bf7855b 100644 --- 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 6f29a64d..1c5261bb 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2001-06-15 Werner Koch + + * keylist.c (set_userid_flags): Fixed the assigned values. Kudos + to Timo for pointing this out. + 2001-06-01 Werner Koch * debug.c (_gpgme_debug_begin): Fixed a /tmp race. Noted by diff --git a/gpgme/keylist.c b/gpgme/keylist.c index 11e10cf2..c95f943a 100644 --- 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; } } }