rename email include

diff --git a/addrbook.c b/addrbook.c
index d1d586ca4ea82c96e9147ae1bb732ca13867ce81..18e2befeb63e67d44e387064915af6899299544b 100644 (file)
--- a/addrbook.c
+++ b/addrbook.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "curs_lib.h"

diff --git a/alias.c b/alias.c
index 4f8b0f1e04cc73602981a8aa65785264d578faee..95886739a41846e0196f93b0cf8da6d338bae5f3 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -32,7 +32,7 @@
 #include <wctype.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "addrbook.h"

diff --git a/bcache.c b/bcache.c
index ec422f802d1432b252614f84791caab91483dc0f..684f9814869f12a29390e1ed6b7a96422e5f0eda 100644 (file)
--- a/bcache.c
+++ b/bcache.c
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "bcache.h"
 #include "mutt_account.h"
 #include "muttlib.h"

diff --git a/browser.c b/browser.c
index a7a97a9b8913be77c6bd9f776df81f688031831f..c41be05f35ef00f7d0388c05c7b1098f1c4af60c 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "browser.h"

diff --git a/color.c b/color.c
index 14004a3d9a70f5e0299036a6ca49063fc13f94e0..963cb2392823832d3f42689fd2c858275e7dceef 100644 (file)
--- a/color.c
+++ b/color.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "color.h"
 #include "context.h"

diff --git a/commands.c b/commands.c
index 3269eeef87f2e7fdbaa0c2236888c71ca9b864b9..f6580a17286a1985ec5444b3e1a365b9677614b8 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "alias.h"

diff --git a/compose.c b/compose.c
index adaf87b6c753ea76b45515f680e9af7542fc42c6..f4349a65277decf8bf6b3ff2c08b0bc23a97c261 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "compose.h"

diff --git a/conn/conn_raw.c b/conn/conn_raw.c
index 175b700314d99506db0caacdf99d796cbb85def3..52633da14fa06a1d35885472ea004dbccff36814 100644 (file)
--- a/conn/conn_raw.c
+++ b/conn/conn_raw.c
@@ -44,7 +44,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/connaccount.h"
 #include "conn_globals.h"
 #include "connection.h"

diff --git a/conn/ssl.c b/conn/ssl.c
index 9d336ef99d6f97647fa2748df93b17e691d5e5e1..4850729f315916cad1045ac7a5dafe2fc466fdeb 100644 (file)
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -49,7 +49,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "ssl.h"
 #include "conn_globals.h"

diff --git a/copy.c b/copy.c
index e42507e21c53f3a37468c2f0531af55d1c7e18f0..4d30d1ceadc4945251cb8d87deca50ba39c1572f 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "copy.h"
 #include "context.h"

diff --git a/curs_lib.c b/curs_lib.c
index 631209c93d347abbb919717746d2fca9618de681..e73efa990fb09da7592a95f167763f61dd06753f 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -38,7 +38,7 @@
 #include <wchar.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "curs_lib.h"
 #include "browser.h"

diff --git a/curs_main.c b/curs_main.c
index 558b9a6da7aa6020ac06d101785c75e6e7366a18..ee3b5dad8558d30f941497a848091a3dfa71c814 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "curs_main.h"

diff --git a/edit.c b/edit.c
index 83be5120efd72566b7a824ead5092276819dd5dd..0ace0b78b21f5a4ffc17163cab045a6c454bf24b 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "alias.h"
 #include "context.h"
 #include "curs_lib.h"

diff --git a/editmsg.c b/editmsg.c
index eb40bae1ce0ca283ca3918c853695e85fbd96cae..6752092bf6e3588d06dac16ef596ae2e39df6598 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "context.h"
 #include "copy.h"

diff --git a/email/email.h b/email/lib.h
similarity index 96%
rename from email/email.h
rename to email/lib.h
index 740953ee861d6c6ef48722eb71a910b857299ce2..03f17e3777f5aa5c7a06151bddc0d8411a501e25 100644 (file)
--- a/email/email.h
+++ b/email/lib.h
@@ -45,8 +45,8 @@
  * | email/url.c            | @subpage email_url       |
  */
 
-#ifndef MUTT_EMAIL_EMAIL_H
-#define MUTT_EMAIL_EMAIL_H
+#ifndef MUTT_EMAIL_LIB_H
+#define MUTT_EMAIL_LIB_H
 
 #include "address.h"
 #include "attach.h"
@@ -66,4 +66,4 @@
 #include "thread.h"
 #include "url.h"
 
-#endif /* MUTT_EMAIL_EMAIL_H */
+#endif /* MUTT_EMAIL_LIB_H */

diff --git a/enriched.c b/enriched.c
index 78ea05d03f06301af3c678b68ce349c5bf0feaaa..70c4ad7f4566a8dd70a74e465200789917dd904e 100644 (file)
--- a/enriched.c
+++ b/enriched.c
@@ -31,7 +31,7 @@
 #include <wchar.h>
 #include <wctype.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt_window.h"
 #include "state.h"
 

diff --git a/flags.c b/flags.c
index 4e9521a3b406c5d87768c28cd03e867fd2d3acc0..2e73aa8cd1d0cf59654a917e8ad80af374844f54 100644 (file)
--- a/flags.c
+++ b/flags.c
@@ -31,7 +31,7 @@
 #include <stdbool.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "context.h"
 #include "curs_lib.h"

diff --git a/group.c b/group.c
index 29c310601e077ebc118b463ec8ebea72f78f8d21..d8e243856eb68b41235051e6cabe2602a32fac7e 100644 (file)
--- a/group.c
+++ b/group.c
@@ -25,7 +25,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "group.h"
 #include "globals.h"
 #include "send.h"

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

diff --git a/hcache/hcache.c b/hcache/hcache.c
index e5f5fc41d800fe691a74a90db7bcd95972e5c338..1fedbf7559beb85c72e241008485c56045954356 100644 (file)
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -32,7 +32,7 @@
  */
 
 #include "config.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "muttlib.h"
 #include "serialize.h"
 

diff --git a/hcache/serialize.c b/hcache/serialize.c
index 34c1b77347c15f91ba5e0f61fbee57867fe28e1e..867b3eccc66a7b83a0d96a69814f365e6d3f0715 100644 (file)
--- a/hcache/serialize.c
+++ b/hcache/serialize.c
@@ -36,7 +36,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "hcache.h"
 
 /**

diff --git a/hdrline.c b/hdrline.c
index 399f3170b2859f9e902f81e858a8d569e2ff0595..3e3ba000a027370514772117adae8ab43a91375e 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -31,7 +31,7 @@
 #include <time.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "hdrline.h"
 #include "alias.h"

diff --git a/hook.c b/hook.c
index 903f7cfb03d49b1da7fe4561ad7d962250d3516e..feb8f7e291d16b6874ef6e3077476f8bb75a6058 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "hook.h"
 #include "alias.h"

diff --git a/imap/command.c b/imap/command.c
index 59b5ba23faea4e998749938b1a11044c053da327..a99d934e46de3a503e8d03552b6faf3176d4f392 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -40,7 +40,7 @@
 #include "imap_private.h"
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "context.h"

diff --git a/imap/imap.c b/imap/imap.c
index 755da095e0be78d04c2919653ef60e9809237564..20756245a262b92628fdbe628cb46663e5c1f6a5 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include "imap_private.h"
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "imap.h"

diff --git a/imap/message.c b/imap/message.c
index 050c19193809f38648ba02ab08fb306c8e395e41..8ab10b6ef07ecf58a405075b971fbaee7635c56c 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -37,7 +37,7 @@
 #include "imap_private.h"
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "message.h"

diff --git a/imap/message.h b/imap/message.h
index 48a710684dc30e4b25313ee30716791319a2ba85..76ccdd701269113c23c78e7547f884f350452313 100644 (file)
--- a/imap/message.h
+++ b/imap/message.h
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <time.h>
-#include "email/email.h"
+#include "email/lib.h"
 
 /**
  * struct ImapHeaderData - IMAP-specific header data

diff --git a/imap/util.c b/imap/util.c
index 251dc66a0757d7ea9933e09445ba08041b0ce713..4f11b7bb5ee556c3c0321557368c5bf09ad14255 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -44,7 +44,7 @@
 #include "imap_private.h"
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "bcache.h"
 #include "context.h"

diff --git a/init.c b/init.c
index 06f85377e2ae3b093dde7e06ba85df657c968dc0..9c61187713f69ca45f6b8718427ebab5f2e92d40 100644 (file)
--- a/init.c
+++ b/init.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <wchar.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "init.h"
 #include "alias.h"

diff --git a/mailbox.c b/mailbox.c
index d51994f28bf0700d483eed1a324706213b7c08f0..37be703e31d2f4b6a1a55c2bb0164a84b04f7246 100644 (file)
--- a/mailbox.c
+++ b/mailbox.c
@@ -32,7 +32,7 @@
 #include <utime.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mailbox.h"
 #include "context.h"

diff --git a/maildir/mh.c b/maildir/mh.c
index b059d8c9513be29f41ba94ba20a2bb409fdbb847..6706aabad4e8c832cba3e0082b9a9f801cd96941 100644 (file)
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -45,7 +45,7 @@
 #include <unistd.h>
 #include <utime.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "context.h"
 #include "copy.h"

diff --git a/main.c b/main.c
index 44676b764d9cebffc09d15ddef71c5f4fb0b52de..ee256bf057924715a7f0e78ac7d33f0dab256b8d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -44,7 +44,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "alias.h"

diff --git a/mbox/mbox.c b/mbox/mbox.c
index 59ae78f0e3b36f89da29023cf2ef0643ab46ba2f..99ae88751e858028b04600fda05e7204b9ed7760 100644 (file)
--- a/mbox/mbox.c
+++ b/mbox/mbox.c
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <utime.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mbox.h"
 #include "context.h"

diff --git a/menu.c b/menu.c
index 9ce5299bace9afa879f843cb8a73813a1dd66499..945b88a26e6f2f3a9d47a50bbf0a4c70bc2e03e6 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <wchar.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "menu.h"
 #include "color.h"

diff --git a/mutt_account.c b/mutt_account.c
index afa743158fc2d4bf954594cb5d3cfacbcb7ea504..7e63a602c37d98b537247eaaaffb138dcabf1918 100644 (file)
--- a/mutt_account.c
+++ b/mutt_account.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt_account.h"
 #include "curs_lib.h"

diff --git a/mutt_attach.c b/mutt_attach.c
index e270b5d01b8ec183a89a11127f9a3dc93ade4ec8..7d3183cca70c1122ca9f883e67c690fd5320fdaf 100644 (file)
--- a/mutt_attach.c
+++ b/mutt_attach.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mutt_attach.h"
 #include "context.h"

diff --git a/mutt_body.c b/mutt_body.c
index 0933931e146905d491e13883273f08821940c247..441ec324e3a1b8ef26cf86ca4434c5d237abbe3c 100644 (file)
--- a/mutt_body.c
+++ b/mutt_body.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt_attach.h"
 #include "muttlib.h"
 #include "sendlib.h"

diff --git a/mutt_header.c b/mutt_header.c
index 17134eb9db2e34c4c839f0f28c2ccdef29aab9a9..b39b64375bac42c14334b1bcddced12b3785e57c 100644 (file)
--- a/mutt_header.c
+++ b/mutt_header.c
@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "context.h"

diff --git a/mutt_lua.c b/mutt_lua.c
index 7b4a0b7467232fdd2caa4f881aab7f2d58e32223..138c7aa1a92b1a284d309b35714979333a4821c8 100644 (file)
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mutt_lua.h"
 #include "globals.h"

diff --git a/mutt_parse.c b/mutt_parse.c
index f4e83c45b36216dbc4875cc187593a14569e4a5f..f61e788c13c2204b1fc8c8bf45e24f38a5720bb8 100644 (file)
--- a/mutt_parse.c
+++ b/mutt_parse.c
@@ -25,7 +25,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mutt_parse.h"
 #include "globals.h"

diff --git a/mutt_socket.c b/mutt_socket.c
index 7fd03a1191f43e1e49f89816f2434aa538207811..94882e018ca1e782e02ca677843f6734f7224a71 100644 (file)
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt_socket.h"
 #include "hook.h"

diff --git a/mutt_thread.c b/mutt_thread.c
index 3e3eddbbdfda98ba9ffd3acb3b03451878fe308c..f9d44f4b0ec09c176efbd170babd2913059d79dc 100644 (file)
--- a/mutt_thread.c
+++ b/mutt_thread.c
@@ -28,7 +28,7 @@
 #include <time.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mutt_thread.h"
 #include "context.h"

diff --git a/mutt_url.c b/mutt_url.c
index 8ab2368e875a589542086b74174b96de8176379a..ac5138d9598416a3f52d7f5fbd5a60fd2323ef32 100644 (file)
--- a/mutt_url.c
+++ b/mutt_url.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "globals.h"
 

diff --git a/muttlib.c b/muttlib.c
index 595f832d71bc12c7707bdfd8d798ae323022ea20..9d08426533b5e9ede7ce750bc7fffcea9db9a9c5 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "muttlib.h"

diff --git a/mx.c b/mx.c
index ea01602dae2bad6efca62ab133793dcca8db3c05..41643e6f7266c422842a0e6c6b7745589680b493 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <utime.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mx.h"
 #include "alias.h"

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index 725ac6f17bbc658433170051754147b01e519f80..3b2d0452828ba3d453490ce45eecd857f70cd551 100644 (file)
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -40,7 +40,7 @@
 #include <time.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "context.h"

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index e2abd802b0995c4f72f146e2dd7c09aebe9dadec..3a59d791600c08dcfe240826f54c995abefb2908 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -50,7 +50,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "crypt.h"

diff --git a/ncrypt/gnupgparse.c b/ncrypt/gnupgparse.c
index 07ac6a2e98d8df6705e0d1330523a983e8fdb67c..9ec5090c510b8bb3b589bf6e47e84e2b5b75aa60 100644 (file)
--- a/ncrypt/gnupgparse.c
+++ b/ncrypt/gnupgparse.c
@@ -42,7 +42,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "filter.h"
 #include "globals.h"
 #include "ncrypt.h"

diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 4c7302d9941001a076b463ecdca2a86d0cbcb289..2d5ae827ef1eb0b381d7282e0fb5e8198efc96ef 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "crypt.h"
 #include "cryptglue.h"

diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c
index 1a3dbadfbadfc7d0b63fd2b19e531742fa95752a..4e0fb608adb64681386064eea061286c3660f230 100644 (file)
--- a/ncrypt/pgpinvoke.c
+++ b/ncrypt/pgpinvoke.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "filter.h"
 #include "format_flags.h"
 #include "globals.h"

diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index b950d145de46e2f995231f74ed434b22fe5ced7f..0e112c554a490f222eb57cd9b20f7351782ba37e 100644 (file)
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -39,7 +39,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "pgpkey.h"
 #include "crypt.h"

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 2265ba0243c2c04b95af101e0e43804be7be2590..34fe058451bc4b22047a23097c25dd6ea6ca71da 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -37,7 +37,7 @@
 #include <time.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "copy.h"

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 85d9d6b88674d28f1420765172c225c608bcd3f6..2f8c3b8add5aefc913b20f224dced8e84f3b4bb0 100644 (file)
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #include "nntp_private.h"
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "bcache.h"

diff --git a/nntp/nntp.c b/nntp/nntp.c
index f725b0509149c9ec0ebba4ccbf557f8cbec863fd..85909ed8c0af5cd77e4a9f8f99afd663b9518d81 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include "nntp_private.h"
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "nntp.h"

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index 63caf426dc05d520c38a0071595618a3176df103..3143a0754f6cb63a4f3b84daaca4d887f6f66e50 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -55,7 +55,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "mutt_notmuch.h"
 #include "context.h"

diff --git a/pager.c b/pager.c
index 24d01a3d014cb4d562a4d0e015fb6238c5fdb95c..3954fb30ddc8f72dddc9b2a88092b293fe1a9e98 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -33,7 +33,7 @@
 #include <wchar.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "pager.h"
 #include "alias.h"

diff --git a/pattern.c b/pattern.c
index 28992d7798ca7506ede309261a5613189071c655..1ca722f8643834775e96ffdefef023180c668605 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -33,7 +33,7 @@
 #include <time.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "pattern.h"

diff --git a/pop/pop.c b/pop/pop.c
index fcd84181ce57f148b3abf6e4cd3fe377a17e1477..3520746022af8921e3bd9eefa2c06183ad81de5a 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -39,7 +39,7 @@
 #include "pop_private.h"
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "pop.h"

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index f745cea78759c4ea476e4e8ed0ac862158e2b26c..f456821de76e0d52ad81b2f08856cc47decfd0a9 100644 (file)
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include "pop_private.h"
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 87f99a9142f22ff7266599b72bddfcf370b967c4..049af7348fd29383a52dc319b196f0152ee64c99 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -37,7 +37,7 @@
 #include "pop_private.h"
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "context.h"

diff --git a/postpone.c b/postpone.c
index 1e905a4f02b033410a54d7329518bc3c9d4f89bc..12a22db29b2e66f873725503e1aa1c9da566ac6f 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "context.h"

diff --git a/query.c b/query.c
index e42e0d2eeb6d7f78692513cf6fa82636bb4e7f44..a5f5bef3bcf6958a623d473582598b1452ffe928 100644 (file)
--- a/query.c
+++ b/query.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "curs_lib.h"

diff --git a/recvattach.c b/recvattach.c
index c901e8046b19ec22834b1b0173e52793f0266cb0..73049da25c5d10911e69429d831df697aef16cf5 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "recvattach.h"
 #include "commands.h"

diff --git a/recvcmd.c b/recvcmd.c
index 1cae040b13f4fd275cfdc4b9444250dc436b5d5b..b92559671cbfffa229896a1853d5d58a53dc257b 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "alias.h"
 #include "copy.h"

diff --git a/remailer.c b/remailer.c
index c56c03c8e2d3426c5ab980c6a97b9c801c7d8107..a2f5726a329431d0a34d7529c52016f0c0e868da 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "curs_lib.h"
 #include "filter.h"

diff --git a/rfc1524.c b/rfc1524.c
index 2ed57ec1f7969fd7696d1c472510ca2fd8cf3955..75d143a5bae0b5deefa7b13ff026077d3017b52b 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -38,7 +38,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "rfc1524.h"
 #include "globals.h"

diff --git a/rfc3676.c b/rfc3676.c
index b1917e36fa9be79b3d01eb79f50dc7ec375d1d88..e34f2930ed720137b4f812fb4abd07b203d66062 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "curs_lib.h"
 #include "globals.h"
 #include "mutt_window.h"

diff --git a/score.c b/score.c
index f70f246e57b5f2f8870c6b30c7fee9ba6c07189b..7ca3a6d79e49966bd156f86d41c2a4fc409e53c1 100644 (file)
--- a/score.c
+++ b/score.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "score.h"
 #include "context.h"

diff --git a/send.c b/send.c
index a5d3820aaf9696b1e360877eeb2bb0332b7ace31..e3526d8d70c890dfa346ef0fab88bb9009525726 100644 (file)
--- a/send.c
+++ b/send.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "send.h"
 #include "alias.h"

diff --git a/sendlib.c b/sendlib.c
index fb3769c4978e7559cde35763eb81628d9530c3fe..55e75e809e7a6b3db42658768f93b8c4a3b33bd8 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt.h"
 #include "sendlib.h"
 #include "context.h"

diff --git a/smtp.c b/smtp.c
index 11df59a684704e9071237a446efb659ad56d5d58..e5c58138cc517a2e820eb8a79a7b29e39e11589b 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "config/lib.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "globals.h"

diff --git a/sort.c b/sort.c
index 32220423353ede88d667f14f3a3e95d14ff51f9a..e677aef8944d77f5534431f54f443005b0950e7a 100644 (file)
--- a/sort.c
+++ b/sort.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "sort.h"
 #include "alias.h"
 #include "context.h"

diff --git a/version.c b/version.c
index 4ac06e2f4985d365baaa149cbf3768ff068c2cf8..081c9419417af9bff62744a6c011a53f431e709d 100644 (file)
--- a/version.c
+++ b/version.c
@@ -35,7 +35,7 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 #include "mutt/mutt.h"
-#include "email/email.h"
+#include "email/lib.h"
 #include "mutt_curses.h"
 #include "ncrypt/crypt_gpgme.h"
 #ifdef USE_INOTIFY