wibble

[apps/madmutt.git] / compose.c

diff --git a/compose.c b/compose.c
index b0e93d4..d8e0694 100644 (file)
--- 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"
@@ -1230,20 +1230,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       r = 1;
       break;
 
-    case OP_COMPOSE_ISPELL:
-      endwin ();
-      snprintf (buf, sizeof (buf), "%s -x %s", NONULL (Ispell),
-                msg->content->filename);
-      if (mutt_system (buf) == -1)
-        mutt_error (_("Error running \"%s\"!"), buf);
-      else {
-        mutt_update_encoding (msg->content);
-        menu->redraw |= REDRAW_STATUS;
-      }
-      break;
-
     case OP_COMPOSE_WRITE_MESSAGE:
-
       fname[0] = '\0';
       if (Context) {
         m_strcpy(fname, sizeof(fname), NONULL(Context->path));
@@ -1276,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 ? "),
@@ -1294,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;