--- PATCHES Dec 2002 17:44:54 -0000 3.6 +++ PATCHES Nov 2003 18:46:12 -0000 @@ -0,0 +1 @@ +patch-1.5.5.dw.pgp-timeout.1 --- globals.h Jul 2003 11:41:32 -0000 3.6 +++ globals.h Nov 2003 18:46:14 -0000 @@ -174,3 +174,3 @@ WHERE REGEXP PgpGoodSign; WHERE char *PgpSignAs; -WHERE short PgpTimeout; +WHERE time_t PgpTimeout; WHERE char *PgpEntryFormat; --- init.c Aug 2003 13:55:47 -0000 3.15 +++ init.c Nov 2003 18:46:14 -0000 @@ -1094,3 +1094,4 @@ static int parse_set (BUFFER *tmp, BUFFE short *ptr = (short *) MuttVars[idx].data; - int val; + long *lptr = (long *) MuttVars[idx].data; + long val; char *t; @@ -1109,3 +1110,4 @@ static int parse_set (BUFFER *tmp, BUFFE - if (!*tmp->data || *t || (short) val != val) + if (!*tmp->data || *t || + (!(MuttVars[idx].type & DT_NUM_LONG) && (short) val != val)) { @@ -1115,2 +1117,4 @@ static int parse_set (BUFFER *tmp, BUFFE } + else if (MuttVars[idx].type & DT_NUM_LONG) + *lptr = val; else --- init.h Sep 2003 15:10:09 -0000 3.40 +++ init.h Nov 2003 18:46:15 -0000 @@ -47,2 +47,3 @@ #define DT_SORT_AUX 0x80 +#define DT_NUM_LONG 0x10 @@ -1405,3 +1406,3 @@ struct option_t MuttVars[] = { */ - { "pgp_timeout", DT_NUM, R_NONE, UL &PgpTimeout, 300 }, + { "pgp_timeout", DT_NUM|DT_NUM_LONG, R_NONE, UL &PgpTimeout, 300 }, /*