X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=072618d624eff279d90ee69dbaff5154263bf0f0;hp=1966bd0c77b69581707dffdb3ef91997cb2fb832;hb=51c07577bff89fde3038940cc06ac01bc28557b9;hpb=1f02569d622173cfd4c39f56d1e0e1f488b7c73e

diff --git a/init.h b/init.h
index 1966bd0..072618d 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)
@@ -108,9 +108,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 +594,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
@@ -3854,7 +3851,7 @@ struct option_t MuttVars[] = {
    */
 #endif
   /*--*/
-  { NULL }
+  { NULL, -1, R_NONE, -1, NULL }
 };
 
 static const char* Features[] = {
@@ -3873,9 +3870,6 @@ static const char* Features[] = {
 #ifdef USE_DOTLOCK
   "dotlock",
 #endif
-#ifdef DL_STANDALONE
-  "standalone",
-#endif
 #ifdef USE_POP
   "pop",
 #endif
@@ -3903,9 +3897,6 @@ static const char* Features[] = {
 #ifdef HAVE_COLOR
   "color",
 #endif
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-  "classic_pgp",
-#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},
-  {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[] = {
@@ -3983,7 +3974,7 @@ const struct mapping_t SortKeyMethods[] = {
   {"date", SORT_DATE},
   {"keyid", SORT_KEYID},
   {"trust", SORT_TRUST},
-  {NULL}
+  {NULL, 0}
 };
 
 
@@ -4012,10 +4003,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[] = {
@@ -4088,5 +4078,5 @@ struct command_t Commands[] = {
   {"unscore", mutt_parse_unscore, 0},
   {"unset", parse_set, M_SET_UNSET},
   {"unsubscribe", parse_unsubscribe, 0},
-  {NULL}
+  {NULL, NULL, 0}
 };