X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Futil.c;h=5163da7242230f05c5055ce10155339f3e622be7;hb=e01486aabea6f0af36933158bd58b9ab03b30add;hp=2893f4faaccc95f173802a607eac4d34870330e4;hpb=babaee2b3c92746ec5bd6914222dd9a9eda67285;p=apps%2Fmadmutt.git

diff --git a/imap/util.c b/imap/util.c
index 2893f4f..5163da7 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -110,11 +110,6 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
 
   FREE (&c);
 
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-  if (option (OPTIMAPFORCESSL))
-    mx->account.flags |= M_ACCT_SSL;
-#endif
-
   if ((mx->account.flags & M_ACCT_SSL) && !(mx->account.flags & M_ACCT_PORT))
     mx->account.port = ImapsPort;
 
@@ -135,10 +130,10 @@ void imap_pretty_mailbox (char *path)
   if (imap_parse_path (path, &target) < 0)
     return;
 
-  tlen = safe_strlen (target.mbox);
+  tlen = mutt_strlen (target.mbox);
   /* check whether we can do '=' substitution */
   if (mx_get_magic (Maildir) == M_IMAP && !imap_parse_path (Maildir, &home)) {
-    hlen = safe_strlen (home.mbox);
+    hlen = mutt_strlen (home.mbox);
     if (tlen && mutt_account_match (&home.account, &target.account) &&
         !safe_strncmp (home.mbox, target.mbox, hlen)) {
       if (!hlen)
@@ -446,7 +441,7 @@ void imap_unmunge_mbox_name (char *s)
   buf = safe_strdup (s);
   if (buf) {
     imap_utf7_decode (&buf);
-    strncpy (s, buf, safe_strlen (s));
+    strncpy (s, buf, mutt_strlen (s));
   }
 
   FREE (&buf);