diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | fetchmail.man | 9 | ||||
| -rw-r--r-- | imap.c | 13 |
3 files changed, 2 insertions, 23 deletions
@@ -79,9 +79,6 @@ fetchmail-6.3.20 (not yet released): * fetchmail now always uses its own MD5 implementation. The library and header variants are too diverse, and we've been bitten before -- and configure complains noisily on Cyrus-SASL's RFC1321 md5.h. -* fetchmail now supports an environment variable to suppress marking deleted - messages as seen at the same time, FETCHMAIL_IMAP_DELETED_REMAINS_UNSEEN. - See the manual page for details. Requested by Jonathan Buschmann. * Call strlen() only once when removing CRLF from a line. (Sunil Shetye) * fetchmail sets Internet domain sockets to "keepalive" mode now. Note that there is no portable way to configure actual timeouts for this mode, and some diff --git a/fetchmail.man b/fetchmail.man index 231e163d..903c8d4b 100644 --- a/fetchmail.man +++ b/fetchmail.man @@ -2781,15 +2781,6 @@ then that name is used as the default local name. Otherwise session ID (this elaborate logic is designed to handle the case of multiple names per userid gracefully). -.IP \fBFETCHMAIL_IMAP_DELETED_REMAINS_UNSEEN\fP -(since v6.3.20): -If this environment variable is set and not empty, fetchmail will NOT mark -messages retrieved through IMAP as \\Seen when they are deleted. This may suppress -delivery notifications on some systems (some versions of HP OpenMail) and change them -to mention "deleted without being read" on others (some versions of Microsoft Exchange). -The default (if this variable is unset or empty) is to mark messages as \\Seen -and \\Deleted at the same time. - .IP \fBFETCHMAIL_INCLUDE_DEFAULT_X509_CA_CERTS\fP (since v6.3.17): If this environment variable is set and not empty, fetchmail will always load @@ -1299,20 +1299,11 @@ static int imap_delete(int sock, struct query *ctl, int number) int ok; /* Select which flags to set on message deletion: */ const char delflags_seen[] = "\\Seen \\Deleted"; - const char delflags_unseen[] = "\\Deleted"; static const char *delflags; /* Which environment variable to look for: */ - const char dis_env[] = "FETCHMAIL_IMAP_DELETED_REMAINS_UNSEEN"; - if (!delflags) { - char *tmp; - if ((tmp = getenv(dis_env)) != NULL && *tmp) { - delflags = delflags_unseen; - } else { - /* DEFAULT since many fetchmail versions <= 6.3.X */ - delflags = delflags_seen; - } - } + /* DEFAULT since many fetchmail versions <= 6.3.X */ + delflags = delflags_seen; (void)ctl; /* expunges change the fetch numbers */ |