projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
always build pgp support.
[apps/madmutt.git]
/
init.h
diff --git
a/init.h
b/init.h
index
37e3112
..
072618d
100644
(file)
--- a/
init.h
+++ b/
init.h
@@
-108,9
+108,6
@@
struct option_t {
# ifndef USE_DOTLOCK
# define USE_DOTLOCK
# endif
# ifndef USE_DOTLOCK
# define USE_DOTLOCK
# endif
-# ifndef DL_STANDALONE
-# define DL_STANDALONE
-# endif
# ifndef USE_HCACHE
# define USE_HCACHE
# endif
# ifndef USE_HCACHE
# define USE_HCACHE
# endif
@@
-122,7
+119,7
@@
struct option_t {
# endif
#endif
# endif
#endif
-struct option_t
const
MuttVars[] = {
+struct option_t MuttVars[] = {
/*++*/
{"abort_noattach", DT_QUAD, R_NONE, OPT_ATTACH, "no" },
/*
/*++*/
{"abort_noattach", DT_QUAD, R_NONE, OPT_ATTACH, "no" },
/*
@@
-597,11
+594,11
@@
struct option_t const MuttVars[] = {
** is viewed it is passed as standard input to $$display_filter, and the
** filtered message is read from the standard output.
*/
** 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
{"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
**
** .pp
** Contains the path of the \fTmuttng_dotlock(1)\fP binary to be used by
@@
-3854,7
+3851,7
@@
struct option_t const MuttVars[] = {
*/
#endif
/*--*/
*/
#endif
/*--*/
- { NULL }
+ { NULL
, -1, R_NONE, -1, NULL
}
};
static const char* Features[] = {
};
static const char* Features[] = {
@@
-3873,9
+3870,6
@@
static const char* Features[] = {
#ifdef USE_DOTLOCK
"dotlock",
#endif
#ifdef USE_DOTLOCK
"dotlock",
#endif
-#ifdef DL_STANDALONE
- "standalone",
-#endif
#ifdef USE_POP
"pop",
#endif
#ifdef USE_POP
"pop",
#endif
@@
-3903,9
+3897,6
@@
static const char* Features[] = {
#ifdef HAVE_COLOR
"color",
#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_CLASSIC_SMIME
"class_smime",
#endif
@@
-3968,14
+3959,14
@@
const struct mapping_t SortBrowserMethods[] = {
{"date", SORT_DATE},
{"size", SORT_SIZE},
{"unsorted", SORT_ORDER},
{"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},
};
const struct mapping_t SortAliasMethods[] = {
{"alias", SORT_ALIAS},
{"address", SORT_ADDRESS},
{"unsorted", SORT_ORDER},
- {NULL}
+ {NULL
, 0
}
};
const struct mapping_t SortKeyMethods[] = {
};
const struct mapping_t SortKeyMethods[] = {
@@
-3983,7
+3974,7
@@
const struct mapping_t SortKeyMethods[] = {
{"date", SORT_DATE},
{"keyid", SORT_KEYID},
{"trust", SORT_TRUST},
{"date", SORT_DATE},
{"keyid", SORT_KEYID},
{"trust", SORT_TRUST},
- {NULL}
+ {NULL
, 0
}
};
};
@@
-4087,5
+4078,5
@@
struct command_t Commands[] = {
{"unscore", mutt_parse_unscore, 0},
{"unset", parse_set, M_SET_UNSET},
{"unsubscribe", parse_unsubscribe, 0},
{"unscore", mutt_parse_unscore, 0},
{"unset", parse_set, M_SET_UNSET},
{"unsubscribe", parse_unsubscribe, 0},
- {NULL}
+ {NULL
, NULL, 0
}
};
};