X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=init.h;h=480212a9f8ef425600d2f16b34f72ac060c0d706;hb=4670d23c56f21afaa7ef2e0289a47a6a0d112671;hp=24dec7d391a481790bffc3638de2ac1dde29f2c4;hpb=d2facf5ade8ae6d0831a2b8496b2c1017a935172;p=apps%2Fmadmutt.git diff --git a/init.h b/init.h index 24dec7d..480212a 100644 --- a/init.h +++ b/init.h @@ -63,11 +63,11 @@ #define R_RESORT_BOTH (R_RESORT|R_RESORT_SUB) struct option_t { - char *option; + const char *option; short type; short flags; unsigned long data; - char* init; + const char *init; }; #define UL (unsigned long) @@ -93,9 +93,6 @@ struct option_t { # ifndef USE_SSL # define USE_SSL # endif -# ifndef USE_SOCKET -# define USE_SOCKET -# endif # ifndef USE_LIBESMTP # define USE_LIBESMTP # endif @@ -108,9 +105,6 @@ struct option_t { # ifndef USE_DOTLOCK # define USE_DOTLOCK # endif -# ifndef DL_STANDALONE -# define DL_STANDALONE -# endif # ifndef USE_HCACHE # define USE_HCACHE # endif @@ -597,11 +591,11 @@ struct option_t MuttVars[] = { ** is viewed it is passed as standard input to $$display_filter, and the ** filtered message is read from the standard output. */ -#if defined(DL_STANDALONE) && defined(USE_DOTLOCK) +#if defined(USE_DOTLOCK) {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$muttng_bindir/muttng_dotlock"}, /* ** .pp - ** Availability: Standalone and Dotlock + ** Availability: Dotlock ** ** .pp ** Contains the path of the \fTmuttng_dotlock(1)\fP binary to be used by @@ -1333,12 +1327,12 @@ struct option_t MuttVars[] = { ** The locale used by \fTstrftime(3)\fP to format dates. Legal values are ** the strings your system accepts for the locale variable \fTLC_TIME\fP. */ - {"list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, "no" }, + {"force_list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, "ask-no" }, /* ** .pp - ** When \fIset\fP, address replies to the mailing list the original message came - ** from (instead to the author only). Setting this option to ``\fIask-yes\fP'' or - ** ``\fIask-no\fP'' will ask if you really intended to reply to the author only. + ** This variable controls what effect ordinary replies have on mailing list + ** messages: if \fIset\fP, a normal reply will be interpreted as list-reply + ** while if it's \fIunset\fP the reply functions work as usual. */ {"max_display_recips", DT_NUM, R_PAGER, UL &MaxDispRecips, "0" }, /* @@ -1529,9 +1523,20 @@ struct option_t MuttVars[] = { /* ** .pp ** \fIThis is a read-only system property and, at runtime, - ** specifies the last part of the full path or URI of the - ** folder currently open (if any), i.e. everything after - ** the last ``/''.\fP + ** specifies the actual name of the folder as far as it could + ** be detected.\fP + ** .pp + ** For detection, $$$folder is first taken into account + ** and simply stripped to form the result when a match is found. For + ** example, with $$$folder being \fTimap://host\fP and the folder is + ** \fTimap://host/INBOX/foo\fP, $$$muttng_folder_name will be just + ** \fTINBOX/foo\fP.) + ** .pp + ** Second, if the initial portion of a name is not $$$folder, + ** the result will be everything after the last ``/''. + ** .pp + ** Third and last, the result will be just the name if neither + ** $$$folder nor a ``/'' were found in the name. */ {"muttng_pwd", DT_SYS, R_NONE, 0, "" }, /* @@ -1596,6 +1601,7 @@ struct option_t MuttVars[] = { ** .dt %M .dd Total number of messages shown, i.e. not hidden by a limit. 1) ** .dt %n .dd Number of new messages. ** .dt %t .dd Number of tagged messages. 1) + ** .dt %u .dd Number of unread messages. ** .de ** .pp ** 1) These expandos only have a non-zero value for the current mailbox and @@ -1918,7 +1924,6 @@ struct option_t MuttVars[] = { ** was connection lost. */ #endif -#ifdef USE_SOCKET { "net_inc", DT_NUM, R_NONE, UL &NetInc, "10" }, /* ** .pp @@ -1928,7 +1933,6 @@ struct option_t MuttVars[] = { ** .pp ** See also ``$$read_inc'' and ``$$write_inc''. */ -#endif {"pager", DT_PATH, R_NONE, UL &Pager, "builtin"}, /* ** .pp @@ -2663,7 +2667,7 @@ struct option_t MuttVars[] = { ** The file which includes random data that is used to initialize SSL ** library functions. */ - {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "yes" }, + {"ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, "no" }, /* ** .pp ** Availability: SSL @@ -2880,7 +2884,6 @@ struct option_t MuttVars[] = { ** in the mailbox specified by this variable. Also see the ``$$postpone'' ** variable. */ -#ifdef USE_SOCKET {"preconnect", DT_STR, R_NONE, UL &Preconnect, "" }, /* ** .pp @@ -2898,7 +2901,6 @@ struct option_t MuttVars[] = { ** \fBNote:\fP For this example to work, you must be able to log in to the ** remote machine without having to enter a password. */ -#endif /* USE_SOCKET */ {"print", DT_QUAD, R_NONE, OPT_PRINT, "ask-no" }, /* ** .pp @@ -3662,7 +3664,6 @@ struct option_t MuttVars[] = { ** \fBNote\fP: When you delete a message in the trash folder, it is really ** deleted, so that there is no way to recover mail. */ -#ifdef USE_SOCKET {"tunnel", DT_STR, R_NONE, UL &Tunnel, "" }, /* ** .pp @@ -3675,7 +3676,6 @@ struct option_t MuttVars[] = { ** \fBNote:\fP For this example to work you must be able to log in to the remote ** machine without having to enter a password. */ -#endif {"umask", DT_NUM, R_NONE, UL &Umask, "0077" }, /* ** .pp @@ -3842,7 +3842,7 @@ struct option_t MuttVars[] = { */ #endif /*--*/ - { NULL } + { NULL, -1, R_NONE, -1, NULL } }; static const char* Features[] = { @@ -3861,9 +3861,6 @@ static const char* Features[] = { #ifdef USE_DOTLOCK "dotlock", #endif -#ifdef DL_STANDALONE - "standalone", -#endif #ifdef USE_POP "pop", #endif @@ -3885,18 +3882,9 @@ static const char* Features[] = { #ifdef USE_LIBESMTP "libesmtp", #endif -#ifdef USE_COMPRESSED - "compessed", -#endif #ifdef HAVE_COLOR "color", #endif -#ifdef CRYPT_BACKEND_CLASSIC_PGP - "classic_pgp", -#endif -#ifdef CRYPT_BACKEND_CLASSIC_SMIME - "class_smime", -#endif #ifdef CRYPT_BACKEND_GPGME "gpgme", #endif @@ -3956,14 +3944,14 @@ const struct mapping_t SortBrowserMethods[] = { {"date", SORT_DATE}, {"size", SORT_SIZE}, {"unsorted", SORT_ORDER}, - {NULL} + {NULL, 0} }; const struct mapping_t SortAliasMethods[] = { {"alias", SORT_ALIAS}, {"address", SORT_ADDRESS}, {"unsorted", SORT_ORDER}, - {NULL} + {NULL, 0} }; const struct mapping_t SortKeyMethods[] = { @@ -3971,7 +3959,7 @@ const struct mapping_t SortKeyMethods[] = { {"date", SORT_DATE}, {"keyid", SORT_KEYID}, {"trust", SORT_TRUST}, - {NULL} + {NULL, 0} }; @@ -4000,10 +3988,9 @@ static int parse_alternates (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unalternates (BUFFER *, BUFFER *, unsigned long, BUFFER *); struct command_t { - char *name; + const char *name; int (*func) (BUFFER *, BUFFER *, unsigned long, BUFFER *); unsigned long data; - unsigned long data1; }; struct command_t Commands[] = { @@ -4011,9 +3998,7 @@ struct command_t Commands[] = { {"attachments", parse_attachments, 0 }, {"unattachments",parse_unattachments,0 }, {"unalternates", parse_unalternates, 0}, -#ifdef USE_SOCKET {"account-hook", mutt_parse_hook, M_ACCOUNTHOOK}, -#endif {"alias", parse_alias, 0}, {"auto_view", parse_list, UL &AutoViewList}, {"alternative_order", parse_list, UL &AlternativeOrderList}, @@ -4027,11 +4012,9 @@ struct command_t Commands[] = { {"fcc-hook", mutt_parse_hook, M_FCCHOOK}, {"fcc-save-hook", mutt_parse_hook, M_FCCHOOK|M_SAVEHOOK}, {"folder-hook", mutt_parse_hook, M_FOLDERHOOK}, -#ifdef USE_COMPRESSED {"open-hook", mutt_parse_hook, M_OPENHOOK}, {"close-hook", mutt_parse_hook, M_CLOSEHOOK}, {"append-hook", mutt_parse_hook, M_APPENDHOOK}, -#endif {"hdr_order", parse_list, UL &HeaderOrderList}, {"ifdef", parse_ifdef, 1}, {"ifndef", parse_ifdef, 0}, @@ -4076,5 +4059,5 @@ struct command_t Commands[] = { {"unscore", mutt_parse_unscore, 0}, {"unset", parse_set, M_SET_UNSET}, {"unsubscribe", parse_unsubscribe, 0}, - {NULL} + {NULL, NULL, 0} };