X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=remailer.c;h=94cd44424c8a15c6b133d716d45f20f5ec9756d1;hp=ffa19a3b2d9c917f9e046a8aefe4e154b4b49cfc;hb=ecfcc6df70230ba136c2fb3843700ecb749c41b7;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/remailer.c b/remailer.c
index ffa19a3..94cd444 100644
--- a/remailer.c
+++ b/remailer.c
@@ -16,15 +16,17 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
-#include "mapping.h"
 
 #include "remailer.h"
 
@@ -463,7 +465,7 @@ static struct mapping_t RemailerHelp[] = {
   {N_("Delete"), OP_MIX_DELETE},
   {N_("Abort"), OP_EXIT},
   {N_("OK"), OP_MIX_USE},
-  {NULL}
+  {NULL, OP_NULL}
 };
 
 
@@ -673,7 +675,7 @@ int mix_check_message (HEADER * msg)
 {
   const char *fqdn;
   short need_hostname = 0;
-  ADDRESS *p;
+  address_t *p;
 
   if (msg->env->cc || msg->env->bcc) {
     mutt_error _("Mixmaster doesn't accept Cc or Bcc headers.");