X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_libesmtp.c;h=98533e761360e4d47698fb18c4dabf90392604fe;hp=11ea9933e75f67cd70ff4ee0b6b29cf5b3df14e7;hb=71c287c8c863d235517bf19ddf1834a833a324ce;hpb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 11ea993..98533e7 100644
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -10,25 +10,18 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
+
+#include <lib-ui/enter.h>
 
 #include "mutt.h"
-#include "enter.h"
 
 
 #if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
 #include <openssl/ssl.h>
 #endif
 
-#include <errno.h>
-
 #include <auth-client.h>
 #include <libesmtp.h>
 
@@ -95,7 +88,7 @@ static void _mutt_libesmtp_perror (const char *msg)
  *   Very similar to sendlib.c::add_args
  */
 static int
-_mutt_libesmtp_add_recipients (smtp_message_t message, ADDRESS * addr)
+_mutt_libesmtp_add_recipients (smtp_message_t message, address_t * addr)
 {
   int ret = 0;
 
@@ -304,8 +297,8 @@ int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
  *   Returns 0 upon success, -1 upon failure (and prints an error
  *   message).
  */
-int mutt_libesmtp_invoke (ADDRESS * from,       /* the sender */
-                          ADDRESS * to, ADDRESS * cc, ADDRESS * bcc,    /* recips */
+int mutt_libesmtp_invoke (address_t * from,       /* the sender */
+                          address_t * to, address_t * cc, address_t * bcc,    /* recips */
                           const char *msg,      /* file containing message */
                           int eightbit)
 {                               /* message contains 8bit chars */