X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=account.c;h=800fdd45752a29c39013cd5020a493d160dde12f;hp=92cacbb46dc527ebf151b120a6ab774b35b3c6c4;hb=99f5c6c8a6c4e73aeb253e5c7f1d0035cabc8db0;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/account.c b/account.c
index 92cacbb..800fdd4 100644
--- a/account.c
+++ b/account.c
@@ -37,19 +37,15 @@ int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
     if (a1->port != a2->port)
         return 0;
 
-#ifdef USE_IMAP
     if (a1->type == M_ACCT_TYPE_IMAP) {
         if (ImapUser && (ImapUser[0] != '\0'))
             user = ImapUser;
         if (ImapLogin && (ImapLogin[0] != '\0'))
             login = ImapLogin;
     }
-#endif
 
-#ifdef USE_POP
     if (a1->type == M_ACCT_TYPE_POP && PopUser)
         user = PopUser;
-#endif
 
 #ifdef USE_NNTP
     if (a1->type == M_ACCT_TYPE_NNTP && NntpUser)
@@ -101,23 +97,19 @@ void mutt_account_tourl (ACCOUNT * account, ciss_url_t * url)
     url->pass = NULL;
     url->port = 0;
 
-#ifdef USE_IMAP
     if (account->type == M_ACCT_TYPE_IMAP) {
         if (account->flags & M_ACCT_SSL)
             url->scheme = U_IMAPS;
         else
             url->scheme = U_IMAP;
     }
-#endif
 
-#ifdef USE_POP
     if (account->type == M_ACCT_TYPE_POP) {
         if (account->flags & M_ACCT_SSL)
             url->scheme = U_POPS;
         else
             url->scheme = U_POP;
     }
-#endif
 
 #ifdef USE_NNTP
     if (account->type == M_ACCT_TYPE_NNTP) {
@@ -145,14 +137,10 @@ int mutt_account_getuser (ACCOUNT * account)
     /* already set */
     if (account->flags & M_ACCT_USER)
         return 0;
-#ifdef USE_IMAP
     else if ((account->type == M_ACCT_TYPE_IMAP) && !m_strisempty(ImapUser))
         m_strcpy(account->user, sizeof(account->user), ImapUser);
-#endif
-#ifdef USE_POP
     else if ((account->type == M_ACCT_TYPE_POP) && !m_strisempty(PopUser))
         m_strcpy(account->user, sizeof(account->user), PopUser);
-#endif
 #ifdef USE_NNTP
     else if ((account->type == M_ACCT_TYPE_NNTP) && !m_strisempty(NntpUser))
         m_strcpy(account->user, sizeof(account->user), NntpUser);
@@ -176,7 +164,6 @@ int mutt_account_getlogin (ACCOUNT* account)
     /* already set */
     if (account->flags & M_ACCT_LOGIN)
         return 0;
-#ifdef USE_IMAP
     else if (account->type == M_ACCT_TYPE_IMAP)
     {
         if (!m_strisempty(ImapLogin)) {
@@ -184,7 +171,6 @@ int mutt_account_getlogin (ACCOUNT* account)
             account->flags |= M_ACCT_LOGIN;
         }
     }
-#endif
 
     if (!(account->flags & M_ACCT_LOGIN)) {
         mutt_account_getuser (account);
@@ -203,14 +189,10 @@ int mutt_account_getpass (ACCOUNT * account)
 
     if (account->flags & M_ACCT_PASS)
         return 0;
-#ifdef USE_IMAP
     else if ((account->type == M_ACCT_TYPE_IMAP) && !m_strisempty(ImapPass))
         m_strcpy(account->pass, sizeof(account->pass), ImapPass);
-#endif
-#ifdef USE_POP
     else if ((account->type == M_ACCT_TYPE_POP) && !m_strisempty(PopPass))
         m_strcpy(account->pass, sizeof(account->pass), PopPass);
-#endif
 #ifdef USE_NNTP
     else if ((account->type == M_ACCT_TYPE_NNTP) && !m_strisempty(NntpPass))
         m_strcpy(account->pass, sizeof(account->pass), NntpPass);