X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_libesmtp.c;h=eda907e21ec81557b295326f2dbb295105b0be01;hp=e8786d9672dc8d8e4593b2871069646939b1bd71;hb=c8e9242de36d7aa6e3bb2e446f57ef2a14e4c889;hpb=2bffc6c0ec2984441f8f66e23af8d3215f7a6f84

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index e8786d9..eda907e 100644
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -251,15 +251,15 @@ static void do_dsn_notify (smtp_message_t message, const char* from) {
   int flags = Notify_NOTSET;
   smtp_recipient_t self = NULL;
 
-  if (m_strisempty(DsnNotify) || !message || m_strisempty(from) || 
-      strstr (DsnNotify, "never") != NULL)
+  if (m_strisempty(MTransport.dsn_notify) || !message || m_strisempty(from) || 
+      strstr (MTransport.dsn_notify, "never") != NULL)
     return;
 
-  if (strstr (DsnNotify, "failure") != NULL)
+  if (strstr (MTransport.dsn_notify, "failure") != NULL)
     flags |= Notify_FAILURE;
-  if (strstr (DsnNotify, "delay") != NULL)
+  if (strstr (MTransport.dsn_notify, "delay") != NULL)
     flags |= Notify_DELAY;
-  if (strstr (DsnNotify, "success") != NULL)
+  if (strstr (MTransport.dsn_notify, "success") != NULL)
     flags |= Notify_SUCCESS;
 
   if (flags != Notify_NOTSET) {
@@ -270,17 +270,17 @@ static void do_dsn_notify (smtp_message_t message, const char* from) {
 }
 
 static void do_dsn_ret (smtp_message_t message) {
-  if (m_strisempty(DsnReturn) || !message)
+  if (m_strisempty(MTransport.dsn_return) || !message)
     return;
-  if (ascii_strncasecmp (DsnReturn, "hdrs", 4) == 0)
+  if (ascii_strncasecmp (MTransport.dsn_return, "hdrs", 4) == 0)
     smtp_dsn_set_ret (message, Ret_HDRS);
-  else if (ascii_strncasecmp (DsnReturn, "full", 4) == 0)
+  else if (ascii_strncasecmp (MTransport.dsn_return, "full", 4) == 0)
     smtp_dsn_set_ret (message, Ret_FULL);
 }
 
 #if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
 int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
-                                char* errbuf, size_t errlen) {
+                                char* errbuf, ssize_t errlen) {
   char* val = (char*) p;
   if (m_strisempty(val))
     return (1);
@@ -355,8 +355,8 @@ int mutt_libesmtp_invoke (address_t * from,       /* the sender */
     SMTPFAIL ("smtp_add_message");
 
   /*  Initialize envelope sender */
-  if (option (OPTENVFROM) && EnvFrom)
-    envfrom = EnvFrom->mailbox;
+  if (MTransport.use_envelope_from && MTransport.envelope_from_address)
+    envfrom = MTransport.envelope_from_address->mailbox;
   if (!smtp_set_reverse_path (message, envfrom))
     SMTPFAIL ("smtp_set_reverse_path");
 
@@ -365,7 +365,7 @@ int mutt_libesmtp_invoke (address_t * from,       /* the sender */
   do_dsn_ret (message);
 
   /* set up 8bitmime flag */
-  if (eightbit && option (OPTUSE8BITMIME))
+  if (eightbit && MTransport.use_8bitmime)
     smtp_8bitmime_set_body (message, E8bitmime_8BITMIME);
 
   if ((fp = fopen (msg, "r")) == NULL)