projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplifications around mutt_is_message_type
[apps/madmutt.git]
/
compose.c
diff --git
a/compose.c
b/compose.c
index
8a8d0c5
..
a21776e
100644
(file)
--- a/
compose.c
+++ b/
compose.c
@@
-30,10
+30,7
@@
#include "sort.h"
#include "charset.h"
#include "buffy.h"
#include "sort.h"
#include "charset.h"
#include "buffy.h"
-
-#ifdef MIXMASTER
#include "remailer.h"
#include "remailer.h"
-#endif
#ifdef USE_NNTP
#include <nntp/nntp.h>
#ifdef USE_NNTP
#include <nntp/nntp.h>
@@
-53,10
+50,7
@@
enum {
HDR_SUBJECT,
HDR_REPLYTO,
HDR_FCC,
HDR_SUBJECT,
HDR_REPLYTO,
HDR_FCC,
-
-#ifdef MIXMASTER
HDR_MIX,
HDR_MIX,
-#endif
HDR_CRYPT,
HDR_CRYPTINFO,
HDR_CRYPT,
HDR_CRYPTINFO,
@@
-86,12
+80,10
@@
static const char *Prompts[] = {
"Bcc: ",
"Subject: ",
"Reply-To: ",
"Bcc: ",
"Subject: ",
"Reply-To: ",
- "Fcc: "
+ "Fcc: "
,
#ifdef USE_NNTP
#ifdef USE_NNTP
-#ifdef MIXMASTER
- , ""
-#endif
- , "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: "
+ "",
+ "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: "
#endif
};
#endif
};
@@
-179,9
+171,6
@@
static void redraw_crypt_lines (HEADER * msg)
}
}
}
}
-
-#ifdef MIXMASTER
-
static void redraw_mix_line (string_list_t * chain)
{
int c;
static void redraw_mix_line (string_list_t * chain)
{
int c;
@@
-210,7
+199,6
@@
static void redraw_mix_line (string_list_t * chain)
c += m_strlen(t) + 2;
}
}
c += m_strlen(t) + 2;
}
}
-#endif /* MIXMASTER */
static int check_attachments (ATTACHPTR ** idx, short idxlen)
{
static int check_attachments (ATTACHPTR ** idx, short idxlen)
{
@@
-280,10
+268,7
@@
static void draw_envelope (HEADER * msg, char *fcc)
mutt_paddstr (W, fcc);
redraw_crypt_lines (msg);
mutt_paddstr (W, fcc);
redraw_crypt_lines (msg);
-
-#ifdef MIXMASTER
redraw_mix_line (msg->chain);
redraw_mix_line (msg->chain);
-#endif
SETCOLOR (MT_COLOR_STATUS);
mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments"));
SETCOLOR (MT_COLOR_STATUS);
mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments"));
@@
-1038,11
+1023,8
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
break;
}
break;
}
-
-#ifdef MIXMASTER
if (msg->chain && mix_check_message (msg) != 0)
break;
if (msg->chain && mix_check_message (msg) != 0)
break;
-#endif
if (!fccSet && *fcc) {
if ((i = query_quadoption (OPT_COPY,
if (!fccSet && *fcc) {
if ((i = query_quadoption (OPT_COPY,
@@
-1069,14
+1051,6
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
idx[menu->current]->content->unlink =
!idx[menu->current]->content->unlink;
idx[menu->current]->content->unlink =
!idx[menu->current]->content->unlink;
-#if 0
- /* OPTRESOLVE is otherwise ignored on this menu.
- * Where's the bug?
- */
-
- if (option (OPTRESOLVE) && menu->current + 1 < menu->max)
- menu->current++;
-# endif
menu->redraw = REDRAW_INDEX;
/* No send2hook since this doesn't change the message. */
break;
menu->redraw = REDRAW_INDEX;
/* No send2hook since this doesn't change the message. */
break;
@@
-1347,15
+1321,10
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-
-#ifdef MIXMASTER
case OP_COMPOSE_MIX:
case OP_COMPOSE_MIX:
-
mix_make_chain (&msg->chain, &menu->redraw);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
mix_make_chain (&msg->chain, &menu->redraw);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-#endif
-
}
/* Draw formated compose status line */
}
/* Draw formated compose status line */