From ee1d4d931ca3ebec494694b74a1868a7a2e631e3 Mon Sep 17 00:00:00 2001 From: pdmef Date: Wed, 6 Apr 2005 09:58:22 +0000 Subject: [PATCH] Rocco Rutte: re-order code for internal mailbox api (actual usage still to come) git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@251 e385b8ad-14ed-0310-8656-cc95a2468c6d --- Makefile.am | 4 +-- TODO.mutt-ng | 7 +++- attach.c | 1 - browser.c | 1 - buffy.c | 2 +- commands.c | 1 - complete.c | 2 +- compose.c | 1 - compress.c | 1 - copy.c | 1 - curs_main.c | 1 - editmsg.c | 1 - hook.c | 2 +- imap/imap.c | 1 - imap/imap.h | 2 +- init.c | 1 - mailbox.h | 74 ----------------------------------------- main.c | 1 - mbox.c | 15 ++++++--- mbox.h | 37 +++++++++++++++++++++ mh.c | 3 +- mh.h | 38 +++++++++++++++++++++ muttlib.c | 1 - mx.c | 14 ++------ mx.h | 92 +++++++++++++++++++++++++++++++++------------------ nntp/newsrc.c | 1 - nntp/nntp.c | 1 - nntp/nntp.h | 2 +- parse.c | 2 +- pattern.c | 2 +- pop/pop.h | 2 +- postpone.c | 1 - recvattach.c | 1 - recvcmd.c | 1 - send.c | 1 - sendlib.c | 1 - 36 files changed, 165 insertions(+), 154 deletions(-) delete mode 100644 mailbox.h create mode 100644 mbox.h create mode 100644 mh.h diff --git a/Makefile.am b/Makefile.am index bf0b1ea..d601829 100644 --- a/Makefile.am +++ b/Makefile.am @@ -80,9 +80,9 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ compress.h \ attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \ globals.h hash.h history.h init.h keymap.h mutt_crypt.h \ - mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \ + mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \ mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \ - mx.h pager.h pgp.h protos.h reldate.h rfc1524.h rfc2047.h \ + mbox.h mh.h mx.h pager.h pgp.h protos.h reldate.h rfc1524.h rfc2047.h \ rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare \ _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \ mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \ diff --git a/TODO.mutt-ng b/TODO.mutt-ng index 9525aa1..271af33 100644 --- a/TODO.mutt-ng +++ b/TODO.mutt-ng @@ -13,7 +13,12 @@ Here's a list of all mutt-ng specific TODOs (not in priority order): - Stop making up names of global functions with mutt_*; give meaningful names and declare them in the right headers to eventually obsolote - protos.h + protos.h. This counts for data typedef's, too! Write one header and + one source file per datatype, do proper information hiding and thus + provide sane internal abstraction to get "future ready." For example, + for all the mailbox handling, the mbox_*/mmdf_* and mh_*/maildir_* + functions should only be called directly in the right abstraction + layer's implementation. And so forth. - Convert all the names in manual.sgml.head/tail diff --git a/attach.c b/attach.c index 146c938..b14ee86 100644 --- a/attach.c +++ b/attach.c @@ -19,7 +19,6 @@ #include "rfc1524.h" #include "mime.h" #include "pager.h" -#include "mailbox.h" #include "copy.h" #include "mx.h" #include "mutt_crypt.h" diff --git a/browser.c b/browser.c index f509f02..2046a37 100644 --- a/browser.c +++ b/browser.c @@ -17,7 +17,6 @@ #include "buffy.h" #include "mapping.h" #include "sort.h" -#include "mailbox.h" #include "browser.h" #ifdef USE_IMAP #include "imap.h" diff --git a/buffy.c b/buffy.c index 9c861b0..335f0ef 100644 --- a/buffy.c +++ b/buffy.c @@ -16,8 +16,8 @@ #include "mutt.h" #include "buffy.h" -#include "mailbox.h" #include "mx.h" +#include "mh.h" #include "sidebar.h" #include "mutt_curses.h" diff --git a/commands.c b/commands.c index 6bef579..9167a7e 100644 --- a/commands.c +++ b/commands.c @@ -17,7 +17,6 @@ #include "mutt_menu.h" #include "mime.h" #include "sort.h" -#include "mailbox.h" #include "copy.h" #include "mx.h" #include "pager.h" diff --git a/complete.c b/complete.c index f26691e..b84d0b1 100644 --- a/complete.c +++ b/complete.c @@ -13,7 +13,7 @@ #include "mutt.h" #ifdef USE_IMAP -#include "mailbox.h" +#include "mx.h" #include "imap.h" #endif #ifdef USE_NNTP diff --git a/compose.c b/compose.c index a511eb4..d4d3403 100644 --- a/compose.c +++ b/compose.c @@ -23,7 +23,6 @@ #include "mime.h" #include "attach.h" #include "mapping.h" -#include "mailbox.h" #include "sort.h" #include "charset.h" #include "mx.h" diff --git a/compress.c b/compress.c index c3ddf2d..1897254 100644 --- a/compress.c +++ b/compress.c @@ -12,7 +12,6 @@ #ifdef USE_COMPRESSED #include "mx.h" -#include "mailbox.h" #include "mutt_curses.h" #include "lib/mem.h" diff --git a/copy.c b/copy.c index beb0d59..63de716 100644 --- a/copy.c +++ b/copy.c @@ -12,7 +12,6 @@ #endif #include "mutt.h" -#include "mailbox.h" #include "mx.h" #include "copy.h" #include "rfc2047.h" diff --git a/curs_main.c b/curs_main.c index 1f8e57d..974aa16 100644 --- a/curs_main.c +++ b/curs_main.c @@ -18,7 +18,6 @@ #include "mutt_curses.h" #include "mx.h" #include "mutt_menu.h" -#include "mailbox.h" #include "mapping.h" #include "sort.h" #include "buffy.h" diff --git a/editmsg.c b/editmsg.c index 287c72c..8f2a9fa 100644 --- a/editmsg.c +++ b/editmsg.c @@ -15,7 +15,6 @@ #include "mutt.h" #include "copy.h" -#include "mailbox.h" #include "mx.h" #include "lib/intl.h" diff --git a/hook.c b/hook.c index 19b2e68..d574bc6 100644 --- a/hook.c +++ b/hook.c @@ -12,7 +12,7 @@ #endif #include "mutt.h" -#include "mailbox.h" +#include "mx.h" #include "mutt_crypt.h" #ifdef USE_COMPRESSED diff --git a/imap/imap.c b/imap/imap.c index 9047114..621d940 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -18,7 +18,6 @@ #include "mutt.h" #include "mutt_curses.h" #include "mx.h" -#include "mailbox.h" #include "globals.h" #include "sort.h" #include "browser.h" diff --git a/imap/imap.h b/imap/imap.h index acf572e..c5cdf4b 100644 --- a/imap/imap.h +++ b/imap/imap.h @@ -13,7 +13,7 @@ #include "account.h" #include "browser.h" -#include "mailbox.h" +#include "mx.h" /* -- data structures -- */ typedef struct { diff --git a/init.c b/init.c index 3573ff9..37f8781 100644 --- a/init.c +++ b/init.c @@ -27,7 +27,6 @@ #include "mx.h" #include "init.h" -#include "mailbox.h" #include "lib/mem.h" #include "lib/intl.h" diff --git a/mailbox.h b/mailbox.h deleted file mode 100644 index b61e45a..0000000 --- a/mailbox.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright notice from original mutt: - * Copyright (C) 1996-2002 Michael R. Elkins - * - * 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. - */ - -#ifndef _MAILBOX_H -#define _MAILBOX_H - -/* flags for mutt_open_mailbox() */ -#define M_NOSORT (1<<0) /* do not sort the mailbox after opening it */ -#define M_APPEND (1<<1) /* open mailbox for appending messages */ -#define M_READONLY (1<<2) /* open in read-only mode */ -#define M_QUIET (1<<3) /* do not print any messages */ -#define M_NEWFOLDER (1<<4) /* create a new folder - same as M_APPEND, but uses - * safe_fopen() for mbox-style folders. - */ - -/* mx_open_new_message() */ -#define M_ADD_FROM 1 /* add a From_ line */ - -/* return values from mx_check_mailbox() */ -enum { - M_NEW_MAIL = 1, /* new mail received in mailbox */ - M_LOCKED, /* couldn't lock the mailbox */ - M_REOPENED, /* mailbox was reopened */ - M_FLAGS /* nondestructive flags change (IMAP) */ -}; - -typedef struct { - FILE *fp; /* pointer to the message data */ - char *path; /* path to temp file */ - short magic; /* type of mailbox this message belongs to */ - short write; /* nonzero if message is open for writing */ - struct { - unsigned read:1; - unsigned flagged:1; - unsigned replied:1; - } flags; - time_t received; /* the time at which this message was received */ -} MESSAGE; - -CONTEXT *mx_open_mailbox (const char *, int, CONTEXT *); - -MESSAGE *mx_open_message (CONTEXT *, int); -MESSAGE *mx_open_new_message (CONTEXT *, HEADER *, int); - -void mx_fastclose_mailbox (CONTEXT *); - -int mx_close_mailbox (CONTEXT *, int *); -int mx_sync_mailbox (CONTEXT *, int *); -int mx_commit_message (MESSAGE *, CONTEXT *); -int mx_close_message (MESSAGE **); -int mx_get_magic (const char *); -int mx_set_magic (const char *); -int mx_check_mailbox (CONTEXT *, int *, int); - -#ifdef USE_IMAP -int mx_is_imap (const char *); -#endif -#ifdef USE_POP -int mx_is_pop (const char *); -#endif -#ifdef USE_NNTP -int mx_is_nntp (const char *); -#endif - -int mx_access (const char *, int); -int mx_check_empty (const char *); - -#endif diff --git a/main.c b/main.c index 1ee36df..d920c61 100644 --- a/main.c +++ b/main.c @@ -22,7 +22,6 @@ #include "mutt.h" #include "mutt_curses.h" #include "keymap.h" -#include "mailbox.h" #include "url.h" #include "mutt_crypt.h" #include "mutt_idna.h" diff --git a/mbox.c b/mbox.c index e973d3b..59c71cf 100644 --- a/mbox.c +++ b/mbox.c @@ -14,8 +14,8 @@ #endif #include "mutt.h" -#include "mailbox.h" #include "mx.h" +#include "mbox.h" #include "sort.h" #include "copy.h" @@ -45,6 +45,13 @@ struct m_update_t { long length; }; + +int mbox_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr) +{ + msg->fp = dest->fp; + return 0; +} + /* parameters: * ctx - context to lock * excl - exclusive lock? @@ -601,7 +608,7 @@ int mbox_check_mailbox (CONTEXT * ctx, int *index_hint) } if (modified) { - if (mutt_reopen_mailbox (ctx, index_hint) != -1) { + if (mbox_reopen_mailbox (ctx, index_hint) != -1) { if (unlock) { mbox_unlock_mailbox (ctx); mutt_unblock_signals (); @@ -972,7 +979,7 @@ int mbox_close_mailbox (CONTEXT * ctx) return 0; } -int mutt_reopen_mailbox (CONTEXT * ctx, int *index_hint) +int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint) { int (*cmp_headers) (const HEADER *, const HEADER *) = NULL; HEADER **old_hdrs; @@ -1035,7 +1042,7 @@ int mutt_reopen_mailbox (CONTEXT * ctx, int *index_hint) case M_MBOX: case M_MMDF: if (fseek (ctx->fp, 0, SEEK_SET) != 0) { - dprint (1, (debugfile, "mutt_reopen_mailbox: fseek() failed\n")); + dprint (1, (debugfile, "mbox_reopen_mailbox: fseek() failed\n")); rc = -1; } else { diff --git a/mbox.h b/mbox.h new file mode 100644 index 0000000..031e54a --- /dev/null +++ b/mbox.h @@ -0,0 +1,37 @@ +/* + * Copyright notice from original mutt: + * Copyright (C) 1996-2002 Michael R. Elkins + * Copyright (C) 1999-2002 Thomas Roessler + * + * 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. + */ + +/* + * functions for dealing with mbox/mmdf style mailboxes + */ + +#ifndef _MBOX_H +#define _MBOX_H + +#include "mx.h" + +#define MMDF_SEP "\001\001\001\001\n" + +int mbox_sync_mailbox (CONTEXT *, int *); +int mbox_open_mailbox (CONTEXT *); +int mbox_check_mailbox (CONTEXT *, int *); +int mbox_close_mailbox (CONTEXT *); +int mbox_lock_mailbox (CONTEXT *, int, int); +int mbox_parse_mailbox (CONTEXT *); +int mmdf_parse_mailbox (CONTEXT *); +void mbox_unlock_mailbox (CONTEXT *); +int mbox_check_empty (const char *); + +int mbox_strict_cmp_headers (const HEADER *, const HEADER *); +int mbox_reopen_mailbox (CONTEXT *, int *); + +int mbox_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr); + +#endif diff --git a/mh.c b/mh.c index e695a93..43e9c35 100644 --- a/mh.c +++ b/mh.c @@ -18,8 +18,9 @@ #endif #include "mutt.h" -#include "mailbox.h" #include "mx.h" +#include "mh.h" +#include "mbox.h" #include "copy.h" #include "buffy.h" #include "sort.h" diff --git a/mh.h b/mh.h new file mode 100644 index 0000000..011045e --- /dev/null +++ b/mh.h @@ -0,0 +1,38 @@ +/* + * Copyright notice from original mutt: + * Copyright (C) 1996-2002 Michael R. Elkins + * Copyright (C) 1999-2002 Thomas Roessler + * + * 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. + */ + +/* + * functions for dealing with Maildir/MH style mailboxes + */ + +#ifndef _MH_H +#define _MH_H + +#include "mx.h" + +int mh_read_dir (CONTEXT *, const char *); +int mh_sync_mailbox (CONTEXT *, int *); +int mh_check_mailbox (CONTEXT *, int *); +int mh_buffy (const char *); +int mh_check_empty (const char *); + +int maildir_read_dir (CONTEXT *); +int maildir_check_mailbox (CONTEXT *, int *); +int maildir_check_empty (const char *); + +int maildir_commit_message (CONTEXT *, MESSAGE *, HEADER *); +int mh_commit_message (CONTEXT *, MESSAGE *, HEADER *); + +int maildir_open_new_message (MESSAGE *, CONTEXT *, HEADER *); +int mh_open_new_message (MESSAGE *, CONTEXT *, HEADER *); + +FILE *maildir_open_find_message (const char *, const char *); + +#endif /* !_MH_H */ diff --git a/muttlib.c b/muttlib.c index 94c4987..ca6ddb7 100644 --- a/muttlib.c +++ b/muttlib.c @@ -15,7 +15,6 @@ #include "mutt.h" #include "mutt_curses.h" #include "mime.h" -#include "mailbox.h" #include "mx.h" #include "url.h" diff --git a/mx.c b/mx.c index cd1957a..3e61ca8 100644 --- a/mx.c +++ b/mx.c @@ -14,9 +14,10 @@ #include "mutt.h" #include "mx.h" +#include "mbox.h" +#include "mh.h" #include "rfc2047.h" #include "sort.h" -#include "mailbox.h" #include "copy.h" #include "keymap.h" #include "url.h" @@ -314,7 +315,6 @@ void mx_unlink_empty (const char *path) */ #ifdef USE_IMAP - int mx_is_imap (const char *p) { url_scheme_t scheme; @@ -331,7 +331,6 @@ int mx_is_imap (const char *p) return 0; } - #endif #ifdef USE_POP @@ -1305,15 +1304,6 @@ int mx_sync_mailbox (CONTEXT * ctx, int *index_hint) return (rc); } - -/* {maildir,mh}_open_new_message are in mh.c. */ - -int mbox_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr) -{ - msg->fp = dest->fp; - return 0; -} - #ifdef USE_IMAP int imap_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr) { diff --git a/mx.h b/mx.h index 0df652f..049434e 100644 --- a/mx.h +++ b/mx.h @@ -9,15 +9,14 @@ */ /* - * This header file contains prototypes for internal functions used by the - * generic mailbox api. None of these functions should be called directly. + * mailbox abstraction + * when adding code dealing with folders or whatever, + * please use these only */ #ifndef _MX_H #define _MX_H -#include "mailbox.h" - /* supported mailbox formats */ enum { M_MBOX = 1, @@ -38,49 +37,76 @@ enum { #endif }; -WHERE short DefaultMagic INITVAL (M_MBOX); +/* flags for mx_open_mailbox() */ +#define M_NOSORT (1<<0) /* do not sort the mailbox after opening it */ +#define M_APPEND (1<<1) /* open mailbox for appending messages */ +#define M_READONLY (1<<2) /* open in read-only mode */ +#define M_QUIET (1<<3) /* do not print any messages */ +#define M_NEWFOLDER (1<<4) /* create a new folder - same as M_APPEND, but uses + * safe_fopen() for mbox-style folders. + */ + +/* mx_open_new_message() */ +#define M_ADD_FROM 1 /* add a From_ line */ -#define MMDF_SEP "\001\001\001\001\n" #define MAXLOCKATTEMPT 5 -int mbox_sync_mailbox (CONTEXT *, int *); -int mbox_open_mailbox (CONTEXT *); -int mbox_check_mailbox (CONTEXT *, int *); -int mbox_close_mailbox (CONTEXT *); -int mbox_lock_mailbox (CONTEXT *, int, int); -int mbox_parse_mailbox (CONTEXT *); -int mmdf_parse_mailbox (CONTEXT *); -void mbox_unlock_mailbox (CONTEXT *); -int mbox_check_empty (const char *); +/* return values from mx_check_mailbox() */ +enum { + M_NEW_MAIL = 1, /* new mail received in mailbox */ + M_LOCKED, /* couldn't lock the mailbox */ + M_REOPENED, /* mailbox was reopened */ + M_FLAGS /* nondestructive flags change (IMAP) */ +}; -int mh_read_dir (CONTEXT *, const char *); -int mh_sync_mailbox (CONTEXT *, int *); -int mh_check_mailbox (CONTEXT *, int *); -int mh_buffy (const char *); -int mh_check_empty (const char *); +typedef struct { + FILE *fp; /* pointer to the message data */ + char *path; /* path to temp file */ + short magic; /* type of mailbox this message belongs to */ + short write; /* nonzero if message is open for writing */ + struct { + unsigned read:1; + unsigned flagged:1; + unsigned replied:1; + } flags; + time_t received; /* the time at which this message was received */ +} MESSAGE; -int maildir_read_dir (CONTEXT *); -int maildir_check_mailbox (CONTEXT *, int *); -int maildir_check_empty (const char *); +WHERE short DefaultMagic INITVAL (M_MBOX); -int maildir_commit_message (CONTEXT *, MESSAGE *, HEADER *); -int mh_commit_message (CONTEXT *, MESSAGE *, HEADER *); +CONTEXT *mx_open_mailbox (const char *, int, CONTEXT *); -int maildir_open_new_message (MESSAGE *, CONTEXT *, HEADER *); -int mh_open_new_message (MESSAGE *, CONTEXT *, HEADER *); +MESSAGE *mx_open_message (CONTEXT *, int); +MESSAGE *mx_open_new_message (CONTEXT *, HEADER *, int); -FILE *maildir_open_find_message (const char *, const char *); +void mx_fastclose_mailbox (CONTEXT *); -int mbox_strict_cmp_headers (const HEADER *, const HEADER *); -int mutt_reopen_mailbox (CONTEXT *, int *); +int mx_close_mailbox (CONTEXT *, int *); +int mx_sync_mailbox (CONTEXT *, int *); +int mx_commit_message (MESSAGE *, CONTEXT *); +int mx_close_message (MESSAGE **); +int mx_get_magic (const char *); +int mx_set_magic (const char *); +int mx_check_mailbox (CONTEXT *, int *, int); + +#ifdef USE_IMAP +int mx_is_imap (const char *); +#endif +#ifdef USE_POP +int mx_is_pop (const char *); +#endif +#ifdef USE_NNTP +int mx_is_nntp (const char *); +#endif + +int mx_access (const char *, int); +int mx_check_empty (const char *); void mx_alloc_memory (CONTEXT *); void mx_update_context (CONTEXT *, int); void mx_update_tables (CONTEXT *, int); - int mx_lock_file (const char *, int, int, int, int); int mx_unlock_file (const char *path, int fd, int dot); - -#endif +#endif /* !_MX_H */ diff --git a/nntp/newsrc.c b/nntp/newsrc.c index e20fff2..32df852 100644 --- a/nntp/newsrc.c +++ b/nntp/newsrc.c @@ -18,7 +18,6 @@ #include "sort.h" #include "mx.h" #include "mime.h" -#include "mailbox.h" #include "nntp.h" #include "rfc822.h" #include "rfc1524.h" diff --git a/nntp/nntp.c b/nntp/nntp.c index 03c57d8..1094335 100644 --- a/nntp/nntp.c +++ b/nntp/nntp.c @@ -20,7 +20,6 @@ #include "mime.h" #include "rfc1524.h" #include "rfc2047.h" -#include "mailbox.h" #include "nntp.h" #ifdef HAVE_PGP diff --git a/nntp/nntp.h b/nntp/nntp.h index f8a389f..35335cd 100644 --- a/nntp/nntp.h +++ b/nntp/nntp.h @@ -13,7 +13,7 @@ #define _NNTP_H_ 1 #include "mutt_socket.h" -#include "mailbox.h" +#include "mx.h" #include diff --git a/parse.c b/parse.c index 5abfb06..e074911 100644 --- a/parse.c +++ b/parse.c @@ -12,7 +12,7 @@ #endif #include "mutt.h" -#include "mailbox.h" +#include "mx.h" #include "mime.h" #include "rfc2047.h" #include "rfc2231.h" diff --git a/pattern.c b/pattern.c index be05a18..5e521c6 100644 --- a/pattern.c +++ b/pattern.c @@ -12,9 +12,9 @@ #endif #include "mutt.h" +#include "mx.h" #include "mapping.h" #include "keymap.h" -#include "mailbox.h" #include "copy.h" #include "lib/mem.h" diff --git a/pop/pop.h b/pop/pop.h index 5821491..48c01f1 100644 --- a/pop/pop.h +++ b/pop/pop.h @@ -10,7 +10,7 @@ #ifndef _POP_H #define _POP_H 1 -#include "mailbox.h" +#include "mx.h" #include "mutt_socket.h" #define POP_PORT 110 diff --git a/postpone.c b/postpone.c index db84a32..acaddb8 100644 --- a/postpone.c +++ b/postpone.c @@ -16,7 +16,6 @@ #include "mutt_menu.h" #include "rfc1524.h" #include "mime.h" -#include "mailbox.h" #include "mapping.h" #include "sort.h" #ifdef USE_IMAP diff --git a/recvattach.c b/recvattach.c index 53383bd..6c49fa6 100644 --- a/recvattach.c +++ b/recvattach.c @@ -17,7 +17,6 @@ #include "mutt_menu.h" #include "rfc1524.h" #include "mime.h" -#include "mailbox.h" #include "attach.h" #include "mapping.h" #include "mx.h" diff --git a/recvcmd.c b/recvcmd.c index 9c6c844..e6d54f9 100644 --- a/recvcmd.c +++ b/recvcmd.c @@ -16,7 +16,6 @@ #include "mutt_menu.h" #include "rfc1524.h" #include "mime.h" -#include "mailbox.h" #include "attach.h" #include "mapping.h" #include "mx.h" diff --git a/send.c b/send.c index 22d4c90..c9cbb3b 100644 --- a/send.c +++ b/send.c @@ -16,7 +16,6 @@ #include "rfc2047.h" #include "keymap.h" #include "mime.h" -#include "mailbox.h" #include "copy.h" #include "mx.h" #include "mutt_crypt.h" diff --git a/sendlib.c b/sendlib.c index 1290fd9..0766b2b 100644 --- a/sendlib.c +++ b/sendlib.c @@ -19,7 +19,6 @@ #include "rfc2231.h" #include "mx.h" #include "mime.h" -#include "mailbox.h" #include "copy.h" #include "pager.h" #include "charset.h" -- 2.20.1