X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=account.h;h=0c44f6eba871d3f812ef99feb39cdec84bbcbabd;hp=a2aa59e46c71e5aef0b7c8083f79f726d241735f;hb=95986f5aee1c2ee7d12c4b1e4bc47874856c5831;hpb=6833ce8bdca2d64e14485118f2a4417b7e1cb1b1

diff --git a/account.h b/account.h
index a2aa59e..0c44f6e 100644
--- a/account.h
+++ b/account.h
@@ -1,58 +1,51 @@
 /*
- * Copyright (C) 2000-3 Brendan Cully <brendan@kublai.com>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- */ 
+ * Copyright notice from original mutt:
+ * Copyright (C) 2000-5 Brendan Cully <brendan@kublai.com>
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
+ */
 
 /* remote host account manipulation (POP/IMAP) */
 
 #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
+enum {
+    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_PASS (1<<2)
-#define M_ACCT_SSL  (1<<3)
-
-typedef struct
-{
-  char user[64];
-  char pass[64];
-  char host[128];
-  unsigned short port;
-  unsigned char type;
-  unsigned char flags;
+typedef struct {
+    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);
-int mutt_account_fromurl (ACCOUNT* account, ciss_url_t* url);
-void mutt_account_tourl (ACCOUNT* account, ciss_url_t* url);
-int mutt_account_getuser (ACCOUNT* account);
-int mutt_account_getpass (ACCOUNT* account);
-void mutt_account_unsetpass (ACCOUNT* account);
+int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * m2);
+int mutt_account_fromurl (ACCOUNT * account, ciss_url_t * url);
+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);
 
 #endif /* _MUTT_ACCOUNT_H_ */