add support for import key from gpgme as well !

[apps/madmutt.git] / init.h

diff --git a/init.h b/init.h
index d25f618..fbae7da 100644 (file)
--- a/init.h
+++ b/init.h
@@ -29,8 +29,6 @@
 #define DT_SORT         6       /* sorting methods */
 #define DT_RX           7       /* regular expressions */
 #define DT_MAGIC        8       /* mailbox type */
-#define DT_SYN          9       /* synonym for another variable */
-#define DT_ADDR         10      /* e-mail address */
 
 #define DTYPE(x) ((x) & DT_MASK)
 
@@ -388,16 +386,6 @@ struct option_t MuttVars[] = {
    ** will be saved for later references.  Also see ``$$record'',
    ** ``$$save_name'', ``$$force_name'' and ``$fcc-hook''.
    */
-  {"crypt_use_gpgme", DT_BOOL, R_NONE, OPTCRYPTUSEGPGME, "no" },
-  /*
-   ** .pp
-   ** This variable controls the use the GPGME enabled crypto backends.
-   ** If it is \fIset\fP and Madmutt was build with gpgme support, the gpgme code for
-   ** S/MIME and PGP will be used instead of the classic code.
-   ** .pp
-   ** \fBNote\fP: You need to use this option in your \fT.madmuttrc\fP configuration
-   ** file as it won't have any effect when used interactively.
-   */
   {"crypt_autopgp", DT_BOOL, R_NONE, OPTCRYPTAUTOPGP, "yes" },
   /*
    ** .pp
@@ -667,20 +655,6 @@ struct option_t MuttVars[] = {
    ** message (when ``$$mime_forward'' is \fIunset\fP) will be quoted using
    ** ``$$indent_string''.
    */
-  {"from", DT_ADDR, R_NONE, UL &From, "" },
-  /*
-   ** .pp
-   ** This variable contains a default from address.  It
-   ** can be overridden using my_hdr (including from send-hooks) and
-   ** ``$$reverse_name''.  This variable is ignored if ``$$use_from''
-   ** is unset.
-   ** .pp
-   ** E.g. you can use
-   ** \fTsend-hook Madmutt-devel@lists.berlios.de 'my_hdr From: Foo Bar <foo@bar.fb>'\fP
-   ** when replying to the Madmutt developer's mailing list and Madmutt takes this email address.
-   ** .pp
-   ** Defaults to the contents of the environment variable \fT$$$EMAIL\fP.
-   */
 #ifdef USE_NNTP
   {"nntp_group_index_format", DT_STR, R_BOTH, UL &GroupFormat, "%4C %M%N %5s  %-45.45f %d"},
   /*
@@ -2351,7 +2325,6 @@ struct option_t MuttVars[] = {
    ** methods are unavailable. If a method is available but authentication
    ** fails, Madmutt will not connect to the POP server.
    */
-  {"pop_checkinterval", DT_SYN, R_NONE, UL "pop_mail_check", 0},
   {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, "60" },
   /*
    ** .pp
@@ -2575,17 +2548,6 @@ struct option_t MuttVars[] = {
    ** Setting this variable to \fIyes\fP is not generally useful, and thus not
    ** recommended.
    */
-  {"record", DT_PATH, R_NONE, UL &Outbox, ""},
-  /*
-   ** .pp
-   ** This specifies the file into which your outgoing messages should be
-   ** appended.  (This is meant as the primary method for saving a copy of
-   ** your messages, but another way to do this is using the ``$my_hdr''
-   ** command to create a \fTBcc:\fP header field with your email address in it.)
-   ** .pp
-   ** The value of \fI$$record\fP is overridden by the ``$$force_name'' and
-   ** ``$$save_name'' variables, and the ``$fcc-hook'' command.
-   */
   {"reply_regexp", DT_RX, R_INDEX|R_RESORT, UL &ReplyRegexp, "^(re([\\[0-9\\]+])*|aw):[ \t]*"},
   /*
    ** .pp
@@ -2762,14 +2724,6 @@ struct option_t MuttVars[] = {
    ** For example, Madmutt has the ability to highlight
    ** the signature in a different color in the builtin pager.
    */
-  {"signature", DT_PATH, R_NONE, UL &Signature, "~/.signature"},
-  /*
-   ** .pp
-   ** Specifies the filename of your signature, which is appended to all
-   ** outgoing messages.   If the filename ends with a pipe (``\fT|\fP''), it is
-   ** assumed that filename is a shell command and input should be read from
-   ** its stdout.
-   */
   {"signoff_string", DT_STR, R_NONE, UL &SignOffString, "" },
   /*
    ** .pp
@@ -3163,7 +3117,6 @@ struct option_t MuttVars[] = {
    ** Normally, the default should work.
    */
 #endif /* HAVE_GETADDRINFO */
-  {"user_agent", DT_SYN, R_NONE, UL "agent_string", 0 },
   {"agent_string", DT_BOOL, R_NONE, OPTXMAILER, "yes" },
   /*
    ** .pp