projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we don't really need md5 for hcache at all.
[apps/madmutt.git]
/
sendlib.c
diff --git
a/sendlib.c
b/sendlib.c
index
e45ad11
..
b79d3c1
100644
(file)
--- a/
sendlib.c
+++ b/
sendlib.c
@@
-18,16
+18,15
@@
#include <lib-ui/curses.h>
#include <lib-mx/mx.h>
#include <lib-ui/curses.h>
#include <lib-mx/mx.h>
-#include <lib-crypt/crypt.h>
-
#include "mutt.h"
#include "handler.h"
#include "mutt.h"
#include "handler.h"
+#include "crypt.h"
#include "recvattach.h"
#include "copy.h"
#include "pager.h"
#include "charset.h"
#include "mutt_idna.h"
#include "recvattach.h"
#include "copy.h"
#include "pager.h"
#include "charset.h"
#include "mutt_idna.h"
-#include "
mutt_libe
smtp.h"
+#include "
send_
smtp.h"
#ifdef USE_NNTP
#include <nntp/nntp.h>
#ifdef USE_NNTP
#include <nntp/nntp.h>
@@
-1107,8
+1106,6
@@
BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg)
if ((option (OPTMIMEFORWDECODE) || option (OPTFORWDECRYPT)) &&
(hdr->security & ENCRYPT)) {
if ((option (OPTMIMEFORWDECODE) || option (OPTFORWDECRYPT)) &&
(hdr->security & ENCRYPT)) {
- if (!crypt_valid_passphrase (hdr->security))
- return (NULL);
}
fp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL);
}
fp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL);
@@
-1910,8
+1907,7
@@
static int mutt_invoke_sendmail (address_t * from, /* the sender */
struct stat st;
if (!stat(childout, &st) && st.st_size > 0)
struct stat st;
if (!stat(childout, &st) && st.st_size > 0)
- mutt_do_pager(_("Output of the delivery process"), childout, 0,
- NULL);
+ mutt_pager(_("Output of the delivery process"), childout, 0, NULL);
}
}
} else {
}
}
} else {
@@
-1941,7
+1937,7
@@
int mutt_invoke_mta (address_t * from, /* the sender */
if (!option (OPTNEWSSEND))
#endif
if (SmtpHost)
if (!option (OPTNEWSSEND))
#endif
if (SmtpHost)
- return
mutt_libe
smtp_invoke (from, to, cc, bcc, msg, eightbit);
+ return
send_
smtp_invoke (from, to, cc, bcc, msg, eightbit);
#endif
return mutt_invoke_sendmail (from, to, cc, bcc, msg, eightbit);
#endif
return mutt_invoke_sendmail (from, to, cc, bcc, msg, eightbit);
@@
-1977,12
+1973,7
@@
void mutt_prepare_envelope (ENVELOPE * env, int final)
rfc2047_encode_adrlist(env->reply_to, "Reply-To");
if (env->subject)
rfc2047_encode_adrlist(env->reply_to, "Reply-To");
if (env->subject)
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND) || option (OPTMIMESUBJECT))
-#endif
- {
- rfc2047_encode_string (&env->subject);
- }
+ rfc2047_encode_string (&env->subject);
encode_headers (env->userhdrs);
}
encode_headers (env->userhdrs);
}