reinstate cmd_user, and continue to simplify pop code.

[apps/madmutt.git] / account.c

diff --git a/account.c b/account.c
index f13831e..ea1806a 100644 (file)
--- a/account.c
+++ b/account.c
@@ -9,12 +9,9 @@
 
 /* remote host account manipulation (POP/IMAP) */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <lib-lib/lib-lib.h>
 #include <lib-ui/enter.h>
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
 #include "account.h"
@@ -22,8 +19,8 @@
 /* mutt_account_match: compare account info (host/port/user/login) */
 int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
 {
-    const char* user = NONULL (Username);
-    const char* login = NONULL (Username);
+    const char* user  = NONULL(MCore.username);
+    const char* login = NONULL(MCore.username);
 
     if (a1->type != a2->type)
         return 0;
@@ -127,7 +124,7 @@ void mutt_account_tourl (ACCOUNT * account, ciss_url_t * url)
 /* mutt_account_getuser: retrieve username into ACCOUNT, if necessary */
 int mutt_account_getuser (ACCOUNT * account)
 {
-    char prompt[SHORT_STRING];
+    char prompt[STRING];
 
     /* already set */
     if (account->flags & M_ACCT_USER)
@@ -143,7 +140,7 @@ int mutt_account_getuser (ACCOUNT * account)
     /* prompt (defaults to unix username), copy into account->user */
     else {
         snprintf(prompt, sizeof(prompt), _("Username at %s: "), account->host);
-        m_strcpy(account->user, sizeof(account->user), NONULL(Username));
+        m_strcpy(account->user, sizeof(account->user), NONULL(MCore.username));
         if (mutt_get_field_unbuffered(prompt, account->user,
                                       sizeof(account->user), 0))
             return -1;
@@ -180,7 +177,7 @@ int mutt_account_getlogin (ACCOUNT* account)
 /* mutt_account_getpass: fetch password into ACCOUNT, if neccessary */
 int mutt_account_getpass (ACCOUNT * account)
 {
-    char prompt[SHORT_STRING];
+    char prompt[STRING];
 
     if (account->flags & M_ACCT_PASS)
         return 0;
@@ -209,5 +206,5 @@ int mutt_account_getpass (ACCOUNT * account)
 
 void mutt_account_unsetpass (ACCOUNT * account)
 {
-    account->flags &= !M_ACCT_PASS;
+    account->flags &= ~M_ACCT_PASS;
 }