[dovecot-cvs] dovecot/src/lib-storage mail-storage.h,1.60,1.61 proxy-mail.c,1.2,1.3

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-storage
In directory danu:/tmp/cvs-serv8275/lib-storage

Modified Files:
	mail-storage.h proxy-mail.c 
Log Message:
Moved copy() method from struct mail to struct mailbox - the context
parameter makes sense only to destination mailbox handler.



Index: mail-storage.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/mail-storage.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- mail-storage.h	15 Sep 2003 17:38:37 -0000	1.60
+++ mail-storage.h	26 Oct 2003 18:05:42 -0000	1.61
@@ -325,6 +325,8 @@
 	struct mail_copy_context *(*copy_init)(struct mailbox *box);
 	/* Finish copying. */
 	int (*copy_deinit)(struct mail_copy_context *ctx, int rollback);
+	/* Copy given message. */
+	int (*copy)(struct mail *mail, struct mail_copy_context *ctx);
 
 	/* Initialize expunging operation to this mailbox. If expunge_all
 	   is TRUE, all messages are returned rather than just deleted. */
@@ -389,9 +391,6 @@
 	int (*update_flags)(struct mail *mail,
 			    const struct mail_full_flags *flags,
 			    enum modify_type modify_type);
-
-	/* Copy this message to another mailbox. */
-	int (*copy)(struct mail *mail, struct mail_copy_context *ctx);
 
 	/* Expunge this message. Note that the actual message may or may not
 	   be really expunged until expunge_deinit() is called. In any case,

Index: proxy-mail.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/proxy-mail.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- proxy-mail.c	13 Aug 2003 22:24:32 -0000	1.2
+++ proxy-mail.c	26 Oct 2003 18:05:42 -0000	1.3
@@ -69,13 +69,6 @@
 	return p->mail->update_flags(p->mail, flags, modify_type);
 }
 
-static int _copy(struct mail *mail, struct mail_copy_context *ctx)
-{
-	struct proxy_mail *p = (struct proxy_mail *) mail;
-
-	return p->mail->copy(p->mail, ctx);
-}
-
 static int _expunge(struct mail *mail, struct mail_expunge_context *ctx,
 		    unsigned int *seq_r, int notify)
 {
@@ -101,7 +94,6 @@
 	pm->get_stream = _get_stream;
 	pm->get_special = _get_special;
 	pm->update_flags = _update_flags;
-	pm->copy = _copy;
 	pm->expunge = _expunge;
 }