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

diff --git a/imap/imap.c b/imap/imap.c
index b390b45..43c2426 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -16,13 +16,11 @@
 
 #include "mutt.h"
 #include "globals.h"
+#include "pattern.h"
 #include "sort.h"
 #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 */
@@ -237,14 +235,14 @@ static int imap_get_delim (IMAP_DATA * idata)
    * than getting the delim wrong */
   idata->delim = '/';
 
-  imap_cmd_start (idata, "string_list_t \"\" \"\"");
+  imap_cmd_start (idata, "LIST\"\" \"\"");
 
   do {
     if ((rc = imap_cmd_step (idata)) != IMAP_CMD_CONTINUE)
       break;
 
     s = imap_next_word (idata->cmd.buf);
-    if (ascii_strncasecmp ("string_list_t", s, 4) == 0) {
+    if (ascii_strncasecmp ("LIST", s, 4) == 0) {
       s = imap_next_word (s);
       s = imap_next_word (s);
       if (s && s[0] == '\"' && s[1] && s[2] == '\"')
@@ -382,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))) {
@@ -397,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);
@@ -419,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;
@@ -1306,7 +1300,7 @@ int imap_parse_list_response (IMAP_DATA * idata, char **name, int *noselect,
     return -1;
 
   s = imap_next_word (idata->cmd.buf);
-  if ((ascii_strncasecmp ("string_list_t", s, 4) == 0) ||
+  if ((ascii_strncasecmp ("LIST", s, 4) == 0) ||
       (ascii_strncasecmp ("LSUB", s, 4) == 0)) {
     *noselect = 0;
     *noinferiors = 0;
@@ -1508,7 +1502,7 @@ int imap_complete (char *dest, size_t dlen, char *path) {
 
   /* fire off command */
   snprintf (buf, sizeof (buf), "%s \"\" \"%s%%\"",
-            option (OPTIMAPLSUB) ? "LSUB" : "string_list_t", list);
+            option (OPTIMAPLSUB) ? "LSUB" : "LIST", list);
 
   imap_cmd_start (idata, buf);
 
@@ -1599,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;