X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=account.c;h=ea1806a894790dc2616738377694cfb2570375ae;hp=73a036ac271f61b1b110a5ca22bc0b4740284230;hb=8e689b28eefc1a93797f299c33f7ec3e2e340329;hpb=1ee89902de184a640c171ae3285bff6882a791bd

diff --git a/account.c b/account.c
index 73a036a..ea1806a 100644
--- a/account.c
+++ b/account.c
@@ -11,6 +11,7 @@
 
 #include <lib-lib/lib-lib.h>
 #include <lib-ui/enter.h>
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
 #include "account.h"
@@ -18,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;
@@ -123,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)
@@ -139,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;
@@ -176,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;
@@ -205,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;
 }