X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=d8e0694c7c10ef62ae03d972f9efad6ef92a5ce2;hp=7660a45f27cd4b9fd81287a987ec4ca0116ed369;hb=569145d4875fd59719a1a3a7d2c7d64d622eacd1;hpb=4c99e2f0c403adb86af688ea982350de5bcc5edf

diff --git a/compose.c b/compose.c
index 7660a45..d8e0694 100644
--- a/compose.c
+++ b/compose.c
@@ -15,7 +15,6 @@
 
 #include <lib-sys/unix.h>
 #include <lib-mime/mime.h>
-#include <lib-crypt/crypt.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
@@ -24,6 +23,7 @@
 
 #include "mutt.h"
 #include "alias.h"
+#include "crypt.h"
 #include "mutt_idna.h"
 #include "attach.h"
 #include "recvattach.h"
@@ -1263,15 +1263,11 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         }
         msg->security = 0;
       }
-      msg->security = crypt_pgp_send_menu (msg, &menu->redraw);
+      msg->security = crypt_send_menu (msg, &menu->redraw, 0);
       redraw_crypt_lines (msg);
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;
 
-    case OP_FORGET_PASSPHRASE:
-      crypt_forget_passphrase ();
-      break;
-
     case OP_COMPOSE_SMIME_MENU:
       if (msg->security & APPLICATION_PGP) {
         if (mutt_yesorno (_("PGP already selected. Clear & continue ? "),
@@ -1281,7 +1277,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         }
         msg->security = 0;
       }
-      msg->security = crypt_smime_send_menu (msg, &menu->redraw);
+      msg->security = crypt_send_menu (msg, &menu->redraw, 1);
       redraw_crypt_lines (msg);
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;