X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=account.c;h=17234fbf0b78fc214227d3b1ad8a4ac9ed5cd7b3;hp=800fdd45752a29c39013cd5020a493d160dde12f;hb=926c11d6cc2cf92ec20792edaef2608d3f3b198b;hpb=b8c71f93b0296f815a6538182343ba67e88c0012

diff --git a/account.c b/account.c
index 800fdd4..17234fb 100644
--- a/account.c
+++ b/account.c
@@ -9,20 +9,12 @@
 
 /* remote host account manipulation (POP/IMAP) */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
-#include "enter.h"
 #include "account.h"
-#include "url.h"
-
 
 /* mutt_account_match: compare account info (host/port/user/login) */
 int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
@@ -132,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)
@@ -185,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;
@@ -214,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;
 }