[dovecot-cvs] dovecot/src/lib-storage/index index-mail.c, 1.68, 1.69 index-mail.h, 1.26, 1.27

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index
In directory talvi:/tmp/cvs-serv15259/lib-storage/index

Modified Files:
	index-mail.c index-mail.h 
Log Message:
mail->expunged field wasn't actually set. Now it's always set if
wanted_fields contains message header or body.



Index: index-mail.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-mail.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- index-mail.c	28 Dec 2004 15:42:14 -0000	1.68
+++ index-mail.c	7 Jan 2005 21:45:40 -0000	1.69
@@ -718,8 +718,11 @@
 		data->save_bodystructure_header = TRUE;
 		data->save_bodystructure_body = TRUE;
 	} else if (mail->wanted_fields & (MAIL_FETCH_STREAM_HEADER |
-					  MAIL_FETCH_STREAM_BODY))
+					  MAIL_FETCH_STREAM_BODY)) {
 		data->open_mail = TRUE;
+		/* open stream to set expunged flag */
+		(void)mail->mail.get_stream(&mail->mail, NULL, NULL);
+	}
 
 	if ((mail->wanted_fields & MAIL_FETCH_DATE) &&
 	    data->sent_date.time == (time_t)-1)

Index: index-mail.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-mail.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- index-mail.h	28 Dec 2004 15:42:14 -0000	1.26
+++ index-mail.h	7 Jan 2005 21:45:40 -0000	1.27
@@ -84,7 +84,6 @@
 	unsigned int hdr_size_set:1;
 	unsigned int body_size_set:1;
 	unsigned int open_mail:1;
-	unsigned int deleted:1;
 };
 
 struct index_mail {