Drop useless functions with gpgme (auto import is a gpg capability already).

[apps/madmutt.git] / commands.c

diff --git a/commands.c b/commands.c
index 4e810c9..cf56023 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -91,8 +91,6 @@ int mutt_display_message (HEADER * cur)
     /* see if crytpo is needed for this message.  if so, we should exit curses */
     if (cur->security) {
       if (cur->security & ENCRYPT) {
-        if (cur->security & APPLICATION_SMIME)
-          crypt_smime_getkeys (cur->env);
         cmflags |= M_CM_VERIFY;
       }
       else if (cur->security & SIGN) {
@@ -105,15 +103,7 @@ int mutt_display_message (HEADER * cur)
     }
 
     if (cmflags & M_CM_VERIFY || cur->security & ENCRYPT) {
-      if (cur->security & APPLICATION_PGP) {
-        if (cur->env->from)
-          crypt_pgp_invoke_getkeys (cur->env->from);
-
-        crypt_invoke_message (APPLICATION_PGP);
-      }
-
-      if (cur->security & APPLICATION_SMIME)
-        crypt_invoke_message (APPLICATION_SMIME);
+      crypt_invoke_message(cur->security);
     }
 
     res = _mutt_copy_message (fpout, msg->fp, cur, cur->content, cmflags,