From: Paul Mangan <paul@claws-mail.org>
Date: Thu, 13 May 2004 06:52:09 +0000 (+0000)
Subject: sync with 0.9.10cvs12
X-Git-Tag: rel_0_9_11~18
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=67cd57ed83b11cab1779ed13abf6eba2a0fe1aa8

sync with 0.9.10cvs12
---

diff --git a/ChangeLog b/ChangeLog
index 3fc839b96..70791e735 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-12
+
+	* src/procmsg.[ch]: fixed the type of integer value in cache data
+	  to g(u)int32.
+
 2004-05-11
 
 	* src/nntp.c: nntp_get_article(): ignore the protocol error of
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 80f181a0c..f08b463c1 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-05-13 [paul]	0.9.10claws61
+
+	* src/msgcache.[ch]
+		sync with 0.9.10cvs12
+		see ChangeLog 2004-05-12
+
 2004-05-12 [alfons]	0.9.10claws60
 
 	* src/folderview.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 483cb2623..1aecf5a7a 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2004-05-12
+
+	* src/procmsg.[ch]: ¥­¥ã¥Ã¥·¥å¥Ç¡¼¥¿¤ÎÀ°¿ôÃͤη¿¤ò g(u)int32 ¤Ë
+	  ¸ÇÄê¡£
+
 2004-05-11
 
 	* src/nntp.c: nntp_get_article(): broken ¤Ê¥Ë¥å¡¼¥¹¥µ¡¼¥Ð¤Î¤¿¤á¤Ë
diff --git a/configure.ac b/configure.ac
index 291893cc6..0d70d0a4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=60
+EXTRA_VERSION=61
 
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
diff --git a/src/msgcache.c b/src/msgcache.c
index b4de1f666..f3ac87885 100644
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -215,16 +215,24 @@ gint msgcache_get_memory_usage(MsgCache *cache)
 
 #define READ_CACHE_DATA_INT(n, fp) \
 { \
-	if (fread(&n, sizeof(n), 1, fp) != 1) { \
+	guint32 idata; \
+ \
+	if (fread(&idata, sizeof(idata), 1, fp) != 1) { \
 		g_warning("Cache data is corrupted\n"); \
 		procmsg_msginfo_free(msginfo); \
 		error = TRUE; \
 		break; \
-	} \
+	} else \
+		n = idata;\
 }
 
-#define WRITE_CACHE_DATA_INT(n, fp) \
-	fwrite(&n, sizeof(n), 1, fp)
+#define WRITE_CACHE_DATA_INT(n, fp)		\
+{						\
+	guint32 idata;				\
+						\
+	idata = (guint32)n;			\
+	fwrite(&idata, sizeof(idata), 1, fp);	\
+}
 
 #define WRITE_CACHE_DATA(data, fp) \
 { \
@@ -297,7 +305,7 @@ static gint msgcache_read_cache_data_str(FILE *fp, gchar **str)
 {
 	gchar buf[BUFFSIZE];
 	gint ret = 0;
-	size_t len;
+	gint32 len;
 
 	if (fread(&len, sizeof(len), 1, fp) == 1) {
 		if (len < 0)