diff options
| -rw-r--r-- | imap/imap.c | 3 | ||||
| -rw-r--r-- | init.h | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/imap/imap.c b/imap/imap.c index c4773ccb..ede06b8f 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -357,7 +357,6 @@ IMAP_DATA* imap_conn_find (const ACCOUNT* account, int flags) int imap_open_connection (IMAP_DATA* idata) { char buf[LONG_STRING]; - int rc; if (mutt_socket_open (idata->conn) < 0) return -1; @@ -376,6 +375,8 @@ int imap_open_connection (IMAP_DATA* idata) /* Attempt STARTTLS if available and desired. */ if (mutt_bit_isset (idata->capabilities, STARTTLS) && !idata->conn->ssf) { + int rc; + if ((rc = query_quadoption (OPT_SSLSTARTTLS, _("Secure connection with TLS?"))) == -1) goto err_close_conn; @@ -965,17 +965,17 @@ struct option_t MuttVars[] = { ** them. If the variable is set, the message files will simply be ** deleted. */ - { "mh_seq_flagged", DT_STR, R_NONE, UL &MhUnseen, "flagged" }, + { "mh_seq_flagged", DT_STR, R_NONE, UL &MhUnseen, UL "flagged" }, /* ** .pp ** The name of the MH sequence used for flagged messages. */ - { "mh_seq_replied", DT_STR, R_NONE, UL &MhUnseen, "replied" }, + { "mh_seq_replied", DT_STR, R_NONE, UL &MhUnseen, UL "replied" }, /* ** .pp ** The name of the MH sequence used to tag replied messages. */ - { "mh_seq_unseen", DT_STR, R_NONE, UL &MhUnseen, "unseen" }, + { "mh_seq_unseen", DT_STR, R_NONE, UL &MhUnseen, UL "unseen" }, /* ** .pp ** The name of the MH sequence used for unseen messages. |