Fix to previous change: make sure the "seek" variable ends up with the

	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Fix to
	previous change: make sure the "seek" variable ends up with the
	value it should.

	* providers/mbox/camel-mbox-summary.c (summary_rebuild): Update
	summary mtime as well as size.

svn path=/trunk/; revision=3577

2 files changed, 14 insertions, 7 deletions

diff --git a/camel/providers/mbox/camel-mbox-folder.c b/camel/providers/mbox/camel-mbox-folder.c
index 035dbee127..0aa2f90f26 100644
--- a/camel/providers/mbox/camel-mbox-folder.c
+++ b/camel/providers/mbox/camel-mbox-folder.c
@@ -298,7 +298,7 @@ mbox_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelExcept
 	CamelStream *output_stream = NULL, *filter_stream = NULL;
 	CamelMimeFilter *filter_from = NULL;
 	struct stat st;
-	off_t seek = -1;
+	off_t seek;
 	char *xev, last;
 	guint32 uid;
 
@@ -311,7 +311,7 @@ mbox_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelExcept
 
 	if (st.st_size) {
 		seek = camel_seekable_stream_seek((CamelSeekableStream *)output_stream, st.st_size - 1, SEEK_SET);
-		if (seek != st.st_size - 1)
+		if (++seek != st.st_size)
 			goto fail;
 
 		/* If the mbox doesn't end with a newline, fix that. */
@@ -319,7 +319,8 @@ mbox_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelExcept
 			goto fail;
 		if (last != '\n')
 			camel_stream_write (output_stream, "\n", 1);
-	}
+	} else
+		seek = 0;
 
 	/* assign a new x-evolution header/uid */
 	camel_medium_remove_header((CamelMedium *)message, "X-Evolution");
diff --git a/camel/providers/mbox/camel-mbox-summary.c b/camel/providers/mbox/camel-mbox-summary.c
index c2fd326104..03f2f2f250 100644
--- a/camel/providers/mbox/camel-mbox-summary.c
+++ b/camel/providers/mbox/camel-mbox-summary.c
@@ -273,6 +273,7 @@ static int		  message_info_save(CamelFolderSummary *s, FILE *out, CamelMessageIn
 static int
 summary_rebuild(CamelMboxSummary *mbs, off_t offset)
 {
+	CamelFolderSummary *s = (CamelFolderSummary *)mbs;
 	CamelMimeParser *mp;
 	int fd;
 	int ok = 0;
@@ -317,11 +318,16 @@ summary_rebuild(CamelMboxSummary *mbs, off_t offset)
 		g_assert(camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM_END);
 	}
 
-	/* update the file size in the summary */
-	if (ok != -1)
-		mbs->folder_size = camel_mime_parser_seek(mp, 0, SEEK_CUR);
-	printf("updating folder size = %d\n", mbs->folder_size);
 	gtk_object_unref((GtkObject *)mp);
+	/* update the file size/mtime in the summary */
+	if (ok != -1) {
+		struct stat st;
+
+		if (stat (mbs->folder_path, &st) == 0) {
+			mbs->folder_size = st.st_size;
+			s->time = st.st_mtime;
+		}
+	}
 
 	return ok;
 }