X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=account.c;h=e9ce50e4447b5c5c85978d806692661bda54a232;hp=bd4a776606de9084ed5197028421d18344c0b86a;hb=7db27b8f24670fd40cf24755f2782a104ad24594;hpb=f5276054ef65648b1d1ab00664c0a3ea6879cf39

diff --git a/account.c b/account.c
index bd4a776..e9ce50e 100644
--- a/account.c
+++ b/account.c
@@ -10,7 +10,6 @@
 /* remote host account manipulation (POP/IMAP) */
 
 #include <lib-lib/lib-lib.h>
-#include <lib-ui/enter.h>
 #include <lib-ui/lib-ui.h>
 
 #include "mutt.h"
@@ -34,11 +33,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 +86,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 +107,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 +151,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,