X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=031fdab521097326c74978420fefe3b1866cfefd;hp=a5f7094c67fae9a15776436d6244a77fbb8636d8;hb=125a7c903f7928f682cbea847f4436c9dd5b1b4d;hpb=74f4cb56b87554a520eb94b02b91a3ea09c8a564

diff --git a/compose.c b/compose.c
index a5f7094..031fdab 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"
@@ -114,8 +114,7 @@ static struct mapping_t ComposeNewsHelp[] = {
 
 static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
   m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt,
-              ((ATTACHPTR **)menu->data)[num],
-              M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
+              ((ATTACHPTR **)menu->data)[num], M_FORMAT_STAT_FILE);
 }
 
 static void redraw_crypt_lines (HEADER * msg)
@@ -250,10 +249,6 @@ static void draw_envelope (HEADER * msg, char *fcc)
     mutt_paddstr (W, NONULL (msg->env->newsgroups));
     mvprintw (HDR_CC, SW, TITLE_FMT, Prompts[HDR_FOLLOWUPTO - 1]);
     mutt_paddstr (W, NONULL (msg->env->followup_to));
-    if (option (OPTXCOMMENTTO)) {
-      mvprintw (HDR_BCC, 0, TITLE_FMT, Prompts[HDR_XCOMMENTTO - 1]);
-      mutt_paddstr (W, NONULL (msg->env->x_comment_to));
-    }
   }
 #endif
   mvprintw (HDR_SUBJECT, SW, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
@@ -426,7 +421,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
 
   case 'h':                    /* hostname */
     snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-    snprintf (buf, buflen, fmt, NONULL(MCore.shorthost));
+    snprintf (buf, buflen, fmt, NONULL(mod_core.shorthost));
     break;
 
   case 'l':                    /* approx length of current message in bytes */
@@ -599,22 +594,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       }
       break;
 
-    case OP_COMPOSE_EDIT_X_COMMENT_TO:
-      if (news && option (OPTXCOMMENTTO)) {
-        buf[0] = 0;
-        if (msg->env->x_comment_to)
-          m_strcpy(buf, sizeof(buf), msg->env->x_comment_to);
-        if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
-            && buf[0]) {
-          p_delete(&msg->env->x_comment_to);
-          msg->env->x_comment_to = m_strdup(buf);
-          move (HDR_BCC, HDR_XOFFSET);
-          clrtoeol ();
-          if (msg->env->x_comment_to)
-            printw ("%-*.*s", W, W, msg->env->x_comment_to);
-        }
-      }
-      break;
 #endif
     case OP_COMPOSE_EDIT_SUBJECT:
       if (msg->env->subject)
@@ -686,34 +665,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 +719,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;
@@ -1277,7 +1232,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         }
         msg->security = 0;
       }
-      msg->security = crypt_send_menu (msg, &menu->redraw, 1);
+      msg->security = crypt_send_menu(msg, &menu->redraw, 1);
       redraw_crypt_lines (msg);
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;