projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Repository cleanse.
[apps/madmutt.git]
/
account.c
diff --git
a/account.c
b/account.c
index
dc12bc6
..
ea1806a
100644
(file)
--- a/
account.c
+++ b/
account.c
@@
-9,17
+9,9
@@
/* 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/url.h>
-
+#include <lib-lib/lib-lib.h>
#include <lib-ui/enter.h>
#include <lib-ui/enter.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "account.h"
#include "mutt.h"
#include "account.h"
@@
-27,8
+19,8
@@
/* 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)
{
- const char* user
= NONULL (U
sername);
- const char* login = NONULL
(U
sername);
+ const char* user
= NONULL(MCore.u
sername);
+ const char* login = NONULL
(MCore.u
sername);
if (a1->type != a2->type)
return 0;
if (a1->type != a2->type)
return 0;
@@
-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)
@@
-148,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);
/* 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(
U
sername));
+ m_strcpy(account->user, sizeof(account->user), NONULL(
MCore.u
sername));
if (mutt_get_field_unbuffered(prompt, account->user,
sizeof(account->user), 0))
return -1;
if (mutt_get_field_unbuffered(prompt, account->user,
sizeof(account->user), 0))
return -1;
@@
-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;
}
}