X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=d78980495eeb56f5b9c3d683f3cd610293a71d53;hp=22d4c90ecd22442db4552d7e26cf7097b9ed9ca8;hb=2f0ad939a786df928a8b5d489692fbe11cf8c9d3;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/send.c b/send.c
index 22d4c90..d789804 100644
--- a/send.c
+++ b/send.c
@@ -16,7 +16,6 @@
 #include "rfc2047.h"
 #include "keymap.h"
 #include "mime.h"
-#include "mailbox.h"
 #include "copy.h"
 #include "mx.h"
 #include "mutt_crypt.h"
@@ -26,6 +25,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -1209,10 +1209,8 @@ int ci_send_message (int flags, /* send mode */
     }
 
     if (!tempfp) {
-      dprint (1,
-              (debugfile,
-               "newsend_message: can't create tempfile %s (errno=%d)\n",
-               msg->content->filename, errno));
+      debug_print (1, ("can't create tempfile %s (errno=%d)\n", 
+                  msg->content->filename, errno));
       mutt_perror (msg->content->filename);
       goto cleanup;
     }
@@ -1663,7 +1661,7 @@ int ci_send_message (int flags, /* send mode */
    */
 
 #ifdef USE_IMAP
-  if ((flags & SENDBATCH) && fcc[0] && mx_is_imap (fcc))
+  if ((flags & SENDBATCH) && fcc[0] && mx_get_magic (fcc) == M_IMAP)
     fcc[0] = '\0';
 #endif