X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=0c9802a04202569a3fadcc44f284167219786d81;hp=4d4cc8b02c4aea22e797b3817bfd14db813f124f;hb=8db3fe9c19320b6f6e508d6b1aae03980239a930;hpb=c8e9242de36d7aa6e3bb2e446f57ef2a14e4c889

diff --git a/compose.c b/compose.c
index 4d4cc8b..0c9802a 100644
--- a/compose.c
+++ b/compose.c
@@ -250,10 +250,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 +422,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 +595,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)
@@ -688,7 +668,8 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
 
     case OP_COMPOSE_ATTACH_FILE:
       {
-        char *prompt, **files;
+        const char *prompt;
+        char **files;
         int error, numfiles;
 
         fname[0] = 0;
@@ -739,7 +720,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;
@@ -1252,7 +1233,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;