** See bug #51045.

2004-02-16  Not Zed  <NotZed@Ximian.com>

        ** See bug #51045.

        * providers/imap/camel-imap-store.c (fill_fi): similar to mbox
        version.
        (get_folder_counts): use fill_fi to try and get folder counts if
        we're not doing the hard slog.
        (get_one_folder_offline): use fill_fi to try to get folder counts
        from open folders or summaries.

        * providers/local/camel-maildir-store.c (fill_fi): similar to mbox
        version.
        (scan_dir): use fill_fi to get the unread count now.

        * providers/local/camel-mbox-store.c (fill_fi): helper to lookup
        unread count either from active folder or from summary file, if
        it's available.
        (scan_dir, get_folder_info): use helper above to get folder info.

        * devel-docs/camel-folder-summary.txt: New document describing the
        format/conventions in the CamelFolderSummary file.

        * providers/nntp/camel-nntp-summary.c (summary_header_load/save):
        * providers/imapp/camel-imapp-summary.c (summary_header_load/save):
        * providers/imap/camel-imap-summary.c (summary_header_load/save):
        Handle versions, per-class version number (1).

        * providers/local/camel-mbox-summary.c (summary_header_load/save):
        Handle versions properly, add a per-class version (1).  Write out the
        folder size as a size_t rather than 32 bit int.

        * providers/local/camel-local-summary.c (summary_header_load/save):
        read/write the per-class version number (1).

        * camel-folder-summary.c (summary_header_load): do version
        checking differently, allow the version to be bumped without
        aborting the load.  Added unread/deleted/junk counts to base
        header.
        (summary_header_save): Save out the new-format header.  Version
        bumped to 13.

        * camel.c (camel_init): return 0 rather than spit a compiler warning.

        * camel-file-utils.c (camel_file_util_encode_*_t): macro-ise the
        type encoder/decoders.  Also add size_t encoder/decoder.

svn path=/trunk/; revision=24744

1 files changed, 20 insertions, 8 deletions

diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
index dba1134fa1..bebc672866 100644
--- a/camel/providers/imap/camel-imap-summary.c
+++ b/camel/providers/imap/camel-imap-summary.c
@@ -35,7 +35,7 @@
 #include "camel-imap-summary.h"
 #include "camel-file-utils.h"
 
-#define CAMEL_IMAP_SUMMARY_VERSION (0x300)
+#define CAMEL_IMAP_SUMMARY_VERSION (1)
 
 static int summary_header_load (CamelFolderSummary *, FILE *);
 static int summary_header_save (CamelFolderSummary *, FILE *);
@@ -94,9 +94,6 @@ camel_imap_summary_init (CamelImapSummary *obj)
 	/* subclasses need to set the right instance data sizes */
 	s->message_info_size = sizeof(CamelImapMessageInfo);
 	s->content_info_size = sizeof(CamelImapMessageContentInfo);
-
-	/* and a unique file version */
-	s->version += CAMEL_IMAP_SUMMARY_VERSION;
 }
 
 /**
@@ -125,7 +122,6 @@ camel_imap_summary_new (const char *filename)
 	return summary;
 }
 
-
 static int
 summary_header_load (CamelFolderSummary *s, FILE *in)
 {
@@ -134,7 +130,22 @@ summary_header_load (CamelFolderSummary *s, FILE *in)
 	if (camel_imap_summary_parent->summary_header_load (s, in) == -1)
 		return -1;
 
-	return camel_file_util_decode_uint32 (in, &ims->validity);
+	/* Legacy version */
+	if (s->version == 0x30c)
+		return camel_file_util_decode_uint32(in, &ims->validity);
+
+	/* Version 1 */
+	if (camel_file_util_decode_fixed_int32(in, &ims->version) == -1
+	    || camel_file_util_decode_fixed_int32(in, &ims->validity) == -1)
+		return -1;
+
+	if (ims->version > CAMEL_IMAP_SUMMARY_VERSION) {
+		g_warning("Unkown summary version\n");
+		errno = EINVAL;
+		return -1;
+	}
+
+	return 0;
 }
 
 static int
@@ -145,9 +156,10 @@ summary_header_save (CamelFolderSummary *s, FILE *out)
 	if (camel_imap_summary_parent->summary_header_save (s, out) == -1)
 		return -1;
 
-	return camel_file_util_encode_uint32 (out, ims->validity);
-}
+	camel_file_util_encode_fixed_int32(out, CAMEL_IMAP_SUMMARY_VERSION);
 
+	return camel_file_util_encode_fixed_int32(out, ims->validity);
+}
 
 static CamelMessageInfo *
 message_info_load (CamelFolderSummary *s, FILE *in)