[dovecot-cvs] dovecot/src/imap Makefile.am,1.21,1.22 cmd-close.c,1.8,1.9 cmd-expunge.c,1.3,1.4

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/imap
In directory danu:/tmp/cvs-serv28560/imap

Modified Files:
	Makefile.am cmd-close.c cmd-expunge.c 
Log Message:
API change for expunging messages. Not exactly what I wanted, but good
enough.



Index: Makefile.am
===================================================================
RCS file: /home/cvs/dovecot/src/imap/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile.am	9 Jul 2003 19:30:32 -0000	1.21
+++ Makefile.am	26 Jul 2003 16:33:21 -0000	1.22
@@ -61,6 +61,7 @@
 	client.c \
 	commands.c \
 	commands-util.c \
+	imap-expunge.c \
 	imap-fetch.c \
 	imap-fetch-body-section.c \
 	imap-search.c \
@@ -76,6 +77,7 @@
 	commands.h \
 	commands-util.h \
 	common.h \
+	imap-expunge.h \
 	imap-fetch.h \
 	imap-search.h \
 	imap-sort.h \

Index: cmd-close.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap/cmd-close.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cmd-close.c	8 May 2003 04:53:47 -0000	1.8
+++ cmd-close.c	26 Jul 2003 16:33:22 -0000	1.9
@@ -2,6 +2,7 @@
 
 #include "common.h"
 #include "commands.h"
+#include "imap-expunge.h"
 
 int cmd_close(struct client *client)
 {
@@ -13,7 +14,7 @@
 	client->mailbox = NULL;
 
 	if (!mailbox->readonly) {
-		if (!mailbox->expunge(mailbox, FALSE))
+		if (!imap_expunge(mailbox, FALSE))
 			client_send_untagged_storage_error(client);
 	}
 

Index: cmd-expunge.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap/cmd-expunge.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmd-expunge.c	5 Jan 2003 13:09:51 -0000	1.3
+++ cmd-expunge.c	26 Jul 2003 16:33:22 -0000	1.4
@@ -2,13 +2,14 @@
 
 #include "common.h"
 #include "commands.h"
+#include "imap-expunge.h"
 
 int cmd_expunge(struct client *client)
 {
 	if (!client_verify_open_mailbox(client))
 		return TRUE;
 
-	if (client->mailbox->expunge(client->mailbox, TRUE))
+	if (imap_expunge(client->mailbox, TRUE))
 		client_send_tagline(client, "OK Expunge completed.");
 	else
 		client_send_storage_error(client);