X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fimap.c;h=43c2426fdcd7099dbead8641916a578ae98173ce;hb=388148b48fedd8007192a5f94cf0bad89c65227b;hp=e54b81f7c1d7ddc424e4b0805a55056a74b376bb;hpb=25594eeaad2af2d06328b47283cfba72fa3bc8cd;p=apps%2Fmadmutt.git

diff --git a/imap/imap.c b/imap/imap.c
index e54b81f..43c2426 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -21,9 +21,6 @@
 #include "browser.h"
 #include "message.h"
 #include "imap_private.h"
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-# include <lib-sys/mutt_ssl.h>
-#endif
 #include "buffy.h"
 
 /* imap forward declarations */
@@ -383,7 +380,6 @@ int imap_open_connection (IMAP_DATA * idata)
     /* TODO: Parse new tagged CAPABILITY data (* OK [CAPABILITY...]) */
     if (imap_check_capabilities (idata))
       goto bail;
-#if defined(USE_SSL) || defined(USE_GNUTLS)
     /* Attempt STARTTLS if available and desired. */
     if (!idata->conn->ssf && (option(OPTSSLFORCETLS) || 
                               mutt_bit_isset (idata->capabilities, STARTTLS))) {
@@ -398,9 +394,7 @@ int imap_open_connection (IMAP_DATA * idata)
         if ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1)
           goto bail;
         if (rc != -2) {
-#if defined (USE_SSL) || defined (USE_GNUTLS)
           if (mutt_ssl_starttls (idata->conn))
-#endif
           {
             mutt_error (_("Could not negotiate TLS connection"));
             mutt_sleep (1);
@@ -420,7 +414,6 @@ int imap_open_connection (IMAP_DATA * idata)
       mutt_sleep (1);
       goto err_close_conn;
     }
-#endif
   }
   else if (ascii_strncasecmp ("* PREAUTH", idata->cmd.buf, 9) == 0) {
     idata->state = IMAP_AUTHENTICATED;
@@ -1600,7 +1593,7 @@ static int imap_open_new_message (MESSAGE * msg,
 {
     char tmp[_POSIX_PATH_MAX];
 
-    msg->fp = m_tempfile(tmp, sizeof(tmp), NONULL(Tempdir), NULL);
+    msg->fp = m_tempfile(tmp, sizeof(tmp), NONULL(MCore.tmpdir), NULL);
     if (!msg->fp) {
         mutt_perror(tmp);
         return -1;