X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=account.h;h=0c44f6eba871d3f812ef99feb39cdec84bbcbabd;hp=2af7fbc47625ab424cb731ac5066547d9a52ef15;hb=819c071fa7efc8dffb4dd92f36f0111227ff692f;hpb=b4827293ce79b576beb9550b91e71a198f2f5744

diff --git a/account.h b/account.h
index 2af7fbc..0c44f6e 100644
--- a/account.h
+++ b/account.h
@@ -12,31 +12,33 @@
 #ifndef _MUTT_ACCOUNT_H_
 #define _MUTT_ACCOUNT_H_ 1
 
-#include "url.h"
+#include <lib-lib/lib-lib.h>
 
-/* account types */
 enum {
-  M_ACCT_TYPE_NONE = 0,
-  M_ACCT_TYPE_IMAP,
-  M_ACCT_TYPE_NNTP,
-  M_ACCT_TYPE_POP
+    M_ACCT_TYPE_NONE = 0,
+    M_ACCT_TYPE_IMAP,
+    M_ACCT_TYPE_POP
 };
 
-/* account flags */
-#define M_ACCT_PORT     (1<<0)
-#define M_ACCT_USER     (1<<1)
-#define M_ACCT_LOGIN    (1<<1)
-#define M_ACCT_PASS     (1<<2)
-#define M_ACCT_SSL      (1<<3)
-
 typedef struct {
-  char user[64];
-  char login[64];
-  char pass[64];
-  char host[128];
-  unsigned short port;
-  unsigned char type;
-  unsigned char flags;
+    union {
+        struct {
+            unsigned has_port  : 1;
+            unsigned has_user  : 1;
+            unsigned has_login : 1;
+            unsigned has_pass  : 1;
+            unsigned has_ssl   : 1;
+        };
+        char flags;
+    };
+
+    char type;
+    int  port;
+
+    char user[64];
+    char login[64];
+    char pass[64];
+    char host[128];
 } ACCOUNT;
 
 int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * m2);
@@ -45,6 +47,5 @@ void mutt_account_tourl (ACCOUNT * account, ciss_url_t * url);
 int mutt_account_getuser (ACCOUNT * account);
 int mutt_account_getlogin (ACCOUNT * account);
 int mutt_account_getpass (ACCOUNT * account);
-void mutt_account_unsetpass (ACCOUNT * account);
 
 #endif /* _MUTT_ACCOUNT_H_ */