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

diff --git a/account.c b/account.c
index 92cacbb..3cc3a22 100644
--- a/account.c
+++ b/account.c
@@ -28,7 +28,9 @@
 int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
 {
     const char* user = NONULL (Username);
+#ifdef USE_IMAP
     const char* login = NONULL (Username);
+#endif
 
     if (a1->type != a2->type)
         return 0;
@@ -46,10 +48,8 @@ int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
     }
 #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)
@@ -110,14 +110,12 @@ void mutt_account_tourl (ACCOUNT * account, ciss_url_t * url)
     }
 #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) {
@@ -149,10 +147,8 @@ int mutt_account_getuser (ACCOUNT * account)
     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);
@@ -207,10 +203,8 @@ int mutt_account_getpass (ACCOUNT * account)
     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);