X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=mutt_libesmtp.c;h=fce3580e80db048f855cb4ad078c1d96d6e3f5eb;hb=2bc76f88e99c16e773c2b2ba805a0bf3e2c034fd;hp=82e1a5f35602d5969fd12355b6715ecb4f0a0e2a;hpb=8fdb4b6b3ef01527b99bdcb1c0542cb2abf1056a;p=apps%2Fmadmutt.git

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 82e1a5f..fce3580 100644
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -14,9 +14,10 @@
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/enter.h>
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
-
+#include "mutt_libesmtp.h"
 
 #if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
 #include <openssl/ssl.h>
@@ -106,7 +107,8 @@ Done:
 
 static int
 _mutt_libesmtp_auth_interact (auth_client_request_t request,
-                              char **result, int fields, void *arg)
+                              char **result, int fields,
+                              void *arg __attribute__ ((unused)))
 {
   int i;
 
@@ -158,7 +160,7 @@ static const char *_mutt_libesmtp_messagefp_cb (void **buf, int *len,
     char *p = strchr (*buf, '\0');
 
     if (p[-1] == '\n' && p[-2] != '\r') {
-      m_strcpy(p - 1, *buf + BUFLEN - p + 1, "\r\n");
+      m_strcpy(p - 1, (char *) *buf + BUFLEN - p + 1, "\r\n");
       p++;
     }
     octets = p - (char *) *buf;
@@ -179,7 +181,8 @@ static int handle_invalid_peer_certificate (long vfy_result) {
   return 1; /* Accept the problem */
 }
 
-static void event_cb (smtp_session_t session, int event_no, void *arg,...)
+static void event_cb (smtp_session_t session __attribute__ ((unused)),
+                      int event_no, void *arg,...)
 { 
   va_list alist;
   int *ok;
@@ -248,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) {
@@ -267,11 +270,11 @@ 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);
 }
 
@@ -352,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");
 
@@ -362,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)