From: Pierre Habouzit Date: Sat, 26 May 2007 12:24:43 +0000 (+0200) Subject: put every nttp setting together X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=3cff23a6fb2bdd6e49fc1d67d50e5438a9149dad;ds=sidebyside put every nttp setting together Signed-off-by: Pierre Habouzit --- diff --git a/init.h b/init.h index a69eb0b..c20fd52 100644 --- a/init.h +++ b/init.h @@ -137,17 +137,6 @@ struct option_t MuttVars[] = { ** If \fIset\fP, Madmutt will prompt you for carbon-copy (Cc) recipients before ** editing the body of an outgoing message. */ -#ifdef USE_NNTP - {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, "no" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, Madmutt will prompt you for the \fTFollowup-To:\fP header - ** field before editing the body of an outgoing news article. - */ -#endif {"attach_format", DT_STR, R_NONE, UL &AttachFormat, "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] "}, /* ** .pp @@ -249,17 +238,6 @@ struct option_t MuttVars[] = { ** follow these menus. The option is disabled by default because many ** visual terminals don't permit making the cursor invisible. */ -#ifdef USE_NNTP - {"nntp_catchup", DT_QUAD, R_NONE, OPT_CATCHUP, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If this variable is \fIset\fP, Madmutt will mark all articles in a newsgroup - ** as read when you leaving it. - */ -#endif {"check_new", DT_BOOL, R_NONE, OPTCHECKNEW, "yes" }, /* ** .pp @@ -532,19 +510,6 @@ struct option_t MuttVars[] = { ** sent to both the list and your address, resulting in two copies ** of the same email for you. */ -#ifdef USE_NNTP - {"nntp_followup_to_poster", DT_QUAD, R_NONE, OPT_FOLLOWUPTOPOSTER, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If this variable is \fIset\fP and the keyword "\fTposter\fP" is present in - ** the \fTFollowup-To:\fP header field, a follow-up to the newsgroup is not - ** permitted. The message will be mailed to the submitter of the - ** message via mail. - */ -#endif {"force_buffy_check", DT_BOOL, R_NONE, OPTFORCEBUFFYCHECK, "no" }, /* ** .pp @@ -583,30 +548,6 @@ struct option_t MuttVars[] = { ** message (when ``$$mime_forward'' is \fIunset\fP) will be quoted using ** ``$$indent_string''. */ -#ifdef USE_NNTP - {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, "%4C %M%N %5s %-45.45f %d"}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable allows you to customize the newsgroup browser display to - ** your personal taste. This string is similar to ``$index_format'', but - ** has its own set of \fTprintf(3)\fP-like sequences: - ** .pp - ** .ts - ** %C current newsgroup number - ** %d description of newsgroup (retrieved from server) - ** %f newsgroup name - ** %M ``-'' if newsgroup not allowed for direct post (moderated for example) - ** %N ``N'' if newsgroup is new, ``u'' if unsubscribed, blank otherwise - ** %n number of new articles in newsgroup - ** %s number of unread articles in newsgroup - ** %>X right justify the rest of the string and pad with character "X" - ** %|X pad to the end of the line with character "X" - ** .te - */ -#endif {"header", DT_BOOL, R_NONE, OPTHEADER, "no" }, /* ** .pp @@ -907,24 +848,6 @@ struct option_t MuttVars[] = { ** .pp ** See also: ``$$to_chars''. */ -#ifdef USE_NNTP - {"nntp_inews", DT_PATH, R_NONE, UL &Inews, ""}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, specifies the program and arguments used to deliver news posted - ** by Madmutt. Otherwise, Madmutt posts article using current connection. - ** The following \fTprintf(3)\fP-style sequence is understood: - ** .pp - ** .ts - ** %s newsserver name - ** .te - ** .pp - ** Example: \fTset inews="/usr/local/bin/inews -hS"\fP - */ -#endif {"keep_flagged", DT_BOOL, R_NONE, OPTKEEPFLAGGED, "no" }, /* ** .pp @@ -1275,120 +1198,6 @@ struct option_t MuttVars[] = { ** This variable, when \fIset\fP, makes the thread tree narrower, allowing ** deeper threads to fit on the screen. */ -#ifdef USE_NNTP - {"nntp_cache_dir", DT_PATH, R_NONE, UL &NewsCacheDir, "~/.madmutt"}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable points to directory where Madmutt will cache news - ** article headers. If \fIunset\fP, headers will not be saved at all - ** and will be reloaded each time when you enter a newsgroup. - ** .pp - ** As for the header caching in connection with IMAP and/or Maildir, - ** this drastically increases speed and lowers traffic. - */ - {"nntp_host", DT_STR, R_NONE, UL &NewsServer, "" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable specifies the name (or address) of the NNTP server to be used. - ** .pp - ** It - ** defaults to the value specified via the environment variable - ** \fT$$$NNTPSERVER\fP or contained in the file \fT/etc/nntpserver\fP. - ** .pp - ** You can also - ** specify a username and an alternative port for each newsserver, e.g. - ** .pp - ** \fT[nntp[s]://][username[:password]@]newsserver[:port]\fP - ** .pp - ** \fBNote:\fP Using a password as shown and stored in a configuration file - ** presents a security risk since the superuser of your machine may read it - ** regardless of the file's permissions. - */ - {"nntp_newsrc", DT_PATH, R_NONE, UL &NewsRc, "~/.newsrc"}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This file contains information about subscribed newsgroup and - ** articles read so far. - ** .pp - ** To ease the use of multiple news servers, the following \fTprintf(3)\fP-style - ** sequence is understood: - ** .pp - ** .ts - ** %s newsserver name - ** .te - */ - {"nntp_context", DT_NUM, R_NONE, UL &NntpContext, "1000" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable controls how many news articles to cache per newsgroup - ** (if caching is enabled, see $$nntp_cache_dir) and how many news articles - ** to show in the ``index'' menu. - ** .pp - ** If there're more articles than defined with $$nntp_context, all older ones - ** will be removed/not shown in the index. - */ - {"nntp_load_description", DT_BOOL, R_NONE, OPTLOADDESC, "yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** This variable controls whether or not descriptions for newsgroups - ** are to be loaded when subscribing to a newsgroup. - */ - {"nntp_user", DT_STR, R_NONE, UL &NntpUser, ""}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** Your login name on the NNTP server. If \fIunset\fP and the server requires - ** authentification, Madmutt will prompt you for your account name. - */ - {"nntp_pass", DT_STR, R_NONE, UL &NntpPass, ""}, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** Your password for NNTP account. - ** .pp - ** \fBNote:\fP Storing passwords in a configuration file - ** presents a security risk since the superuser of your machine may read it - ** regardless of the file's permissions. - */ - {"nntp_mail_check", DT_NUM, R_NONE, UL &NewsPollTimeout, "60" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** The time in seconds until any operations on a newsgroup except posting a new - ** article will cause a recheck for new news. If set to 0, Madmutt will - ** recheck on each operation in index (stepping, read article, etc.). - */ - {"nntp_reconnect", DT_QUAD, R_NONE, OPT_NNTPRECONNECT, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** Controls whether or not Madmutt will try to reconnect to a newsserver when the - ** was connection lost. - */ -#endif { "net_inc", DT_NUM, R_NONE, UL &NetInc, "10" }, /* ** .pp @@ -1600,21 +1409,6 @@ struct option_t MuttVars[] = { ** presents a security risk since the superuser of your machine may read it ** regardless of the file's permissions. */ -#ifdef USE_NNTP - {"nntp_post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, "ask-yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If set to \fIyes\fP, Madmutt will post articles to newsgroup that have - ** not permissions to post (e.g. moderated). - ** .pp - ** \fBNote:\fP if the newsserver - ** does not support posting to that newsgroup or a group is totally read-only, that - ** posting will not have any effect. - */ -#endif {"postpone", DT_QUAD, R_NONE, OPT_POSTPONE, "ask-yes" }, /* ** .pp @@ -1833,39 +1627,6 @@ struct option_t MuttVars[] = { ** possibly including eventual real names. When it is \fIunset\fP, Madmutt will ** override any such real names with the setting of the $realname variable. */ -#ifdef USE_NNTP - {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, "no" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** When \fIset\fP, info about unsubscribed newsgroups will be saved into the - ** ``newsrc'' file and into the news cache. - */ -#endif -#ifdef USE_NNTP - {"nntp_show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, "yes" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, the newsserver will be asked for new newsgroups on entering - ** the browser. Otherwise, it will be done only once for a newsserver. - ** Also controls whether or not the number of new articles of subscribed - ** newsgroups will be checked. - */ - {"nntp_show_only_unread", DT_BOOL, R_NONE, OPTSHOWONLYUNREAD, "no" }, - /* - ** .pp - ** Availability: NNTP - ** - ** .pp - ** If \fIset\fP, only subscribed newsgroups that contain unread articles - ** will be displayed in the newsgroup browser. - */ -#endif {"sig_dashes", DT_BOOL, R_NONE, OPTSIGDASHES, "yes" }, /* ** .pp @@ -2360,6 +2121,229 @@ struct option_t MuttVars[] = { ** $$xterm_set_titles has been \fIset\fP. This string is identical in formatting ** to the one used by ``$$status_format''. */ +#ifdef USE_NNTP + {"nntp_post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, "ask-yes" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** If set to \fIyes\fP, Madmutt will post articles to newsgroup that have + ** not permissions to post (e.g. moderated). + ** .pp + ** \fBNote:\fP if the newsserver + ** does not support posting to that newsgroup or a group is totally read-only, that + ** posting will not have any effect. + */ + {"nntp_cache_dir", DT_PATH, R_NONE, UL &NewsCacheDir, "~/.cache/madmutt/"}, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** This variable points to directory where Madmutt will cache news + ** article headers. If \fIunset\fP, headers will not be saved at all + ** and will be reloaded each time when you enter a newsgroup. + ** .pp + ** As for the header caching in connection with IMAP and/or Maildir, + ** this drastically increases speed and lowers traffic. + */ + {"nntp_host", DT_STR, R_NONE, UL &NewsServer, "" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** This variable specifies the name (or address) of the NNTP server to be used. + ** .pp + ** It + ** defaults to the value specified via the environment variable + ** \fT$$$NNTPSERVER\fP or contained in the file \fT/etc/nntpserver\fP. + ** .pp + ** You can also + ** specify a username and an alternative port for each newsserver, e.g. + ** .pp + ** \fT[nntp[s]://][username[:password]@]newsserver[:port]\fP + ** .pp + ** \fBNote:\fP Using a password as shown and stored in a configuration file + ** presents a security risk since the superuser of your machine may read it + ** regardless of the file's permissions. + */ + {"nntp_newsrc", DT_PATH, R_NONE, UL &NewsRc, "~/.cache/madmutt/newsrc"}, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** This file contains information about subscribed newsgroup and + ** articles read so far. + ** .pp + ** To ease the use of multiple news servers, the following \fTprintf(3)\fP-style + ** sequence is understood: + ** .pp + ** .ts + ** %s newsserver name + ** .te + */ + {"nntp_context", DT_NUM, R_NONE, UL &NntpContext, "1000" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** This variable controls how many news articles to cache per newsgroup + ** (if caching is enabled, see $$nntp_cache_dir) and how many news articles + ** to show in the ``index'' menu. + ** .pp + ** If there're more articles than defined with $$nntp_context, all older ones + ** will be removed/not shown in the index. + */ + {"nntp_load_description", DT_BOOL, R_NONE, OPTLOADDESC, "yes" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** This variable controls whether or not descriptions for newsgroups + ** are to be loaded when subscribing to a newsgroup. + */ + {"nntp_user", DT_STR, R_NONE, UL &NntpUser, ""}, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** Your login name on the NNTP server. If \fIunset\fP and the server requires + ** authentification, Madmutt will prompt you for your account name. + */ + {"nntp_pass", DT_STR, R_NONE, UL &NntpPass, ""}, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** Your password for NNTP account. + ** .pp + ** \fBNote:\fP Storing passwords in a configuration file + ** presents a security risk since the superuser of your machine may read it + ** regardless of the file's permissions. + */ + {"nntp_mail_check", DT_NUM, R_NONE, UL &NewsPollTimeout, "60" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** The time in seconds until any operations on a newsgroup except posting a new + ** article will cause a recheck for new news. If set to 0, Madmutt will + ** recheck on each operation in index (stepping, read article, etc.). + */ + {"nntp_reconnect", DT_QUAD, R_NONE, OPT_NNTPRECONNECT, "ask-yes" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** Controls whether or not Madmutt will try to reconnect to a newsserver when the + ** was connection lost. + */ + {"nntp_inews", DT_PATH, R_NONE, UL &Inews, ""}, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** If \fIset\fP, specifies the program and arguments used to deliver news posted + ** by Madmutt. Otherwise, Madmutt posts article using current connection. + ** The following \fTprintf(3)\fP-style sequence is understood: + ** .pp + ** .ts + ** %s newsserver name + ** .te + ** .pp + ** Example: \fTset inews="/usr/local/bin/inews -hS"\fP + */ + {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, "%4C %M%N %5s %-45.45f %d"}, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** This variable allows you to customize the newsgroup browser display to + ** your personal taste. This string is similar to ``$index_format'', but + ** has its own set of \fTprintf(3)\fP-like sequences: + ** .pp + ** .ts + ** %C current newsgroup number + ** %d description of newsgroup (retrieved from server) + ** %f newsgroup name + ** %M ``-'' if newsgroup not allowed for direct post (moderated for example) + ** %N ``N'' if newsgroup is new, ``u'' if unsubscribed, blank otherwise + ** %n number of new articles in newsgroup + ** %s number of unread articles in newsgroup + ** %>X right justify the rest of the string and pad with character "X" + ** %|X pad to the end of the line with character "X" + ** .te + */ + {"nntp_followup_to_poster", DT_QUAD, R_NONE, OPT_FOLLOWUPTOPOSTER, "ask-yes" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** If this variable is \fIset\fP and the keyword "\fTposter\fP" is present in + ** the \fTFollowup-To:\fP header field, a follow-up to the newsgroup is not + ** permitted. The message will be mailed to the submitter of the + ** message via mail. + */ + {"nntp_catchup", DT_QUAD, R_NONE, OPT_CATCHUP, "ask-yes" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** If this variable is \fIset\fP, Madmutt will mark all articles in a newsgroup + ** as read when you leaving it. + */ + {"nntp_ask_followup_to", DT_BOOL, R_NONE, OPTASKFOLLOWUP, "no" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** If \fIset\fP, Madmutt will prompt you for the \fTFollowup-To:\fP header + ** field before editing the body of an outgoing news article. + */ + {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, "no" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** When \fIset\fP, info about unsubscribed newsgroups will be saved into the + ** ``newsrc'' file and into the news cache. + */ + {"nntp_show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, "yes" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** If \fIset\fP, the newsserver will be asked for new newsgroups on entering + ** the browser. Otherwise, it will be done only once for a newsserver. + ** Also controls whether or not the number of new articles of subscribed + ** newsgroups will be checked. + */ + {"nntp_show_only_unread", DT_BOOL, R_NONE, OPTSHOWONLYUNREAD, "no" }, + /* + ** .pp + ** Availability: NNTP + ** + ** .pp + ** If \fIset\fP, only subscribed newsgroups that contain unread articles + ** will be displayed in the newsgroup browser. + */ +#endif /*--*/ { NULL, -1, R_NONE, -1, NULL } };