X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=account.c;h=bd4a776606de9084ed5197028421d18344c0b86a;hp=7838827f72aaefd68f057806f01e8a1a5cbde5e2;hb=4c86444ebf9fc4a8231424c0cdd832eb10abdb35;hpb=cef32312aa7c285411e817304de98f3873cba6be

diff --git a/account.c b/account.c
index 7838827..bd4a776 100644
--- a/account.c
+++ b/account.c
@@ -11,7 +11,7 @@
 
 #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"
@@ -19,8 +19,7 @@
 /* mutt_account_match: compare account info (host/port/user/login) */
 int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
 {
-    const char* user = NONULL (Username);
-    const char* login = NONULL (Username);
+    const char* user  = NONULL(mod_core.username);
 
     if (a1->type != a2->type)
         return 0;
@@ -29,27 +28,23 @@ int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
     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)
+    if (a1->type == M_ACCT_TYPE_NNTP && !m_strisempty(NntpUser))
         user = NntpUser;
 #endif
 
-    if (a1->flags & a2->flags & M_ACCT_USER)
-        return (!m_strcmp(a1->user, a2->user));
-    if (a1->flags & M_ACCT_USER)
-        return (!m_strcmp(a1->user, user));
-    if (a2->flags & M_ACCT_USER)
-        return (!m_strcmp(a2->user, user));
+    if (a1->has_user && a2->has_user)
+        return !m_strcmp(a1->user, a2->user);
+    if (a1->has_user)
+        return !m_strcmp(a1->user, user);
+    if (a2->has_user)
+        return !m_strcmp(a2->user, user);
 
     return 1;
 }
@@ -64,15 +59,15 @@ int mutt_account_fromurl(ACCOUNT *account, ciss_url_t *url)
 
     if (url->user) {
         m_strcpy(account->user, sizeof(account->user), url->user);
-        account->flags |= M_ACCT_USER;
+        account->has_user = 1;
     }
     if (url->pass) {
         m_strcpy(account->pass, sizeof(account->pass), url->pass);
-        account->flags |= M_ACCT_PASS;
+        account->has_pass = 1;
     }
     if (url->port) {
         account->port = url->port;
-        account->flags |= M_ACCT_PORT;
+        account->has_port = 1;
     }
 
     return 0;
@@ -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). */
-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;
@@ -90,44 +85,35 @@ void mutt_account_tourl (ACCOUNT * account, ciss_url_t * url)
     url->port = 0;
 
     if (account->type == M_ACCT_TYPE_IMAP) {
-        if (account->flags & M_ACCT_SSL)
-            url->scheme = U_IMAPS;
-        else
-            url->scheme = U_IMAP;
+        url->scheme = account->has_ssl ? U_IMAPS : U_IMAP;
     }
 
     if (account->type == M_ACCT_TYPE_POP) {
-        if (account->flags & M_ACCT_SSL)
-            url->scheme = U_POPS;
-        else
-            url->scheme = U_POP;
+        url->scheme = account->has_ssl ? U_POPS : U_POP;
     }
 
 #ifdef USE_NNTP
     if (account->type == M_ACCT_TYPE_NNTP) {
-        if (account->flags & M_ACCT_SSL)
-            url->scheme = U_NNTPS;
-        else
-            url->scheme = U_NNTP;
+        url->scheme = account->has_ssl ? U_NNTPS : U_NNTP;
     }
 #endif
 
     url->host = account->host;
-    if (account->flags & M_ACCT_PORT)
+    if (account->has_port)
         url->port = account->port;
-    if (account->flags & M_ACCT_USER)
+    if (account->has_user)
         url->user = account->user;
-    if (account->flags & M_ACCT_PASS)
+    if (account->has_pass)
         url->pass = account->pass;
 }
 
 /* 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)
+    if (account->has_user)
         return 0;
     else if ((account->type == M_ACCT_TYPE_IMAP) && !m_strisempty(ImapUser))
         m_strcpy(account->user, sizeof(account->user), ImapUser);
@@ -140,13 +126,13 @@ 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);
-        m_strcpy(account->user, sizeof(account->user), NONULL(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;
     }
 
-    account->flags |= M_ACCT_USER;
+    account->has_user = 1;
 
     return 0;
 }
@@ -154,22 +140,18 @@ int mutt_account_getuser (ACCOUNT * account)
 int mutt_account_getlogin (ACCOUNT* account)
 {
     /* already set */
-    if (account->flags & M_ACCT_LOGIN)
+    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->flags |= M_ACCT_LOGIN;
-        }
-    }
 
-    if (!(account->flags & M_ACCT_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);
     }
 
-    account->flags |= M_ACCT_LOGIN;
+    account->has_login = 1;
 
     return 0;
 }
@@ -177,9 +159,9 @@ 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)
+    if (account->has_pass)
         return 0;
     else if ((account->type == M_ACCT_TYPE_IMAP) && !m_strisempty(ImapPass))
         m_strcpy(account->pass, sizeof(account->pass), ImapPass);
@@ -191,7 +173,7 @@ int mutt_account_getpass (ACCOUNT * account)
 #endif
     else {
         snprintf(prompt, sizeof(prompt), _("Password for %s@%s: "),
-                 account->flags & M_ACCT_LOGIN ? account->login : account->user,
+                 account->has_login ? account->login : account->user,
                  account->host);
         account->pass[0] = '\0';
         if (mutt_get_field_unbuffered(prompt, account->pass,
@@ -199,12 +181,7 @@ int mutt_account_getpass (ACCOUNT * account)
             return -1;
     }
 
-    account->flags |= M_ACCT_PASS;
+    account->has_pass = 1;
 
     return 0;
 }
-
-void mutt_account_unsetpass (ACCOUNT * account)
-{
-    account->flags &= ~M_ACCT_PASS;
-}