X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;fp=compose.c;h=8ad53e836df24df16178072ba1822ad8fb64fb1c;hp=6fa6ad3ee9d1926eed566c141e61f7347c431506;hb=5fbd8a74d24624a118c9b835b136c73b8da076d7;hpb=8e39affbf1cd8a2a5ff5c9991650d54fdcea4997

diff --git a/compose.c b/compose.c
index 6fa6ad3..8ad53e8 100644
--- a/compose.c
+++ b/compose.c
@@ -30,7 +30,6 @@
 #include "sort.h"
 #include "charset.h"
 #include "buffy.h"
-#include "remailer.h"
 
 #ifdef USE_NNTP
 #include "nntp.h"
@@ -50,7 +49,6 @@ enum {
   HDR_SUBJECT,
   HDR_REPLYTO,
   HDR_FCC,
-  HDR_MIX,
 
   HDR_CRYPT,
   HDR_CRYPTINFO,
@@ -140,35 +138,6 @@ static void redraw_crypt_lines (HEADER * msg)
   }
 }
 
-static void redraw_mix_line (string_list_t * chain)
-{
-  int c;
-  const char *t;
-
-  mvwaddstr (stdscr, HDR_MIX, SW, "         Mix: ");
-
-  if (!chain) {
-    waddstr (stdscr, "<no chain defined>");
-    wclrtoeol (stdscr);
-    return;
-  }
-
-  for (c = 12; chain; chain = chain->next) {
-    t = chain->data;
-    if (t && t[0] == '0' && t[1] == '\0')
-      t = "<random>";
-
-    if (c + m_strlen(t) + 2 >= COLS - SW)
-      break;
-
-    waddstr (stdscr, NONULL (t));
-    if (chain->next)
-      waddstr (stdscr, ", ");
-
-    c += m_strlen(t) + 2;
-  }
-}
-
 static int check_attachments (ATTACHPTR ** idx, short idxlen)
 {
   int i, r;
@@ -232,7 +201,6 @@ static void draw_envelope (HEADER * msg, char *fcc)
   mutt_paddstr (W, fcc);
 
   redraw_crypt_lines (msg);
-  redraw_mix_line (msg->chain);
 
   SETCOLOR (MT_COLOR_STATUS);
   mvwaddstr (stdscr, HDR_ATTACH - 1, SW, _("-- Attachments"));
@@ -925,9 +893,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         break;
       }
 
-      if (msg->chain && mix_check_message (msg) != 0)
-        break;
-
       if (!fccSet && *fcc) {
         if ((i = query_quadoption (OPT_COPY,
                                    _("Save a copy of this message?"))) == -1)
@@ -1201,11 +1166,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       redraw_crypt_lines (msg);
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;
-
-    case OP_COMPOSE_MIX:
-      mix_make_chain (&msg->chain, &menu->redraw);
-      mutt_message_hook (NULL, msg, M_SEND2HOOK);
-      break;
     }
 
     /* Draw formated compose status line */