Don't bother the user with weak keys when there's a strong one.

Experimental, based on discussions on mutt-dev.

diff --git a/pgpkey.c b/pgpkey.c
index 3cff85c1b6979e764bcaf9dbb05b99b61de6fabc..060cf188ef6cab4730a5c4da92ec84b2c1e407d1 100644 (file)
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -910,13 +910,11 @@ pgp_key_t *pgp_getkeybyaddr (ADDRESS * a, short abilities, pgp_ring_t keyring)
   
   if (matches)
   {
-    if (the_valid_key && !multi && !weak 
-       && !(invalid && option (OPTPGPSHOWUNUSABLE)))
-    {  
-      /* 
-       * There was precisely one strong match on a valid ID, there
-       * were no valid keys with weak matches, and we aren't
-       * interested in seeing invalid keys.
+    if (the_valid_key && !multi /* && !weak 
+       && !(invalid && option (OPTPGPSHOWUNUSABLE)) */)
+    {
+      /*
+       * There was precisely one strong match on a valid ID.
        * 
        * Proceed without asking the user.
        */