projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplifications.
[apps/madmutt.git]
/
account.c
diff --git
a/account.c
b/account.c
index
044aa6c
..
bd4a776
100644
(file)
--- a/
account.c
+++ b/
account.c
@@
-11,7
+11,7
@@
#include <lib-lib/lib-lib.h>
#include <lib-ui/enter.h>
#include <lib-lib/lib-lib.h>
#include <lib-ui/enter.h>
-#include <lib-ui/
curses
.h>
+#include <lib-ui/
lib-ui
.h>
#include "mutt.h"
#include "account.h"
#include "mutt.h"
#include "account.h"
@@
-19,8
+19,7
@@
/* 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(MCore.username);
- const char* login = NONULL(MCore.username);
+ const char* user = NONULL(mod_core.username);
if (a1->type != a2->type)
return 0;
if (a1->type != a2->type)
return 0;
@@
-29,18
+28,14
@@
int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
if (a1->port != a2->port)
return 0;
if (a1->port != a2->port)
return 0;
- if (a1->type == M_ACCT_TYPE_IMAP) {
- if (ImapUser && (ImapUser[0] != '\0'))
- user = ImapUser;
- if (ImapLogin && (ImapLogin[0] != '\0'))
- login = ImapLogin;
- }
+ if (a1->type == M_ACCT_TYPE_IMAP && !m_strisempty(ImapUser))
+ user = ImapUser;
- if (a1->type == M_ACCT_TYPE_POP &&
PopUser
)
+ if (a1->type == M_ACCT_TYPE_POP &&
!m_strisempty(PopUser)
)
user = PopUser;
#ifdef USE_NNTP
user = PopUser;
#ifdef USE_NNTP
- if (a1->type == M_ACCT_TYPE_NNTP &&
NntpUser
)
+ if (a1->type == M_ACCT_TYPE_NNTP &&
!m_strisempty(NntpUser)
)
user = NntpUser;
#endif
user = NntpUser;
#endif
@@
-82,7
+77,7
@@
int mutt_account_fromurl(ACCOUNT *account, ciss_url_t *url)
* is a set of pointers into account - don't free or edit account until
* you've finished with url (make a copy of account if you need it for
* a while). */
* is a set of pointers into account - don't free or edit account until
* you've finished with url (make a copy of account if you need it for
* a while). */
-void mutt_account_tourl
(ACCOUNT * account, ciss_url_t *
url)
+void mutt_account_tourl
(ACCOUNT *account, ciss_url_t *
url)
{
url->scheme = U_UNKNOWN;
url->user = NULL;
{
url->scheme = U_UNKNOWN;
url->user = NULL;
@@
-131,7
+126,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(
MC
ore.username));
+ m_strcpy(account->user, sizeof(account->user), NONULL(
mod_c
ore.username));
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;
@@
-147,15
+142,11
@@
int mutt_account_getlogin (ACCOUNT* account)
/* already set */
if (account->has_login)
return 0;
/* already set */
if (account->has_login)
return 0;
- else if (account->type == M_ACCT_TYPE_IMAP)
- {
- if (!m_strisempty(ImapLogin)) {
- m_strcpy(account->login, sizeof(account->login), ImapLogin);
- account->has_login = 1;
- }
- }
- if (!account->has_login) {
+ if (account->type == M_ACCT_TYPE_IMAP && !m_strisempty(ImapLogin)) {
+ m_strcpy(account->login, sizeof(account->login), ImapLogin);
+ account->has_login = 1;
+ } else {
mutt_account_getuser (account);
m_strcpy(account->login, sizeof(account->login), account->user);
}
mutt_account_getuser (account);
m_strcpy(account->login, sizeof(account->login), account->user);
}