libemail

diff --git a/.clang-format b/.clang-format
index 4e8568232ec42dfb36aafb9157bf1820fca7d202..c41d0a208c4ad92e0b91002fc0d039049d0b63a4 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -18,10 +18,12 @@ IncludeCategories:
     Priority:   -6
   - Regex:      '"mutt/.*\.h"'
     Priority:   -4
-  - Regex:      '"conn/.*\.h"'
+  - Regex:      '"email/.*\.h"'
     Priority:   -3
-  - Regex:      '"mutt\.h"'
+  - Regex:      '"conn/.*\.h"'
     Priority:   -2
+  - Regex:      '"mutt\.h"'
+    Priority:   -1
   # Main Header 0
   - Regex:      '".*"'
     Priority:   5

diff --git a/Makefile.autosetup b/Makefile.autosetup
index dfd71ab1c1b25b95cd1df7a6fbe177fa5842ba86..1d168b2dabc2a9b11b90e0a8b5d6e8048af76b2e 100644 (file)
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -89,15 +89,23 @@ NEOMUTTOBJS+=       mutt_lua.o
 CLEANFILES+=   $(NEOMUTT) $(NEOMUTTOBJS)
 ALLOBJS+=      $(NEOMUTTOBJS)
 
+###############################################################################
+# libemail
+LIBEMAIL=      libemail.a
+LIBEMAILOBJS=  email/address.o email/attach.o email/body.o email/envelope.o \
+               email/header.o email/parameter.o email/tags.o email/thread.o
+CLEANFILES+=   $(LIBEMAIL) $(LIBEMAILOBJS)
+MUTTLIBS+=     $(LIBEMAIL)
+ALLOBJS+=      $(LIBEMAILOBJS)
+
 ###############################################################################
 # libmutt
 LIBMUTT=       libmutt.a
-LIBMUTTOBJS=   mutt/address.o mutt/attach.o mutt/base64.o mutt/body.o mutt/buffer.o mutt/charset.o \
-               mutt/date.o mutt/envelope.o mutt/envlist.o mutt/exit.o mutt/file.o mutt/hash.o \
-               mutt/header.o mutt/idna.o mutt/list.o mutt/logging.o mutt/mapping.o \
-               mutt/mbyte.o mutt/md5.o mutt/memory.o mutt/mime.o \
-               mutt/parameter.o mutt/regex.o mutt/rfc2047.o mutt/sha1.o \
-               mutt/signal.o mutt/string.o mutt/tags.o mutt/thread.o
+LIBMUTTOBJS=   mutt/base64.o mutt/buffer.o mutt/charset.o mutt/date.o \
+               mutt/envlist.o mutt/exit.o mutt/file.o mutt/hash.o \
+               mutt/idna.o mutt/list.o mutt/logging.o mutt/mapping.o \
+               mutt/mbyte.o mutt/md5.o mutt/memory.o mutt/mime.o mutt/regex.o \
+               mutt/rfc2047.o mutt/sha1.o mutt/signal.o mutt/string.o
 CLEANFILES+=   $(LIBMUTT) $(LIBMUTTOBJS)
 MUTTLIBS+=     $(LIBMUTT)
 ALLOBJS+=      $(LIBMUTTOBJS)
@@ -220,6 +228,13 @@ $(LIBMUTT): $(PWD)/mutt $(LIBMUTTOBJS)
 $(PWD)/mutt:
        $(MKDIR_P) $(PWD)/mutt
 
+# libemail
+$(LIBEMAIL): $(PWD)/email $(LIBEMAILOBJS)
+       $(AR) cr $@ $(LIBEMAILOBJS)
+       $(RANLIB) $@
+$(PWD)/email:
+       $(MKDIR_P) $(PWD)/email
+
 # libncrypt
 $(LIBNCRYPT): $(PWD)/ncrypt $(LIBNCRYPTOBJS)
        $(AR) cr $@ $(LIBNCRYPTOBJS)
@@ -262,23 +277,23 @@ git_ver.h: $(ALL_FILES)
        cmp -s git_ver.h.tmp git_ver.h || mv git_ver.h.tmp git_ver.h; \
        rm -f git_ver.h.tmp
 
-hcache/hcversion.h:    $(SRCDIR)/mutt/address.h \
-                       $(SRCDIR)/mutt/body.h \
+hcache/hcversion.h:    $(SRCDIR)/email/address.h \
+                       $(SRCDIR)/email/body.h \
+                       $(SRCDIR)/email/envelope.h \
+                       $(SRCDIR)/email/header.h \
+                       $(SRCDIR)/email/parameter.h \
                        $(SRCDIR)/mutt/buffer.h \
-                       $(SRCDIR)/mutt/envelope.h \
-                       $(SRCDIR)/mutt/header.h \
                        $(SRCDIR)/mutt/list.h \
-                       $(SRCDIR)/mutt/parameter.h \
                        $(SRCDIR)/hcache/hcachever.sh
        $(MKDIR_P) $(PWD)/hcache
        ( echo '#include "config.h"'; \
-       echo '#include "mutt/address.h"'; \
-       echo '#include "mutt/body.h"'; \
+       echo '#include "email/address.h"'; \
+       echo '#include "email/body.h"'; \
+       echo '#include "email/envelope.h"'; \
+       echo '#include "email/header.h"'; \
+       echo '#include "email/parameter.h"'; \
        echo '#include "mutt/buffer.h"'; \
-       echo '#include "mutt/envelope.h"'; \
-       echo '#include "mutt/header.h"'; \
-       echo '#include "mutt/list.h"'; \
-       echo '#include "mutt/parameter.h"';) | $(CPP) $(CFLAGS) - | \
+       echo '#include "mutt/list.h"';) | $(CPP) $(CFLAGS) - | \
        sh $(SRCDIR)/hcache/hcachever.sh hcache/hcversion.h
 
 # clean

diff --git a/addrbook.c b/addrbook.c
index 8c36653276b0a1a36dd2615da5363fb330d45996..13d2f1081e41abd959240826ff3383570c7a9e97 100644 (file)
--- a/addrbook.c
+++ b/addrbook.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "alias.h"
 #include "format_flags.h"

diff --git a/alias.c b/alias.c
index cec7005153e34ebc1e5bf72bdf5d8be2908e8b43..e75a46b3599a5af705701704daef944736096a9c 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -31,6 +31,7 @@
 #include <wchar.h>
 #include <wctype.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "alias.h"
 #include "globals.h"

diff --git a/alias.h b/alias.h
index 49f789f4ab2b60813589b8cc6df9f95cdf3da333..69e4a1b45f65bc784f0b5ca4d80a1ab32f43b718 100644 (file)
--- a/alias.h
+++ b/alias.h
@@ -25,6 +25,7 @@
 
 #include <stdbool.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 
 /**
  * struct Alias - A shortcut for an email address

diff --git a/buffy.c b/buffy.c
index 7fa162ae3db961e9a09e82cb680216a4a56d7d74..550555a89d50152cc35bf71ce9244c41e66d4303 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -30,6 +30,7 @@
 #include <sys/stat.h>
 #include <utime.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "buffy.h"
 #include "context.h"
 #include "globals.h"

diff --git a/color.c b/color.c
index defd6d1b1749e58eadd664062dccb646308eb516..12b56058971e81e0d0069c9516bddb9899ca07bc 100644 (file)
--- a/color.c
+++ b/color.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "context.h"
 #include "globals.h"

diff --git a/commands.c b/commands.c
index 9127fd1dc05ff307bda8cd90adef8aba35025197..e19db60b590525f7dbd9057ab7d155fb6eb1d7a5 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -30,6 +30,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "alias.h"

diff --git a/compose.c b/compose.c
index d7e9a618e9405139f57efb1633abe3b479cf39c7..14f53391ee5a4de8200cf674167e6c36bd0f920f 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -30,6 +30,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "alias.h"

diff --git a/copy.c b/copy.c
index 5374111e0fb5792ebdb5d65b76bd1a4b2a05f9b7..b58d39cbe7f9f1818025f0ca7df8d6f37ef34958 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -32,6 +32,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "copy.h"
 #include "context.h"

diff --git a/curs_lib.c b/curs_lib.c
index f64739c52cee18df566ca8f73ccd0ef2c9e54d8d..704afe6d05911c45bfde14044ecdf76f5a44895a 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -37,6 +37,7 @@
 #include <unistd.h>
 #include <wchar.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "context.h"
 #include "enter_state.h"

diff --git a/curs_main.c b/curs_main.c
index 07182e53c39ca3276b4e683f77b26fe7ab4242f6..4d6c910c400b1b55bf03a3769da39a8c17b9397e 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "alias.h"

diff --git a/edit.c b/edit.c
index af7db8ea430ca7a383336931e68f3fc549a239a1..ea89df9c705e1cf371e505bda2b250f2dab6ca42 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -31,6 +31,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "alias.h"
 #include "context.h"
 #include "globals.h"

diff --git a/editmsg.c b/editmsg.c
index 18c81c5679deb10fb8028f7678ca70ba3da141f6..c691ac508c806b07440b04fdf5487f2f8554a87c 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -36,6 +36,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "context.h"
 #include "copy.h"

diff --git a/mutt/address.c b/email/address.c
similarity index 99%
rename from mutt/address.c
rename to email/address.c
index 140557217fddb93ee17837b7bd19f54c458127ab..1fa0008b6530f95de508d9a2bbfe173ebd204d2e 100644 (file)
--- a/mutt/address.c
+++ b/email/address.c
@@ -31,10 +31,8 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include "mutt/mutt.h"
 #include "address.h"
-#include "idna2.h"
-#include "memory.h"
-#include "string2.h"
 
 /**
  * AddressSpecials - Characters with special meaning for email addresses

diff --git a/mutt/address.h b/email/address.h
similarity index 97%
rename from mutt/address.h
rename to email/address.h
index e6c439734ffbefddf1d77a3b8c590bc580aeb29f..2d47a6eb5b3765df3226df6c05bc1f2d50323a37 100644 (file)
--- a/mutt/address.h
+++ b/email/address.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_ADDRESS_H
-#define _MUTT_ADDRESS_H
+#ifndef _EMAIL_ADDRESS_H
+#define _EMAIL_ADDRESS_H
 
 #include <stddef.h>
 #include <stdbool.h>
@@ -84,4 +84,4 @@ void            mutt_addr_write_single(char *buf, size_t buflen, struct Address
 int             mutt_addrlist_to_intl(struct Address *a, char **err);
 int             mutt_addrlist_to_local(struct Address *a);
 
-#endif /* _MUTT_ADDRESS_H */
+#endif /* _EMAIL_ADDRESS_H */

diff --git a/mutt/attach.c b/email/attach.c
similarity index 98%
rename from mutt/attach.c
rename to email/attach.c
index 722dbc7ee91f6609d7d6828e419827de15c48f60..2e4eab4fb48e5e2bb0cc8a9ed43d6cb1f1e5af1a 100644 (file)
--- a/mutt/attach.c
+++ b/email/attach.c
@@ -28,10 +28,9 @@
  */
 
 #include "config.h"
+#include "mutt/mutt.h"
 #include "attach.h"
 #include "body.h"
-#include "file.h"
-#include "memory.h"
 
 /**
  * mutt_actx_add_attach - Add an Attachment to an Attachment Context

diff --git a/mutt/attach.h b/email/attach.h
similarity index 96%
rename from mutt/attach.h
rename to email/attach.h
index 9132ad4f1dc37e943776531fe01b8343e2b0977d..177663f4e8240e463b4d1bf999326d78e868404b 100644 (file)
--- a/mutt/attach.h
+++ b/email/attach.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_ATTACH_H
-#define _MUTT_ATTACH_H
+#ifndef _EMAIL_ATTACH_H
+#define _EMAIL_ATTACH_H
 
 #include <stdbool.h>
 #include <stdio.h>
@@ -73,4 +73,4 @@ void mutt_actx_add_fp(struct AttachCtx *actx, FILE *new_fp);
 void mutt_actx_free(struct AttachCtx **pactx);
 void mutt_actx_free_entries(struct AttachCtx *actx);
 
-#endif /* _MUTT_ATTACH_H */
+#endif /* _EMAIL_ATTACH_H */

diff --git a/mutt/body.c b/email/body.c
similarity index 95%
rename from mutt/body.c
rename to email/body.c
index ae7ddcfdb9706e13c2d4004c5941467c59d607e1..84dbabf63a44c0518adc2de5d196d6bcf4edc818 100644 (file)
--- a/mutt/body.c
+++ b/email/body.c
@@ -29,14 +29,9 @@
 #include "config.h"
 #include <stdbool.h>
 #include <unistd.h>
+#include "mutt/mutt.h"
 #include "body.h"
 #include "header.h"
-#include "logging.h"
-#include "memory.h"
-#include "mime.h"
-#include "parameter.h"
-#include "queue.h"
-#include "string2.h"
 
 /**
  * mutt_body_new - Create a new Body

diff --git a/mutt/body.h b/email/body.h
similarity index 98%
rename from mutt/body.h
rename to email/body.h
index 994b1e23e5bdd0a57919a2c027c6ac0e7e1f3957..edaf25600d7cb13cdb49763d18574a6af3a57bde 100644 (file)
--- a/mutt/body.h
+++ b/email/body.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_BODY_H
-#define _MUTT_BODY_H
+#ifndef _EMAIL_BODY_H
+#define _EMAIL_BODY_H
 
 #include <stdbool.h>
 #include <time.h>
@@ -102,4 +102,4 @@ bool         mutt_body_cmp_strict(const struct Body *b1, const struct Body *b2);
 void         mutt_body_free(struct Body **p);
 struct Body *mutt_body_new(void);
 
-#endif /* _MUTT_BODY_H */
+#endif /* _EMAIL_BODY_H */

diff --git a/mutt/content.h b/email/content.h
similarity index 95%
rename from mutt/content.h
rename to email/content.h
index b9e2644c863aab343812684ff12a5edb636bd149..2a2501f3d61324dc3523ab183ac9fd18d6c8b9c7 100644 (file)
--- a/mutt/content.h
+++ b/email/content.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_CONTENT_H
-#define _MUTT_CONTENT_H
+#ifndef _EMAIL_CONTENT_H
+#define _EMAIL_CONTENT_H
 
 #include <stdbool.h>
 
@@ -45,4 +45,4 @@ struct Content
   bool cr : 1;     /**< has CR, even when in a CRLF pair */
 };
 
-#endif /* _MUTT_CONTENT_H */
+#endif /* _EMAIL_CONTENT_H */

diff --git a/email/email.h b/email/email.h
new file mode 100644 (file)
index 0000000..7e14136
--- /dev/null
+++ b/email/email.h
@@ -0,0 +1,56 @@
+/**
+ * @file
+ * Structs that make up an email
+ *
+ * @authors
+ * Copyright (C) 2017 Richard Russon <rich@flatcap.org>
+ *
+ * @copyright
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @page mutt Structs that make up an email
+ *
+ * Structs that make up an email
+ *
+ * | File              | Description        |
+ * | :---------------- | :----------------- |
+ * | email/address.c   | @subpage address   |
+ * | email/attach.c    | @subpage attach    |
+ * | email/body.c      | @subpage body      |
+ * | email/envelope.c  | @subpage envelope  |
+ * | email/header.c    | @subpage header    |
+ * | email/parameter.c | @subpage parameter |
+ * | email/tags.c      | @subpage tags      |
+ * | email/thread.c    | @subpage thread    |
+ *
+ * @note The library is self-contained -- some files may depend on others in
+ *       the library, but none depends on source from outside.
+ */
+
+#ifndef _EMAIL_EMAIL_H
+#define _EMAIL_EMAIL_H
+
+#include "address.h"
+#include "attach.h"
+#include "body.h"
+#include "content.h"
+#include "envelope.h"
+#include "header.h"
+#include "parameter.h"
+#include "tags.h"
+#include "thread.h"
+
+#endif /* _EMAIL_EMAIL_H */

diff --git a/mutt/envelope.c b/email/envelope.c
similarity index 98%
rename from mutt/envelope.c
rename to email/envelope.c
index db732d9e5fb8a5ce6ec0eeefaf8848f868fd96cb..61b6af21574a80b725b550c38b445806cfc3908e 100644 (file)
--- a/mutt/envelope.c
+++ b/email/envelope.c
@@ -29,13 +29,9 @@
 #include "config.h"
 #include <stddef.h>
 #include <stdbool.h>
+#include "mutt/mutt.h"
 #include "envelope.h"
 #include "address.h"
-#include "buffer.h"
-#include "list.h"
-#include "memory.h"
-#include "queue.h"
-#include "string2.h"
 
 /**
  * mutt_env_new - Create a new Envelope

diff --git a/mutt/envelope.h b/email/envelope.h
similarity index 95%
rename from mutt/envelope.h
rename to email/envelope.h
index 8f998e7a377d896c19431457bb5c5d5335c55b4a..d2c61457082cc7189d8c1e974774681bbe167c36 100644 (file)
--- a/mutt/envelope.h
+++ b/email/envelope.h
@@ -20,11 +20,11 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_ENVELOPE_H
-#define _MUTT_ENVELOPE_H
+#ifndef _EMAIL_ENVELOPE_H
+#define _EMAIL_ENVELOPE_H
 
 #include <stdbool.h>
-#include "list.h"
+#include "mutt/mutt.h"
 
 /**
  * struct Envelope - The header of an email
@@ -71,4 +71,4 @@ struct Envelope *mutt_env_new(void);
 int              mutt_env_to_intl(struct Envelope *env, char **tag, char **err);
 void             mutt_env_to_local(struct Envelope *e);
 
-#endif /* _MUTT_ENVELOPE_H */
+#endif /* _EMAIL_ENVELOPE_H */

diff --git a/mutt/header.c b/email/header.c
similarity index 97%
rename from mutt/header.c
rename to email/header.c
index e9423516a441b7609abf82ca70c3928557225f87..18569be767fff263fe1cbc089d3e6c26048424de 100644 (file)
--- a/mutt/header.c
+++ b/email/header.c
@@ -28,12 +28,10 @@
 
 #include "config.h"
 #include <stdbool.h>
+#include "mutt/mutt.h"
 #include "header.h"
 #include "body.h"
 #include "envelope.h"
-#include "list.h"
-#include "memory.h"
-#include "queue.h"
 #include "tags.h"
 
 /**

diff --git a/mutt/header.h b/email/header.h
similarity index 97%
rename from mutt/header.h
rename to email/header.h
index 3f6515d3b0d7a38e551342a1b5f0a36d3f030b4a..abcc34fe9089ebf9e09a0c49b1c479acd45730e3 100644 (file)
--- a/mutt/header.h
+++ b/email/header.h
@@ -20,14 +20,14 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_HEADER_H
-#define _MUTT_HEADER_H
+#ifndef _EMAIL_HEADER_H
+#define _EMAIL_HEADER_H
 
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
-#include "list.h"
+#include "mutt/mutt.h"
 #include "tags.h"
 
 /**
@@ -121,4 +121,4 @@ bool           mutt_header_cmp_strict(const struct Header *h1, const struct Head
 void           mutt_header_free(struct Header **h);
 struct Header *mutt_header_new(void);
 
-#endif /* _MUTT_HEADER_H */
+#endif /* _EMAIL_HEADER_H */

diff --git a/mutt/parameter.c b/email/parameter.c
similarity index 98%
rename from mutt/parameter.c
rename to email/parameter.c
index 37466673eafb1276b30a584fb32ff8c48ed52437..cef8842dbed384beef8da035e7129c9986341bb8 100644 (file)
--- a/mutt/parameter.c
+++ b/email/parameter.c
@@ -29,10 +29,8 @@
 #include "config.h"
 #include <stddef.h>
 #include <stdbool.h>
+#include "mutt/mutt.h"
 #include "parameter.h"
-#include "memory.h"
-#include "queue.h"
-#include "string2.h"
 
 /**
  * mutt_param_new - Create a new Parameter

diff --git a/mutt/parameter.h b/email/parameter.h
similarity index 93%
rename from mutt/parameter.h
rename to email/parameter.h
index fd740f2b1c4bab0d52fdd6e9b6aeb6576f2b413b..90cf235c4ab998540886b20efa83f1f12a21887e 100644 (file)
--- a/mutt/parameter.h
+++ b/email/parameter.h
@@ -20,11 +20,11 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_PARAMETER_H
-#define _MUTT_PARAMETER_H
+#ifndef _EMAIL_PARAMETER_H
+#define _EMAIL_PARAMETER_H
 
 #include <stdbool.h>
-#include "queue.h"
+#include "mutt/mutt.h"
 
 /**
  * struct ParameterList - List of parameters.
@@ -49,4 +49,4 @@ char *            mutt_param_get(const struct ParameterList *p, const char *s);
 struct Parameter *mutt_param_new(void);
 void              mutt_param_set(struct ParameterList *p, const char *attribute, const char *value);
 
-#endif /* _MUTT_PARAMETER_H */
+#endif /* _EMAIL_PARAMETER_H */

diff --git a/mutt/tags.c b/email/tags.c
similarity index 98%
rename from mutt/tags.c
rename to email/tags.c
index 95665e472629b367eaf34e9fe40e56a5c15f12ff..5e258827b5912f8ed3de4d242205b567b3016424 100644 (file)
--- a/mutt/tags.c
+++ b/email/tags.c
@@ -30,11 +30,8 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <string.h>
+#include "mutt/mutt.h"
 #include "tags.h"
-#include "hash.h"
-#include "memory.h"
-#include "queue.h"
-#include "string2.h"
 
 char *HiddenTags; /**< Config: Private tags which should not be displayed */
 struct Hash *TagTransforms; /**< Lookup table of alternative tag names */

diff --git a/mutt/tags.h b/email/tags.h
similarity index 94%
rename from mutt/tags.h
rename to email/tags.h
index a0429c765f25b472278355e83b850c2bd28860db..df20db920657e217208d7c1d2961c516ac8c23f6 100644 (file)
--- a/mutt/tags.h
+++ b/email/tags.h
@@ -20,11 +20,11 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_TAG_H
-#define _MUTT_TAG_H
+#ifndef _EMAIL_TAG_H
+#define _EMAIL_TAG_H
 
 #include <stdbool.h>
-#include "queue.h"
+#include "mutt/mutt.h"
 
 extern char *HiddenTags;
 extern struct Hash *TagTransforms;
@@ -51,4 +51,4 @@ char *driver_tags_get_transformed_for(char *name, struct TagHead *head);
 char *driver_tags_get_with_hidden(struct TagHead *head);
 bool  driver_tags_replace(struct TagHead *head, char *tags);
 
-#endif /* _MUTT_TAG_H */
+#endif /* _EMAIL_TAG_H */

diff --git a/mutt/thread.c b/email/thread.c
similarity index 98%
rename from mutt/thread.c
rename to email/thread.c
index 7d6d12b4f239dc43a81cbba19dab8d87277d99f1..48ea55ed1483ebadf698f83f768ce85c6f9d9063 100644 (file)
--- a/mutt/thread.c
+++ b/email/thread.c
@@ -30,13 +30,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include "mutt/mutt.h"
 #include "thread.h"
 #include "envelope.h"
 #include "header.h"
-#include "list.h"
-#include "memory.h"
-#include "queue.h"
-#include "string2.h"
 
 /**
  * is_descendant - Is one thread a descendant of another

diff --git a/mutt/thread.h b/email/thread.h
similarity index 95%
rename from mutt/thread.h
rename to email/thread.h
index f69e988f2c0e54b2fe73ba5332f54f7b57bf6cf9..b5b696c429f0b0dcc2263ce96bbe1bde614602de 100644 (file)
--- a/mutt/thread.h
+++ b/email/thread.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_THREAD_H
-#define _MUTT_THREAD_H
+#ifndef _EMAIL_THREAD_H
+#define _EMAIL_THREAD_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -57,4 +57,4 @@ void           mutt_break_thread(struct Header *hdr);
 void           thread_hash_destructor(int type, void *obj, intptr_t data);
 void           unlink_message(struct MuttThread **old, struct MuttThread *cur);
 
-#endif /* _MUTT_THREAD_H */
+#endif /* _EMAIL_THREAD_H */

diff --git a/enriched.c b/enriched.c
index 269e5e0f2578ff4dd5d331c3800f35d181db7bc9..51a35440725926857b9811d77edc661f0e16d830 100644 (file)
--- a/enriched.c
+++ b/enriched.c
@@ -31,6 +31,7 @@
 #include <wchar.h>
 #include <wctype.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt_window.h"
 #include "state.h"
 

diff --git a/flags.c b/flags.c
index 3f0a324724e41f441a743bd6049c6ff56d7a819f..ba8d6a38e2b46a2a3749411f8034fbdd343bb085 100644 (file)
--- a/flags.c
+++ b/flags.c
@@ -30,6 +30,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "context.h"
 #include "globals.h"

diff --git a/group.c b/group.c
index 931285c6aa92e0fdfde56abb8dd2cb37d7fa9252..2dcaccbd01dc6719aedbeee6c58655b440d75609 100644 (file)
--- a/group.c
+++ b/group.c
@@ -22,9 +22,10 @@
  */
 
 #include "config.h"
-#include <stdlib.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "group.h"
 #include "globals.h"
 #include "protos.h"

diff --git a/handler.c b/handler.c
index cc8467a5c71f66ba1aaafae6a66d409c91f5b540..0f2a1be4d460e5783f58c1ac54e13e3fb0398757 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -33,6 +33,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "handler.h"
 #include "copy.h"

diff --git a/hcache/hcache.c b/hcache/hcache.c
index f55917f9f2eddd8aba4b7bb5dbf2ae922cebd18b..831458eea9b03a8df4b63d8ddc46b2ff68845f86 100644 (file)
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -32,6 +32,7 @@
  */
 
 #include "config.h"
+#include "email/email.h"
 
 #if !(defined(HAVE_BDB) || defined(HAVE_GDBM) || defined(HAVE_KC) ||           \
       defined(HAVE_LMDB) || defined(HAVE_QDBM) || defined(HAVE_TC))

diff --git a/hdrline.c b/hdrline.c
index 00361bce4f4bc9d203e115f4d020d9ebcfd02f90..a6528cca8284f103c0b73f6beb66552994b023cd 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <time.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "context.h"
 #include "format_flags.h"

diff --git a/hook.c b/hook.c
index 7d1b547e2a8faa01c08204ec18e731441d3c8e9a..442d0dc0a5dd5ff51623860aaddfca24120a00bf 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "globals.h"
 #include "mailbox.h"

diff --git a/imap/command.c b/imap/command.c
index 26ee5fe4456d4d1c0c8ce5922458aa3da4227481..f849a64e6fc24e271d19294612e6cdff60a76e9c 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -39,6 +39,7 @@
 #include <time.h>
 #include "imap_private.h"
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "buffy.h"
 #include "context.h"

diff --git a/imap/imap.c b/imap/imap.c
index ce58cbda23b082e622344ac8eb9f676b7869e350..206a06819862b4cdb3c20334294f9511cf2bb5c2 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -38,6 +38,7 @@
 #include <unistd.h>
 #include "imap_private.h"
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "imap.h"

diff --git a/imap/message.c b/imap/message.c
index 4b1a55a5b4b82afe8da5d8a4fa5fb09e5b189a7e..245677299dcca704d97b3c1404fd99af3bb798d9 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -36,6 +36,7 @@
 #include <unistd.h>
 #include "imap_private.h"
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "message.h"

diff --git a/imap/message.h b/imap/message.h
index 63e17d43f17987020e50bfb7743655b2ea1c4afd..b99b2bbe9e4c35d53eabe71832f5cab56ba4deee 100644 (file)
--- a/imap/message.h
+++ b/imap/message.h
@@ -26,6 +26,7 @@
 
 #include <stdbool.h>
 #include <time.h>
+#include "email/email.h"
 
 /**
  * struct ImapHeaderData - IMAP-specific header data

diff --git a/init.c b/init.c
index ede2c24e450787692cd6565deb4124a82aecc8d7..cec49f7d54f98d9c002b67a4b5f9a30936f96b4a 100644 (file)
--- a/init.c
+++ b/init.c
@@ -35,6 +35,7 @@
 #include <unistd.h>
 #include <wchar.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "init.h"
 #include "alias.h"

diff --git a/main.c b/main.c
index 1e2a7987c537c446ee2dc7aa668b947e2b0b044d..66f14b5315fcf004de85dbc20681e69ab60e42a4 100644 (file)
--- a/main.c
+++ b/main.c
@@ -42,6 +42,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "alias.h"

diff --git a/mbox.c b/mbox.c
index 52c44e1c0ed33d7a0a412b39966b5cdd19ae03c7..7eb08a77019fa37f7e7a7ed3c9c7966f7ab6760b 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -33,6 +33,7 @@
 #include <unistd.h>
 #include <utime.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "buffy.h"
 #include "context.h"

diff --git a/menu.c b/menu.c
index 8df9329eeedb8fb9e2a08a394299d76407747898..5082fcb79512bbddf2e2693bb6754baa9e14c5c1 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <wchar.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "context.h"
 #include "globals.h"

diff --git a/mh.c b/mh.c
index 98a71321b03425dc9ed1da21fc0fd29ec8bd9340..b4400e2e31c86bc473aeccd6ea036db2a5a8149d 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -39,6 +39,7 @@
 #include <unistd.h>
 #include <utime.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "buffy.h"
 #include "context.h"

diff --git a/mutt/hash.c b/mutt/hash.c
index 2fc43b266e017a1687c11f3b7c07c18c26244cbb..4179df3f959557180cd2d72a79b66d73c02a28c9 100644 (file)
--- a/mutt/hash.c
+++ b/mutt/hash.c
@@ -28,8 +28,8 @@
  */
 
 #include "config.h"
-#include <stdbool.h>
 #include <ctype.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include "hash.h"
 #include "memory.h"

diff --git a/mutt/mutt.h b/mutt/mutt.h
index 20361571d39993b5e2f0504c9c80b5aec3c9383c..d8ddfbbd3d57cb8b93834020176c917e0f709b4b 100644 (file)
--- a/mutt/mutt.h
+++ b/mutt/mutt.h
@@ -27,19 +27,14 @@
  *
  * | File             | Description        |
  * | :--------------- | :----------------- |
- * | mutt/address.c   | @subpage address   |
- * | mutt/attach.c    | @subpage attach    |
  * | mutt/base64.c    | @subpage base64    |
- * | mutt/body.c      | @subpage base64    |
  * | mutt/buffer.c    | @subpage buffer    |
  * | mutt/charset.c   | @subpage charset   |
  * | mutt/date.c      | @subpage date      |
- * | mutt/envelope.c  | @subpage envelope  |
  * | mutt/envlist.c   | @subpage envlist   |
  * | mutt/exit.c      | @subpage exit      |
  * | mutt/file.c      | @subpage file      |
  * | mutt/hash.c      | @subpage hash      |
- * | mutt/header.c    | @subpage header    |
  * | mutt/idna.c      | @subpage idna      |
  * | mutt/list.c      | @subpage list      |
  * | mutt/logging.c   | @subpage logging   |
@@ -48,14 +43,11 @@
  * | mutt/md5.c       | @subpage md5       |
  * | mutt/memory.c    | @subpage memory    |
  * | mutt/mime.c      | @subpage mime      |
- * | mutt/parameter.c | @subpage parameter |
  * | mutt/regex.c     | @subpage regex     |
  * | mutt/rfc2047.c   | @subpage rfc2047   |
  * | mutt/sha1.c      | @subpage sha1      |
  * | mutt/signal.c    | @subpage signal    |
  * | mutt/string.c    | @subpage string    |
- * | mutt/tags.c      | @subpage tags      |
- * | mutt/thread.c    | @subpage thread    |
  *
  * @note The library is self-contained -- some files may depend on others in
  *       the library, but none depends on source from outside.
@@ -64,20 +56,14 @@
 #ifndef _MUTT_MUTT_H
 #define _MUTT_MUTT_H
 
-#include "address.h"
-#include "attach.h"
 #include "base64.h"
-#include "body.h"
 #include "buffer.h"
 #include "charset.h"
-#include "content.h"
 #include "date.h"
-#include "envelope.h"
 #include "envlist.h"
 #include "exit.h"
 #include "file.h"
 #include "hash.h"
-#include "header.h"
 #include "idna2.h"
 #include "list.h"
 #include "logging.h"
@@ -87,14 +73,11 @@
 #include "memory.h"
 #include "message.h"
 #include "mime.h"
-#include "parameter.h"
 #include "queue.h"
 #include "regex3.h"
 #include "rfc2047.h"
 #include "sha1.h"
 #include "signal2.h"
 #include "string2.h"
-#include "tags.h"
-#include "thread.h"
 
 #endif /* _MUTT_MUTT_H */

diff --git a/mutt_attach.c b/mutt_attach.c
index 57f8e36cc7a7317afd9e4908f45b3a07250d491c..40e47ca3c45cb256d9d64376f39a24386413013e 100644 (file)
--- a/mutt_attach.c
+++ b/mutt_attach.c
@@ -32,6 +32,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "context.h"
 #include "copy.h"

diff --git a/mutt_body.c b/mutt_body.c
index f3a5cd7b5e3ae6f5d8a8f0c2a57f6046441d5d82..0ea066178b4f767c4f2b8c7bcd29466146af490d 100644 (file)
--- a/mutt_body.c
+++ b/mutt_body.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "protos.h"
 
 /**

diff --git a/mutt_header.c b/mutt_header.c
index 06b9bc989672c3520bc29db4b42f3560968ccb8d..3abbf0af37773786a0880359dbb96a5f6bdd7cd9 100644 (file)
--- a/mutt_header.c
+++ b/mutt_header.c
@@ -28,6 +28,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "alias.h"
 #include "context.h"

diff --git a/mutt_lua.c b/mutt_lua.c
index a551145c666f35c91c320980e0dd8929f72b1a15..aca54f2510559fcf43b0069e9b70207f53b7910d 100644 (file)
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -29,6 +29,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "mutt_lua.h"
 #include "mailbox.h"

diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index c3cd90dd8b93af8b3752d47af31ebcad479bae58..2e31493fb316db1dc6b0d8b7956b28cc89499c20 100644 (file)
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -47,6 +47,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "mutt_notmuch.h"
 #include "buffy.h"

diff --git a/mutt_thread.c b/mutt_thread.c
index 8f00393006326f178a4b7d6b91232399c7219e49..756dc729338777797b9ed87f6fbbbdf9efebaca9 100644 (file)
--- a/mutt_thread.c
+++ b/mutt_thread.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <time.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "mutt_thread.h"
 #include "context.h"

diff --git a/muttlib.c b/muttlib.c
index 39cbcd167f22bc12c33f373402459ed34831bd56..d9f2b4e1d94370f74d675b779c532c92711ecb8f 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -36,6 +36,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "alias.h"

diff --git a/mx.c b/mx.c
index 8986fbc139463cc934ec26cd8f281fd689f04657..e3b45cf81c17dc2352f570c051b4ed3f97761fea 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -38,6 +38,7 @@
 #include <unistd.h>
 #include <utime.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "mx.h"
 #include "buffy.h"

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index 5d18f727c9dc0b35a771ebf0abcdcc3d44fc2f80..701cb00f8b23899df4abc59686077ba4b9bc59f5 100644 (file)
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -39,6 +39,7 @@
 #include <string.h>
 #include <time.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "alias.h"
 #include "context.h"

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 29c107f55a99881baa985b504d148dded3ec75cb..9b03803a982751c40bf04e597e3d0d8b03a28642 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -49,6 +49,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "alias.h"
 #include "crypt.h"

diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 9bf889e92e8a97b56e1872a92e841fc9b5bacd19..4e27bd077011c64aa5f8375f8010c9ae92b923b5 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -42,6 +42,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "pgp.h"
 #include "crypt.h"

diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c
index 23fbc02f0adc368b06f8fa9e6de6def4df79cad6..8fb36d9fdb181a5eadd852627a628356ba25cac2 100644 (file)
--- a/ncrypt/pgpinvoke.c
+++ b/ncrypt/pgpinvoke.c
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"

diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index 65445f00215edcdbf5732264d74ee7ed8f6b2c06..046d2df5de25b21a28626d02416c1fe5920b65db 100644 (file)
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -39,6 +39,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "pgpkey.h"
 #include "crypt.h"

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index f4fe7de2cb82d930d5b01197e091072b648c4d1b..d199ed6a6e97c80b8071cec67ec700216e4e3faa 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -36,6 +36,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "smime.h"
 #include "alias.h"

diff --git a/nntp.c b/nntp.c
index d76bd126584678631347c816e7176c0a9d7e2c74..a377c94712b42567e4d733c4221b7d4cad4fedca 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -36,6 +36,7 @@
 #include <strings.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "nntp.h"

diff --git a/nntp.h b/nntp.h
index 6c4a0732b26bf9d5ac6d1369e62bf6465e595055..f314bfdacb30f06e1522e804552619264e112e89 100644 (file)
--- a/nntp.h
+++ b/nntp.h
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>
+#include "email/email.h"
 #include "format_flags.h"
 #include "mx.h"
 #ifdef USE_HCACHE

diff --git a/pager.c b/pager.c
index caea8024be81345414b29fbda9611f8afa8034d4..5847cd3ea574e327ef7c7254bca32b4439128182 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -32,6 +32,7 @@
 #include <unistd.h>
 #include <wchar.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "pager.h"
 #include "alias.h"

diff --git a/parse.c b/parse.c
index 00f660d1b3bd32db2b1af69094f7dbbf3129af17..e39a20fa07e23cf1aa9e4f02107d5250d1dfca45 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <time.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "globals.h"
 #include "mailbox.h"

diff --git a/pattern.c b/pattern.c
index 08b5100d1264016289c84c36a89fde06d28b4168..154fe34d33bf25c3082d9fd8812757bb3d75794d 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -32,6 +32,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "pattern.h"

diff --git a/po/POTFILES.in b/po/POTFILES.in
index ec271c3230d5ed69b052c233b737ab840d54347c..a303a8eff35d9975ea526797a2e3a4bbadd18272 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,6 +22,14 @@ curs_lib.c
 curs_main.c
 edit.c
 editmsg.c
+email/address.c
+email/attach.c
+email/body.c
+email/envelope.c
+email/header.c
+email/parameter.c
+email/tags.c
+email/thread.c
 enriched.c
 enter.c
 filter.c
@@ -59,19 +67,14 @@ main.c
 mbox.c
 menu.c
 mh.c
-mutt/address.c
-mutt/attach.c
 mutt/base64.c
-mutt/body.c
 mutt/buffer.c
 mutt/charset.c
 mutt/date.c
-mutt/envelope.c
 mutt/envlist.c
 mutt/exit.c
 mutt/file.c
 mutt/hash.c
-mutt/header.c
 mutt/idna.c
 mutt/list.c
 mutt/logging.c
@@ -80,14 +83,12 @@ mutt/mbyte.c
 mutt/md5.c
 mutt/memory.c
 mutt/mime.c
-mutt/parameter.c
 mutt/regex.c
 mutt/rfc2047.c
 mutt/sha1.c
 mutt/signal.c
 mutt/string.c
-mutt/tags.c
-mutt/thread.c
+muttlib.c
 mutt_account.c
 mutt_attach.c
 mutt_body.c
@@ -99,16 +100,15 @@ mutt_signal.c
 mutt_socket.c
 mutt_thread.c
 mutt_window.c
-muttlib.c
 mx.c
 ncrypt/crypt.c
+ncrypt/cryptglue.c
 ncrypt/crypt_gpgme.c
 ncrypt/crypt_mod.c
 ncrypt/crypt_mod_pgp_classic.c
 ncrypt/crypt_mod_pgp_gpgme.c
 ncrypt/crypt_mod_smime_classic.c
 ncrypt/crypt_mod_smime_gpgme.c
-ncrypt/cryptglue.c
 ncrypt/gnupgparse.c
 ncrypt/pgp.c
 ncrypt/pgpinvoke.c

diff --git a/pop.c b/pop.c
index 74d16f601f56a22f315c2192d4e6bc1c9b10d106..8ed92d851b0e7a77e3c83635c7ee352d3be25147 100644 (file)
--- a/pop.c
+++ b/pop.c
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "pop.h"

diff --git a/pop_auth.c b/pop_auth.c
index 7f79543e01a5ca0d02c5e298781542ede3a3315a..0f43fb519ff8816c6db04e4d63caadffaa5495d3 100644 (file)
--- a/pop_auth.c
+++ b/pop_auth.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "globals.h"
 #include "mutt_account.h"

diff --git a/pop_lib.c b/pop_lib.c
index 455b1edaa05fcb774842ccdd082ce403d2d7e569..bfa07fffcb8a1c81aeee157c3afbb656f3e9f648 100644 (file)
--- a/pop_lib.c
+++ b/pop_lib.c
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "context.h"

diff --git a/postpone.c b/postpone.c
index 47c826a08cf4dbacabf09c558ea79d52a527bb77..7e4d748a433f5938a231d69897241c1005ba450f 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -36,6 +36,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "context.h"

diff --git a/query.c b/query.c
index d874ff0fe96d4ce2f76b3d5ac9f875b213dc8b8c..d4e19c63ba217d2638e62f7aa3b33b1197768df6 100644 (file)
--- a/query.c
+++ b/query.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "alias.h"
 #include "filter.h"

diff --git a/recvattach.c b/recvattach.c
index 5e0087872eb9a73bcfc1229361f6ef9710a8d495..67c6f90d2451058f039cd62e3fab99938f5c1491 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -29,6 +29,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "context.h"
 #include "filter.h"

diff --git a/recvcmd.c b/recvcmd.c
index f7d11485393cb6552de88e1f1161af6f1a849838..5a079afc18d21cf3459a70aa98f234fcafa6d206 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "alias.h"
 #include "copy.h"

diff --git a/remailer.c b/remailer.c
index a03d26b8bb27cdabbe8e390c97ed84a14807d57f..5f6a174655b88cc2b572632e0e29fe3339d86c90 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "remailer.h"
 #include "filter.h"

diff --git a/rfc1524.c b/rfc1524.c
index 20b977b76fdeb918e45161539299f8a425592663..7bd45de8b286e4bea4be95c91fe2fe7d73d938ae 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -38,6 +38,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "rfc1524.h"
 #include "globals.h"

diff --git a/rfc2047.c b/rfc2047.c
index 1cb2c7866266aea907d0cb8a1fc1672a23ab6b19..b20538da214ffd651a88f8044aaf3d0c245da5a2 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -23,6 +23,7 @@
 
 #include "config.h"
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "globals.h"
 
 #include <string.h>

diff --git a/rfc2231.c b/rfc2231.c
index b3411958da21ef7711fcfcfeec4ece93bf32f57c..4ed3f8889e0e84fe5222065c162ec9448f8924c5 100644 (file)
--- a/rfc2231.c
+++ b/rfc2231.c
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "rfc2231.h"
 #include "globals.h"
 #include "options.h"

diff --git a/rfc3676.c b/rfc3676.c
index 36cad7371fcbd7d054fe37c3b40be74d220cd74a..365ed4a54022312b540e5a00f46e30580099aaa8 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "globals.h"
 #include "mutt_window.h"
 #include "options.h"

diff --git a/safe_asprintf.c b/safe_asprintf.c
index ee5bcbb9b53e4d6862105e6b6851bf3b07cccf90..b5acb8754b175a4bd7566a487509a6e23e2c1ad9 100644 (file)
--- a/safe_asprintf.c
+++ b/safe_asprintf.c
@@ -30,8 +30,8 @@
  * version using it.
  */
 
-#include <stdarg.h>
 #include "config.h"
+#include <stdarg.h>
 #include "mutt/mutt.h"
 
 #ifdef HAVE_VASPRINTF

diff --git a/score.c b/score.c
index 3072a1e2f3abfbb9bb2d3cd71ee45f937bab87ea..08857575472ebea0e056851a800d286aafdec5e7 100644 (file)
--- a/score.c
+++ b/score.c
@@ -24,6 +24,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "context.h"
 #include "globals.h"

diff --git a/send.c b/send.c
index a7b0693aa752983651a66b28c4315dc480e6c24f..5c3e61a33a10f4b3862b4f5144fb12a3f25b9ef7 100644 (file)
--- a/send.c
+++ b/send.c
@@ -32,6 +32,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "alias.h"
 #include "context.h"

diff --git a/sendlib.c b/sendlib.c
index 97c39c8a183555902e0d8362ffe16e1d99984019..23a3e5d57905d6a5ec65f7181aa5dd7543c001e3 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -36,6 +36,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "buffy.h"
 #include "context.h"

diff --git a/smtp.c b/smtp.c
index db484cd85dd827338f51ce75431b974d5bca9347..fc72ecaedc291fa539d0c495059df0867e92ec97 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -32,6 +32,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "globals.h"

diff --git a/sort.c b/sort.c
index 9e6c773f08a0e955972d7fc98cdfe4d1373c424c..825d1823dacf81cc9ec8bda8ec91ee4e696fe4e0 100644 (file)
--- a/sort.c
+++ b/sort.c
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "sort.h"
 #include "context.h"
 #include "globals.h"

diff --git a/sort.h b/sort.h
index d2c4b9094bf6cbab60f9a3f3874a4fe73d04f1f4..393a9eba0b14f750e071fb3d30fb752d77f57ae8 100644 (file)
--- a/sort.h
+++ b/sort.h
@@ -23,8 +23,9 @@
 #ifndef _MUTT_SORT_H
 #define _MUTT_SORT_H
 
-#include "where.h"
 #include "mutt/mutt.h"
+#include "email/email.h"
+#include "where.h"
 
 struct Context;
 

diff --git a/url.c b/url.c
index 1b443da771de8c754ccf829fe10261352ac064a5..52a79a432c44a56bfa10c35be7065580bfdb260e 100644 (file)
--- a/url.c
+++ b/url.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 #include "mutt.h"
 #include "url.h"
 #include "globals.h"

diff --git a/url.h b/url.h
index 3c43bcd5a38d18cb1762143413e99e177adf021f..b3312270a727caafc72ee79b05e0a0b5ba2224d8 100644 (file)
--- a/url.h
+++ b/url.h
@@ -23,6 +23,7 @@
 
 #include <stddef.h>
 #include "mutt/mutt.h"
+#include "email/email.h"
 
 /**
  * enum UrlScheme - All recognised Url types