X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_libesmtp.c;h=0ee85c427381959e10432914b02ca91854a0074d;hp=f51bd2ea6ac47cd159cfd21d021e23e77ca87f25;hb=3fb238bec424fbc43ebe3a50eca3c84ea7bedf6a;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index f51bd2e..0ee85c4 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>
 
@@ -395,8 +388,7 @@ int mutt_libesmtp_invoke (address_t * from,       /* the sender */
   }
 
 Done:
-  if (fp != NULL)
-    fclose (fp);
+  m_fclose(&fp);
   if (hostportstr != NULL)
     p_delete(&hostportstr);
   if (session != NULL)