projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
sendlib.c
diff --git
a/sendlib.c
b/sendlib.c
index
05191c9
..
619591a
100644
(file)
--- a/
sendlib.c
+++ b/
sendlib.c
@@
-805,7
+805,7
@@
CONTENT *mutt_get_content_info (const char *fname, BODY * b)
CONTENT *info;
CONTENT_STATE state;
FILE *fp = NULL;
CONTENT *info;
CONTENT_STATE state;
FILE *fp = NULL;
- char *fromcode;
+ char *fromcode
= NULL
;
char *tocode;
char buffer[100];
char chsbuf[STRING];
char *tocode;
char buffer[100];
char chsbuf[STRING];
@@
-1615,7
+1615,7
@@
int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
}
}
/* Add a vanity header */
}
}
/* Add a vanity header */
- fprintf (fp, "User-Agent:
mutt-ng/%s (%s)\n", MUTT_VERSION
, os);
+ fprintf (fp, "User-Agent:
%s (%s)\n", mutt_make_version (0)
, os);
}
return (ferror (fp) == 0 ? 0 : -1);
}
return (ferror (fp) == 0 ? 0 : -1);
@@
-2078,8
+2078,11
@@
int mutt_invoke_mta (ADDRESS * from, /* the sender */
int eightbit)
{ /* message contains 8bit chars */
#ifdef USE_LIBESMTP
int eightbit)
{ /* message contains 8bit chars */
#ifdef USE_LIBESMTP
- if (SmtpHost)
- return mutt_libesmtp_invoke (from, to, cc, bcc, msg, eightbit);
+#ifdef USE_NNTP
+ if (!option (OPTNEWSSEND))
+#endif
+ if (SmtpHost)
+ return mutt_libesmtp_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);