[dovecot-cvs] dovecot/src/pop3 client.c, 1.39, 1.40 commands.c, 1.31, 1.32 common.h, 1.4, 1.5 main.c, 1.15, 1.16

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/pop3
In directory talvi:/tmp/cvs-serv8742/src/pop3

Modified Files:
	client.c commands.c common.h main.c 
Log Message:
Renamed pop3_mails_keep_recent to pop3_no_flag_updates which includes
not updating seen-flag.



Index: client.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/client.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- client.c	8 Oct 2004 21:21:11 -0000	1.39
+++ client.c	10 Oct 2004 14:32:33 -0000	1.40
@@ -211,7 +211,7 @@
 	mail_storage_set_callbacks(storage, &mail_storage_callbacks, client);
 
 	flags = 0;
-	if (getenv("POP3_MAILS_KEEP_RECENT") != NULL)
+	if (no_flag_updates)
 		flags |= MAILBOX_OPEN_KEEP_RECENT;
 	client->mailbox = mailbox_open(storage, "INBOX", flags);
 	if (client->mailbox == NULL) {

Index: commands.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/commands.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- commands.c	8 Oct 2004 21:21:11 -0000	1.31
+++ commands.c	10 Oct 2004 14:32:33 -0000	1.32
@@ -332,7 +332,7 @@
 		return;
 	}
 
-	if (body_lines == (uoff_t)-1) {
+	if (body_lines == (uoff_t)-1 && !no_flag_updates) {
 		/* mark the message seen with RETR command */
 		if (client->seen_bitmask == NULL) {
 			client->seen_bitmask =

Index: common.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/common.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- common.h	12 Sep 2004 14:26:58 -0000	1.4
+++ common.h	10 Oct 2004 14:32:33 -0000	1.5
@@ -10,7 +10,7 @@
 
 extern struct ioloop *ioloop;
 extern enum client_workarounds client_workarounds;
-extern int enable_last_command;
+extern int enable_last_command, no_flag_updates;
 
 extern void (*hook_mail_storage_created)(struct mail_storage **storage);
 extern void (*hook_client_created)(struct client **client);

Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- main.c	12 Sep 2004 14:26:58 -0000	1.15
+++ main.c	10 Oct 2004 14:32:33 -0000	1.16
@@ -35,6 +35,7 @@
 static char log_prefix[128]; /* syslog() needs this to be permanent */
 enum client_workarounds client_workarounds = 0;
 int enable_last_command = FALSE;
+int no_flag_updates = FALSE;
 
 static void sig_quit(int signo __attr_unused__)
 {
@@ -132,6 +133,7 @@
 
 	parse_workarounds();
 	enable_last_command = getenv("POP3_ENABLE_LAST") != NULL;
+	no_flag_updates = getenv("POP3_NO_FLAG_UPDATES") != NULL;
 
 	storage = mail_storage_create_with_data(mail, getenv("USER"));
 	if (storage == NULL) {