[dovecot-cvs] dovecot/src/pop3 client.c, 1.66, 1.66.2.1 client.h, 1.13, 1.13.2.1 commands.c, 1.53.2.1, 1.53.2.2

[cras at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	client.c client.h commands.c 
Log Message:
Show number of actually expunged messages in logout message, instead of
number of messages marked as deleted.



Index: client.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/client.c,v
retrieving revision 1.66
retrieving revision 1.66.2.1
diff -u -d -r1.66 -r1.66.2.1
--- client.c	9 Apr 2006 15:50:54 -0000	1.66
+++ client.c	10 Aug 2006 22:32:07 -0000	1.66.2.1
@@ -199,7 +199,7 @@
 	tab[1].value = dec2str(client->top_count);
 	tab[2].value = dec2str(client->retr_bytes);
 	tab[3].value = dec2str(client->retr_count);
-	tab[4].value = dec2str(client->deleted_count);
+	tab[4].value = dec2str(client->expunged_count);
 	tab[5].value = dec2str(client->messages_count);
 	tab[6].value = dec2str(client->total_size);
 

Index: client.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/client.h,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- client.h	6 Mar 2006 20:34:42 -0000	1.13
+++ client.h	10 Aug 2006 22:32:07 -0000	1.13.2.1
@@ -25,6 +25,7 @@
 	unsigned int uid_validity;
 	unsigned int messages_count;
 	unsigned int deleted_count;
+	unsigned int expunged_count;
 	uoff_t *message_sizes;
 	uoff_t total_size;
 	uoff_t deleted_size;

Index: commands.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/commands.c,v
retrieving revision 1.53.2.1
retrieving revision 1.53.2.2
diff -u -d -r1.53.2.1 -r1.53.2.2
--- commands.c	1 Jul 2006 20:26:08 -0000	1.53.2.1
+++ commands.c	10 Aug 2006 22:32:07 -0000	1.53.2.2
@@ -216,6 +216,7 @@
 				ret = FALSE;
 				break;
 			}
+			client->expunged_count++;
 		}
 	}
 	mail_free(&mail);