still fixing the override

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

diff --git a/account.c b/account.c
index b305f788b42efdd7212eeb3ff457fcd31fe698ce..f7389914e444d32261934d9097fcb42d503f1b9b 100644 (file)
--- a/account.c
+++ b/account.c
@@ -155,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 ((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
   {
   /* prompt (defaults to unix username), copy into account->user */
   else
   {


@@ -215,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 ((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: "),
   else
   {
     snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "),