projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of pan:/git/madmutt
[apps/madmutt.git]
/
account.c
diff --git
a/account.c
b/account.c
index
800fdd4
..
17234fb
100644
(file)
--- a/
account.c
+++ b/
account.c
@@
-9,20
+9,12
@@
/* remote host account manipulation (POP/IMAP) */
/* 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 "mutt.h"
-#include "enter.h"
#include "account.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)
/* 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)
{
/* mutt_account_getuser: retrieve username into ACCOUNT, if necessary */
int mutt_account_getuser (ACCOUNT * account)
{
- char prompt[S
HORT_S
TRING];
+ char prompt[STRING];
/* already set */
if (account->flags & M_ACCT_USER)
/* 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)
{
/* mutt_account_getpass: fetch password into ACCOUNT, if neccessary */
int mutt_account_getpass (ACCOUNT * account)
{
- char prompt[S
HORT_S
TRING];
+ char prompt[STRING];
if (account->flags & M_ACCT_PASS)
return 0;
if (account->flags & M_ACCT_PASS)
return 0;
@@
-214,5
+206,5
@@
int mutt_account_getpass (ACCOUNT * account)
void mutt_account_unsetpass (ACCOUNT * account)
{
void mutt_account_unsetpass (ACCOUNT * account)
{
- account->flags &=
!
M_ACCT_PASS;
+ account->flags &=
~
M_ACCT_PASS;
}
}