[evolution-data-server/gnome-2-30] Make uidvalidity field 64-bit

[David Woodhouse <dwmw2 src gnome org>]

commit 74510e17ab484b8a0f74d30cd8962d3d39a045e7
Author: David Woodhouse <David Woodhouse intel com>
Date:   Thu Jun 24 12:30:58 2010 +0100

    Make uidvalidity field 64-bit
    
    But not in the summary yet; I'll get to that shortly and we aren't even
    storing it there anyway right now -- we're always writing zero.
    (cherry picked from commit 8cd40b296bfe1bdb9a7b46b8585a27872990af55)

 camel/providers/imapx/camel-imapx-server.h       |    2 +-
 camel/providers/imapx/camel-imapx-utils.h        |    8 ++++----
 camel/providers/imapx/camel-imapx-view-summary.h |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-server.h b/camel/providers/imapx/camel-imapx-server.h
index 5aec5b8..1f0ed10 100644
--- a/camel/providers/imapx/camel-imapx-server.h
+++ b/camel/providers/imapx/camel-imapx-server.h
@@ -79,7 +79,7 @@ struct _CamelIMAPXServer {
 	struct _CamelFolderChangeInfo *changes;
 	struct _CamelFolder *select_pending;
 	guint32 permanentflags;
-	guint32 uidvalidity;
+	guint64 uidvalidity;
 	guint32 unseen;
 	guint32 exists;
 	guint32 recent;
diff --git a/camel/providers/imapx/camel-imapx-utils.h b/camel/providers/imapx/camel-imapx-utils.h
index 7057dab..43a836e 100644
--- a/camel/providers/imapx/camel-imapx-utils.h
+++ b/camel/providers/imapx/camel-imapx-utils.h
@@ -150,15 +150,15 @@ struct _status_info {
 			gchar *newname;
 		} newname;
 		guint32 permanentflags;
-		guint32 uidvalidity;
+		guint64 uidvalidity;
 		guint32 uidnext;
 		guint32 unseen;
 		struct {
-			guint32 uidvalidity;
+			guint64 uidvalidity;
 			guint32 uid;
 		} appenduid;
 		struct {
-			guint32 uidvalidity;
+			guint64 uidvalidity;
 			GPtrArray *uids;
 			GPtrArray *copied_uids;
 		} copyuid;
@@ -179,7 +179,7 @@ struct _state_info {
 	guint32 messages;
 	guint32 recent;
 	guint32 uidnext;
-	guint32 uidvalidity;
+	guint64 uidvalidity;
 	guint32 unseen;
 };
 
diff --git a/camel/providers/imapx/camel-imapx-view-summary.h b/camel/providers/imapx/camel-imapx-view-summary.h
index eb33ccd..6a4307f 100644
--- a/camel/providers/imapx/camel-imapx-view-summary.h
+++ b/camel/providers/imapx/camel-imapx-view-summary.h
@@ -40,7 +40,7 @@ struct _CamelIMAPXView {
 	/* This data is only set on the root views */
 	gchar *raw_name;
 	guint32 exists;
-	guint32 uidvalidity;
+	guint64 uidvalidityxx; /* Cope with it being 64-bit, if you ever build this file again */
 	guint32 permanentflags;
 };