X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fimap.c;h=77830f95e6aa732d76f7ecd95cb9f67032663968;hb=38fc1689b9f344f253841f5acd7bf79ed2f49b97;hp=43c2426fdcd7099dbead8641916a578ae98173ce;hpb=8fac066483c9ae3176984527c037190fca9dc7f0;p=apps%2Fmadmutt.git

diff --git a/imap/imap.c b/imap/imap.c
index 43c2426..77830f9 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -235,7 +235,7 @@ static int imap_get_delim (IMAP_DATA * idata)
    * than getting the delim wrong */
   idata->delim = '/';
 
-  imap_cmd_start (idata, "LIST\"\" \"\"");
+  imap_cmd_start (idata, "LIST \"\" \"\"");
 
   do {
     if ((rc = imap_cmd_step (idata)) != IMAP_CMD_CONTINUE)
@@ -381,16 +381,13 @@ int imap_open_connection (IMAP_DATA * idata)
     if (imap_check_capabilities (idata))
       goto bail;
     /* Attempt STARTTLS if available and desired. */
-    if (!idata->conn->ssf && (option(OPTSSLFORCETLS) || 
+    if (!idata->conn->ssf && (mod_ssl.force_tls ||
                               mutt_bit_isset (idata->capabilities, STARTTLS))) {
       int rc;
 
-      if (option (OPTSSLFORCETLS))
+      if (mod_ssl.force_tls)
         rc = M_YES;
-      else if ((rc = query_quadoption (OPT_SSLSTARTTLS,
-                                       _("Secure connection with TLS?"))) == -1)
-        goto err_close_conn;
-      if (rc == M_YES) {
+      else if (mod_ssl.starttls) {
         if ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1)
           goto bail;
         if (rc != -2) {
@@ -409,7 +406,7 @@ int imap_open_connection (IMAP_DATA * idata)
       }
     }
 
-    if (option(OPTSSLFORCETLS) && ! idata->conn->ssf) {
+    if (mod_ssl.force_tls && ! idata->conn->ssf) {
       mutt_error _("Encrypted connection unavailable");
       mutt_sleep (1);
       goto err_close_conn;