Add "guint32 server_flags" to CamelImapMessageInfo to keep track of the

        * providers/imap/camel-imap-summary.c: Add "guint32 server_flags"
        to CamelImapMessageInfo to keep track of the last known message
        flag state on the server.
        (message_info_save, message_info_load): Save/load the
        server_flags.

        * providers/imap/camel-imap-folder.c: Make this use
        CamelFolderChangeInfo and emit folder_changed notifications as it
        gets them rather than only on refresh_info.
        (imap_refresh_info): Notice flags that get cleared on the server
        as well as flags that get set.
        (imap_update_summary): Remove a comment that never actually
        applied to the committed code.

svn path=/trunk/; revision=7086

1 files changed, 38 insertions, 1 deletions

diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
index 9a0a638f96..5d657b6d68 100644
--- a/camel/providers/imap/camel-imap-summary.c
+++ b/camel/providers/imap/camel-imap-summary.c
@@ -32,11 +32,15 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define CAMEL_IMAP_SUMMARY_VERSION (0x1000)
+#define CAMEL_IMAP_SUMMARY_VERSION (0x2000)
 
 static int summary_header_load (CamelFolderSummary *, FILE *);
 static int summary_header_save (CamelFolderSummary *, FILE *);
 
+static CamelMessageInfo *message_info_load (CamelFolderSummary *s, FILE *in);
+static int               message_info_save (CamelFolderSummary *s, FILE *out,
+					    CamelMessageInfo *info);
+
 static void camel_imap_summary_class_init (CamelImapSummaryClass *klass);
 static void camel_imap_summary_init       (CamelImapSummary *obj);
 
@@ -70,6 +74,8 @@ camel_imap_summary_class_init (CamelImapSummaryClass *klass)
 
 	cfs_class->summary_header_load = summary_header_load;
 	cfs_class->summary_header_save = summary_header_save;
+	cfs_class->message_info_load = message_info_load;
+	cfs_class->message_info_save = message_info_save;
 }
 
 static void
@@ -149,3 +155,34 @@ summary_header_save (CamelFolderSummary *s, FILE *out)
 
 	return camel_folder_summary_encode_uint32 (out, ims->validity);
 }
+
+
+static CamelMessageInfo *
+message_info_load (CamelFolderSummary *s, FILE *in)
+{
+	CamelMessageInfo *info;
+	CamelImapMessageInfo *iinfo;
+
+	info = camel_imap_summary_parent->message_info_load (s, in);
+	if (!info)
+		return NULL;
+	iinfo = (CamelImapMessageInfo *)info;
+
+	if (camel_folder_summary_decode_uint32 (in, &iinfo->server_flags) == -1) {
+		camel_folder_summary_info_free (s, info);
+		return NULL;
+	}
+
+	return info;
+}
+
+static int
+message_info_save (CamelFolderSummary *s, FILE *out, CamelMessageInfo *info)
+{
+	CamelImapMessageInfo *iinfo = (CamelImapMessageInfo *)info;
+
+	if (camel_imap_summary_parent->message_info_save (s, out, info) == -1)
+		return -1;
+
+	return camel_folder_summary_encode_uint32 (out, iinfo->server_flags);
+}