X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=d418c388a80010b7411db351aa84d13d8ab29d26;hp=41005f255ec244eddf35bc4ad5ac8523fbe38fd3;hb=022bbfdd9d1241f2e50b1cdb5a4d3dc58aaeb8bf;hpb=3cb53df6efcb6b137bbab53c16da4eddbc5a1b2b diff --git a/mutt.h b/mutt.h index 41005f2..d418c38 100644 --- a/mutt.h +++ b/mutt.h @@ -227,18 +227,14 @@ enum { OPT_DELETE, OPT_FORWEDIT, OPT_INCLUDE, -#ifdef USE_IMAP OPT_IMAPRECONNECT, -#endif OPT_MFUPTO, OPT_MIMEFWD, OPT_MIMEFWDREST, OPT_MOVE, OPT_PGPMIMEAUTO, /* ask to revert to PGP/MIME when inline fails */ -#ifdef USE_POP OPT_POPDELETE, OPT_POPRECONNECT, -#endif OPT_POSTPONE, OPT_PRINT, OPT_QUIT, @@ -268,10 +264,9 @@ enum { #define SENDFORWARD (1<<3) #define SENDPOSTPONED (1<<4) #define SENDBATCH (1<<5) -#define SENDMAILX (1<<6) -#define SENDKEY (1<<7) -#define SENDRESEND (1<<8) -#define SENDNEWS (1<<9) +#define SENDKEY (1<<6) +#define SENDRESEND (1<<7) +#define SENDNEWS (1<<8) /* flags to _mutt_select_file() */ #define M_SEL_BUFFY (1<<0) @@ -335,13 +330,11 @@ enum { OPTHIDETOPLIMITED, OPTHIDETOPMISSING, OPTIGNORELISTREPLYTO, -#ifdef USE_IMAP OPTIMAPCHECKSUBSCRIBED, OPTIMAPLSUB, OPTIMAPPASSIVE, OPTIMAPPEEK, OPTIMAPSERVERNOISE, -#endif #if defined(USE_SSL) || defined(USE_GNUTLS) # ifndef USE_GNUTLS OPTSSLSYSTEMCERTS, @@ -372,10 +365,8 @@ enum { OPTPAGERSTOP, OPTPIPEDECODE, OPTPIPESPLIT, -#ifdef USE_POP OPTPOPAUTHTRYALL, OPTPOPLAST, -#endif OPTPRINTDECODE, OPTPRINTSPLIT, OPTPROMPTAFTER, @@ -533,179 +524,6 @@ int mutt_matches_ignore (const char *, LIST *); void mutt_init (int, LIST *); -/* Information that helps in determing the Content-* of an attachment */ -typedef struct content { - long hibin; /* 8-bit characters */ - long lobin; /* unprintable 7-bit chars (eg., control chars) */ - long crlf; /* '\r' and '\n' characters */ - long ascii; /* number of ascii chars */ - long linemax; /* length of the longest line in the file */ - unsigned int space:1; /* whitespace at the end of lines? */ - unsigned int binary:1; /* long lines, or CR not in CRLF pair */ - unsigned int from:1; /* has a line beginning with "From "? */ - unsigned int dot:1; /* has a line consisting of a single dot? */ - unsigned int cr:1; /* has CR, even when in a CRLF pair */ -} CONTENT; - -typedef struct body { - char *xtype; /* content-type if x-unknown */ - char *subtype; /* content-type subtype */ - PARAMETER *parameter; /* parameters of the content-type */ - char *description; /* content-description */ - char *form_name; /* Content-Disposition form-data name param */ - off_t hdr_offset; /* offset in stream where the headers begin. - * this info is used when invoking metamail, - * where we need to send the headers of the - * attachment - */ - off_t offset; /* offset where the actual data begins */ - off_t length; /* length (in bytes) of attachment */ - char *filename; /* when sending a message, this is the file - * to which this structure refers - */ - char *d_filename; /* filename to be used for the - * content-disposition header. - * If NULL, filename is used - * instead. - */ - char *file_charset; /* charset of attached file */ - CONTENT *content; /* structure used to store detailed info about - * the content of the attachment. this is used - * to determine what content-transfer-encoding - * is required when sending mail. - */ - struct body *next; /* next attachment in the list */ - struct body *parts; /* parts of a multipart or message/rfc822 */ - struct header *hdr; /* header information for message/rfc822 */ - - struct attachptr *aptr; /* Menu information, used in recvattach.c */ - - signed short attach_count; - - time_t stamp; /* time stamp of last - * encoding update. - */ - - unsigned int type:4; /* content-type primary type */ - unsigned int encoding:3; /* content-transfer-encoding */ - unsigned int disposition:2; /* content-disposition */ - unsigned int use_disp:1; /* Content-Disposition uses filename= ? */ - unsigned int unlink:1; /* flag to indicate the the file named by - * "filename" should be unlink()ed before - * free()ing this structure - */ - unsigned int tagged:1; - unsigned int deleted:1; /* attachment marked for deletion */ - - unsigned int noconv:1; /* don't do character set conversion */ - unsigned int force_charset:1; - /* send mode: don't adjust the character - * set when in send-mode. - */ - unsigned int is_signed_data:1; /* A lot of MUAs don't indicate - S/MIME signed-data correctly, - e.g. they use foo.p7m even for - the name of signed data. This - flag is used to keep track of - the actual message type. It - gets set during the verification - (which is done if the encryption - try failed) and check by the - function to figure the type of - the message. */ - - unsigned int goodsig:1; /* good cryptographic signature */ - unsigned int warnsig:1; /* maybe good signature */ - unsigned int badsig:1; /* bad cryptographic signature (needed to check encrypted s/mime-signatures) */ - - unsigned int collapsed:1; /* used by recvattach */ - unsigned int attach_qualifies:1; - -} BODY; - -typedef struct header { - unsigned int security:11; /* bit 0-6: flags, bit 7,8: application. - see: crypt.h pgplib.h, smime.h */ - - unsigned int mime:1; /* has a MIME-Version header? */ - unsigned int flagged:1; /* marked important? */ - unsigned int tagged:1; - unsigned int appended:1; /* has been saved */ - unsigned int purged:1; /* bypassing the trash folder */ - unsigned int deleted:1; - unsigned int changed:1; - unsigned int attach_del:1; /* has an attachment marked for deletion */ - unsigned int old:1; - unsigned int read:1; - unsigned int expired:1; /* already expired? */ - unsigned int superseded:1; /* got superseded? */ - unsigned int replied:1; - unsigned int subject_changed:1; /* used for threading */ - unsigned int threaded:1; /* used for threading */ - unsigned int display_subject:1; /* used for threading */ - unsigned int recip_valid:1; /* is_recipient is valid */ - unsigned int active:1; /* message is not to be removed */ - unsigned int trash:1; /* message is marked as trashed on disk. - * This flag is used by the maildir_trash - * option. - */ - - /* timezone of the sender of this message */ - unsigned int zhours:5; - unsigned int zminutes:6; - unsigned int zoccident:1; - - /* bits used for caching when searching */ - unsigned int searched:1; - unsigned int matched:1; - - /* tells whether the attach count is valid */ - unsigned int attach_valid:1; - - /* the following are used to support collapsing threads */ - unsigned int collapsed:1; /* is this message part of a collapsed thread? */ - unsigned int limited:1; /* is this message in a limited view? */ - size_t num_hidden; /* number of hidden messages in this view */ - - short recipient; /* user_is_recipient()'s return value, cached */ - - int pair; /* color-pair to use when displaying in the index */ - - time_t date_sent; /* time when the message was sent (UTC) */ - time_t received; /* time when the message was placed in the mailbox */ - off_t offset; /* where in the stream does this message begin? */ - int lines; /* how many lines in the body of this message? */ - int index; /* the absolute (unsorted) message number */ - int msgno; /* number displayed to the user */ - int virtual; /* virtual message number */ - int score; - ENVELOPE *env; /* envelope information */ - BODY *content; /* list of MIME parts */ - char *path; -#ifdef USE_NNTP - int article_num; -#endif - - char *tree; /* character string to print thread tree */ - struct thread *thread; - - short attach_total; - -#ifdef MIXMASTER - LIST *chain; -#endif - -#ifdef USE_POP - int refno; /* message number on server */ -#endif - -#if defined USE_POP || defined USE_IMAP || defined USE_NNTP - void *data; /* driver-specific data */ -#endif - - char *maildir_flags; /* unknown maildir flags */ -} HEADER; - typedef struct thread { unsigned int fake_thread:1; unsigned int duplicate_thread:1; @@ -770,9 +588,7 @@ typedef struct { int appended; /* how many saved messages? */ int flagged; /* how many flagged messages */ int msgnotreadyet; /* which msg "new" in pager, -1 if none */ -#if defined USE_POP || defined USE_IMAP || defined USE_NNTP void *data; /* driver specific data */ -#endif /* USE_IMAP */ short magic; /* mailbox type */