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

diff --git a/compose.c b/compose.c
index 7660a45..c16d5be 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"
@@ -686,34 +686,10 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break; 
 
-    case OP_COMPOSE_ATTACH_KEY:
-      if (idxlen == idxmax) {
-        p_realloc(&idx, idxmax += 5);
-        menu->data = idx;
-      }
-
-      idx[idxlen] = p_new(ATTACHPTR, 1);
-      if ((idx[idxlen]->content =
-           crypt_pgp_make_key_attachment (NULL)) != NULL) {
-        update_idx (menu, idx, idxlen++);
-        menu->redraw |= REDRAW_INDEX;
-      }
-      else
-        p_delete(&idx[idxlen]);
-
-      menu->redraw |= REDRAW_STATUS;
-
-      if (option (OPTNEEDREDRAW)) {
-        menu->redraw = REDRAW_FULL;
-        unset_option (OPTNEEDREDRAW);
-      }
-
-      mutt_message_hook (NULL, msg, M_SEND2HOOK);
-      break; 
-
     case OP_COMPOSE_ATTACH_FILE:
       {
-        char *prompt, **files;
+        const char *prompt;
+        char **files;
         int error, numfiles;
 
         fname[0] = 0;
@@ -764,7 +740,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
     case OP_COMPOSE_ATTACH_NEWS_MESSAGE:
 #endif
       {
-        char *prompt;
+        const char *prompt;
         HEADER *h;
 
         fname[0] = 0;
@@ -1263,15 +1239,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 +1253,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;