Rocco Rutte:

- don't try to use libESMTP when sending news

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@459 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/VERSION.svn b/VERSION.svn
index c92ddb6..658bd78 100644 (file)
--- a/VERSION.svn
+++ b/VERSION.svn
@@ -1 +1 @@
-458
+459

diff --git a/sendlib.c b/sendlib.c
index 450f543..619591a 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -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);