Make mutt-nntp depend on mutt >= 1.5.21-5

[software/mutt-debian.git] / account.c

diff --git a/account.c b/account.c
index ca65754d5daf4e2ddbad886e0cda2274ae0499bb..f7389914e444d32261934d9097fcb42d503f1b9b 100644 (file)
--- a/account.c
+++ b/account.c
@@ -26,11 +26,10 @@
 #include "account.h"
 #include "url.h"
 
-/* mutt_account_match: compare account info (host/port/user/login) */
+/* mutt_account_match: compare account info (host/port/user) */
 int mutt_account_match (const ACCOUNT* a1, const ACCOUNT* a2)
 {
   const char* user = NONULL (Username);
-  const char* login = NONULL (Username);
 
   if (a1->type != a2->type)
     return 0;
@@ -44,8 +43,6 @@ int mutt_account_match (const ACCOUNT* a1, const ACCOUNT* a2)
   {
     if (ImapUser)
       user = ImapUser;
-    if (ImapLogin)
-      login = ImapLogin;
   }
 #endif
 
@@ -158,6 +155,8 @@ int mutt_account_getuser (ACCOUNT* account)
   else if ((account->type == M_ACCT_TYPE_POP) && PopUser)
     strfcpy (account->user, PopUser, sizeof (account->user));
 #endif
+  else if (option (OPTNOCURSES))
+    return -1;
   /* prompt (defaults to unix username), copy into account->user */
   else
   {
@@ -218,6 +217,8 @@ int mutt_account_getpass (ACCOUNT* account)
   else if ((account->type == M_ACCT_TYPE_SMTP) && SmtpPass)
     strfcpy (account->pass, SmtpPass, sizeof (account->pass));
 #endif
+  else if (option (OPTNOCURSES))
+    return -1;
   else
   {
     snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "),