X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=3906a331214cdb9ebf46ff99c26708bb0a92bcb0;hp=480212a9f8ef425600d2f16b34f72ac060c0d706;hb=3d5533f226da9cd9f86236c658c26be01ebf1e87;hpb=4670d23c56f21afaa7ef2e0289a47a6a0d112671

diff --git a/init.h b/init.h
index 480212a..3906a33 100644
--- a/init.h
+++ b/init.h
@@ -81,15 +81,9 @@ struct option_t {
 /* build complete documentation */
 
 #ifdef _MAKEDOC
-# ifndef USE_IMAP
-#  define USE_IMAP
-# endif
 # ifndef MIXMASTER
 #  define MIXMASTER "mixmaster"
 # endif
-# ifndef USE_POP
-#  define USE_POP
-# endif
 # ifndef USE_SSL
 #  define USE_SSL
 # endif
@@ -1015,12 +1009,8 @@ struct option_t MuttVars[] = {
    ** Remember: This option works only for mailing lists which are explicitly set in your muttngrc
    ** configuration file.
    */
-#ifdef USE_IMAP
   {"imap_authenticators", DT_STR, R_NONE, UL &ImapAuthenticators, "" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** This is a colon-delimited list of authentication methods Mutt-ng may
    ** attempt to use to log in to an IMAP server, in the order Mutt-ng should
@@ -1045,12 +1035,8 @@ struct option_t MuttVars[] = {
    ** your server on connection, and add them to the set of mailboxes
    ** it polls for new mail. See also the ``$mailboxes'' command.
    */
-  
   {"imap_delim_chars", DT_STR, R_NONE, UL &ImapDelimChars, "/."},
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** This contains the list of characters which you would like to treat
    ** as folder separators for displaying IMAP paths. In particular it
@@ -1058,9 +1044,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_headers", DT_STR, R_INDEX, UL &ImapHeaders, "" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** Mutt-ng requests these header fields in addition to the default headers
    ** (``DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE
@@ -1072,9 +1055,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_home_namespace", DT_STR, R_NONE, UL &ImapHomeNamespace, "" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** You normally want to see your personal folders alongside
    ** your \fTINBOX\fP in the IMAP browser. If you see something else, you may set
@@ -1082,9 +1062,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_keepalive", DT_NUM, R_NONE, UL &ImapKeepalive, "900" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** This variable specifies the maximum amount of time in seconds that Mutt-ng
    ** will wait before polling open IMAP connections, to prevent the server
@@ -1100,9 +1077,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_login", DT_STR, R_NONE, UL &ImapLogin, "" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** Your login name on the IMAP server.
    ** .pp
@@ -1110,9 +1084,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_list_subscribed", DT_BOOL, R_NONE, OPTIMAPLSUB, "no" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** This variable configures whether IMAP folder browsing will look for
    ** only subscribed folders or all folders.  This can be toggled in the
@@ -1127,9 +1098,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_pass", DT_STR, R_NONE, UL &ImapPass, "" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** Specifies the password for your IMAP account.  If \fIunset\fP, Mutt-ng will
    ** prompt you for your password when you invoke the fetch-mail function.
@@ -1140,9 +1108,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_passive", DT_BOOL, R_NONE, OPTIMAPPASSIVE, "yes" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** When \fIset\fP, Mutt-ng will not open new IMAP connections to check for new
    ** mail.  Mutt-ng will only check for new mail over existing IMAP
@@ -1152,9 +1117,6 @@ struct option_t MuttVars[] = {
    */
   {"imap_peek", DT_BOOL, R_NONE, OPTIMAPPEEK, "yes" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** If \fIset\fP, Mutt-ng will avoid implicitly marking your mail as read whenever
    ** you fetch a message from the server. This is generally a good thing,
@@ -1163,18 +1125,12 @@ struct option_t MuttVars[] = {
    */
   {"imap_reconnect", DT_QUAD, R_NONE, OPT_IMAPRECONNECT, "ask-yes" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** Controls whether or not Mutt-ng will try to reconnect to IMAP server when
    ** the connection is lost.
    */
   {"imap_servernoise", DT_BOOL, R_NONE, OPTIMAPSERVERNOISE, "yes" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** When \fIset\fP, Mutt-ng will display warning messages from the IMAP
    ** server as error messages. Since these messages are often
@@ -1184,16 +1140,12 @@ struct option_t MuttVars[] = {
    */
   {"imap_user", DT_STR, R_NONE, UL &ImapUser, "" },
   /*
-   ** .pp
-   ** Availability: IMAP
-   **
    ** .pp
    ** The name of the user whose mail you intend to access on the IMAP
    ** server.
    ** .pp
    ** This variable defaults to your user name on the local machine.
    */
-#endif
   {"implicit_autoview", DT_BOOL, R_NONE, OPTIMPLICITAUTOVIEW, "no" },
   /*
    ** .pp
@@ -2742,12 +2694,8 @@ struct option_t MuttVars[] = {
    ** The separator to add between messages when piping a list of tagged
    ** messages to an external Unix command.
    */
-#ifdef USE_POP
   {"pop_authenticators", DT_STR, R_NONE, UL &PopAuthenticators, "" },
   /*
-   ** .pp
-   ** Availability: POP
-   **
    ** .pp
    ** This is a colon-delimited list of authentication methods Mutt-ng may
    ** attempt to use to log in to an POP server, in the order Mutt-ng should
@@ -2762,9 +2710,6 @@ struct option_t MuttVars[] = {
    */
   {"pop_auth_try_all", DT_BOOL, R_NONE, OPTPOPAUTHTRYALL, "yes" },
   /*
-   ** .pp
-   ** Availability: POP
-   **
    ** .pp
    ** If \fIset\fP, Mutt-ng will try all available methods. When \fIunset\fP, Mutt-ng will
    ** only fall back to other authentication methods if the previous
@@ -2774,18 +2719,12 @@ struct option_t MuttVars[] = {
   {"pop_checkinterval", DT_SYN, R_NONE, UL "pop_mail_check", 0},
   {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, "60" },
   /*
-   ** .pp
-   ** Availability: POP
-   **
    ** .pp
    ** This variable configures how often (in seconds) Mutt-ng should look for
    ** new mail.
    */
   {"pop_delete", DT_QUAD, R_NONE, OPT_POPDELETE, "ask-no" },
   /*
-   ** .pp
-   ** Availability: POP
-   **
    ** .pp
    ** If \fIset\fP, Mutt-ng will delete successfully downloaded messages from the POP
    ** server when using the ``fetch-mail'' function.  When \fIunset\fP, Mutt-ng will
@@ -2793,9 +2732,6 @@ struct option_t MuttVars[] = {
    */
   {"pop_host", DT_STR, R_NONE, UL &PopHost, ""},
   /*
-   ** .pp
-   ** Availability: POP
-   **
    ** .pp
    ** The name of your POP server for the ``fetch-mail'' function.  You
    ** can also specify an alternative port, username and password, i.e.:
@@ -2808,9 +2744,6 @@ struct option_t MuttVars[] = {
    */
   {"pop_last", DT_BOOL, R_NONE, OPTPOPLAST, "no" },
   /*
-   ** .pp
-   ** Availability: POP
-   **
    ** .pp
    ** If this variable is \fIset\fP, Mutt-ng will try to use the ``\fTLAST\fP'' POP command
    ** for retrieving only unread messages from the POP server when using
@@ -2818,18 +2751,12 @@ struct option_t MuttVars[] = {
    */
   {"pop_reconnect", DT_QUAD, R_NONE, OPT_POPRECONNECT, "ask-yes" },
   /*
-   ** .pp
-   ** Availability: POP
-   **
    ** .pp
    ** Controls whether or not Mutt-ng will try to reconnect to a POP server if the
    ** connection is lost.
    */
   {"pop_user", DT_STR, R_NONE, UL &PopUser, "" },
   /*
-   ** .pp
-   ** Availability: POP
-   **
    ** .pp
    ** Your login name on the POP server.
    ** .pp
@@ -2837,9 +2764,6 @@ struct option_t MuttVars[] = {
    */
   {"pop_pass", DT_STR, R_NONE, UL &PopPass, ""},
   /*
-   ** .pp
-   ** Availability: POP
-   **
    ** .pp
    ** Specifies the password for your POP account.  If \fIunset\fP, Mutt-ng will
    ** prompt you for your password when you open POP mailbox.
@@ -2848,7 +2772,6 @@ struct option_t MuttVars[] = {
    ** presents a security risk since the superuser of your machine may read it
    ** regardless of the file's permissions.
    */
-#endif /* USE_POP */
   {"post_indent_string", DT_STR, R_NONE, UL &PostIndentString, ""},
   /*
    ** .pp
@@ -3861,15 +3784,9 @@ static const char* Features[] = {
 #ifdef USE_DOTLOCK
   "dotlock",
 #endif
-#ifdef USE_POP
-  "pop",
-#endif
 #ifdef USE_NNTP
   "nntp",
 #endif
-#ifdef USE_IMAP
-  "imap",
-#endif
 #ifdef USE_SSL
   "ssl",
 #endif