Fix madmutt for stupid terms with only 64 colors.

[apps/madmutt.git] / account.c

diff --git a/account.c b/account.c
index bd4a776..78f80c6 100644 (file)
--- a/account.c
+++ b/account.c
@@ -34,11 +34,6 @@ int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
     if (a1->type == M_ACCT_TYPE_POP && !m_strisempty(PopUser))
         user = PopUser;
 
-#ifdef USE_NNTP
-    if (a1->type == M_ACCT_TYPE_NNTP && !m_strisempty(NntpUser))
-        user = NntpUser;
-#endif
-
     if (a1->has_user && a2->has_user)
         return !m_strcmp(a1->user, a2->user);
     if (a1->has_user)
@@ -92,12 +87,6 @@ void mutt_account_tourl(ACCOUNT *account, ciss_url_t *url)
         url->scheme = account->has_ssl ? U_POPS : U_POP;
     }
 
-#ifdef USE_NNTP
-    if (account->type == M_ACCT_TYPE_NNTP) {
-        url->scheme = account->has_ssl ? U_NNTPS : U_NNTP;
-    }
-#endif
-
     url->host = account->host;
     if (account->has_port)
         url->port = account->port;
@@ -119,10 +108,6 @@ int mutt_account_getuser (ACCOUNT * account)
         m_strcpy(account->user, sizeof(account->user), ImapUser);
     else if ((account->type == M_ACCT_TYPE_POP) && !m_strisempty(PopUser))
         m_strcpy(account->user, sizeof(account->user), PopUser);
-#ifdef USE_NNTP
-    else if ((account->type == M_ACCT_TYPE_NNTP) && !m_strisempty(NntpUser))
-        m_strcpy(account->user, sizeof(account->user), NntpUser);
-#endif
     /* prompt (defaults to unix username), copy into account->user */
     else {
         snprintf(prompt, sizeof(prompt), _("Username at %s: "), account->host);
@@ -167,10 +152,6 @@ int mutt_account_getpass (ACCOUNT * account)
         m_strcpy(account->pass, sizeof(account->pass), ImapPass);
     else if ((account->type == M_ACCT_TYPE_POP) && !m_strisempty(PopPass))
         m_strcpy(account->pass, sizeof(account->pass), PopPass);
-#ifdef USE_NNTP
-    else if ((account->type == M_ACCT_TYPE_NNTP) && !m_strisempty(NntpPass))
-        m_strcpy(account->pass, sizeof(account->pass), NntpPass);
-#endif
     else {
         snprintf(prompt, sizeof(prompt), _("Password for %s@%s: "),
                  account->has_login ? account->login : account->user,