#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"
/* 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->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
- if (a1->type == M_ACCT_TYPE_NNTP && NntpUser)
- user = NntpUser;
-#endif
-
if (a1->has_user && a2->has_user)
return !m_strcmp(a1->user, a2->user);
if (a1->has_user)
* 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 = account->has_ssl ? U_POPS : U_POP;
}
-#ifdef USE_NNTP
- if (account->type == M_ACCT_TYPE_NNTP) {
- url->scheme = account->has_ssl ? U_NNTPS : U_NNTP;
- }
-#endif
-
url->host = account->host;
if (account->has_port)
url->port = account->port;
m_strcpy(account->user, sizeof(account->user), ImapUser);
else if ((account->type == M_ACCT_TYPE_POP) && !m_strisempty(PopUser))
m_strcpy(account->user, sizeof(account->user), PopUser);
-#ifdef USE_NNTP
- else if ((account->type == M_ACCT_TYPE_NNTP) && !m_strisempty(NntpUser))
- m_strcpy(account->user, sizeof(account->user), NntpUser);
-#endif
/* 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(MCore.username));
+ m_strcpy(account->user, sizeof(account->user), NONULL(mod_core.username));
if (mutt_get_field_unbuffered(prompt, account->user,
sizeof(account->user), 0))
return -1;
/* 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);
}
m_strcpy(account->pass, sizeof(account->pass), ImapPass);
else if ((account->type == M_ACCT_TYPE_POP) && !m_strisempty(PopPass))
m_strcpy(account->pass, sizeof(account->pass), PopPass);
-#ifdef USE_NNTP
- else if ((account->type == M_ACCT_TYPE_NNTP) && !m_strisempty(NntpPass))
- m_strcpy(account->pass, sizeof(account->pass), NntpPass);
-#endif
else {
snprintf(prompt, sizeof(prompt), _("Password for %s@%s: "),
account->has_login ? account->login : account->user,