From 843124609c0f0a0bc21404c682b67e60b8394f78 Mon Sep 17 00:00:00 2001
From: Colin Leroy <colin@colino.net>
Date: Wed, 13 Nov 2002 01:39:39 +0000
Subject: [PATCH] revert, problem... :(

---
 ChangeLog.claws |  7 +++++++
 configure.in    |  2 +-
 src/defs.h      |  4 ++--
 src/msgcache.c  | 17 +++++++++++++++++
 src/procmsg.c   |  3 ---
 src/procmsg.h   | 15 ++-------------
 6 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d46c453a6..7730af8f7 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-11-13 [colin]	0.8.5claws137
+	
+	* src/msgcache.c
+	  src/defs.h
+	  src/procmsg.[ch]
+		Revert last commit, problem
+
 2002-11-13 [colin]	0.8.5claws136
 
 	* src/msgcache.c
diff --git a/configure.in b/configure.in
index f56791d19..257e9049f 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws136
+EXTRA_VERSION=claws137
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/defs.h b/src/defs.h
index 08e97fc6f..771cb53e2 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -66,8 +66,8 @@
 #define FOLDER_LIST		"folderlist.xml"
 #define CACHE_FILE		".sylpheed_cache"
 #define MARK_FILE		".sylpheed_mark"
-#define CACHE_VERSION		21
-#define MARK_VERSION		3
+#define CACHE_VERSION		20
+#define MARK_VERSION		2
 
 #define DEFAULT_SIGNATURE	".signature"
 #define DEFAULT_INC_PATH	"/usr/bin/mh/inc"
diff --git a/src/msgcache.c b/src/msgcache.c
index 6ee5bf480..94a6b9b69 100644
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -305,6 +305,23 @@ void msgcache_read_mark(MsgCache *cache, const gchar *mark_file)
 	fclose(fp);
 }
 
+#define WRITE_CACHE_DATA_INT(n, fp) \
+	fwrite(&n, sizeof(n), 1, fp)
+
+#define WRITE_CACHE_DATA(data, fp) \
+{ \
+	gint len; \
+ \
+	if (data == NULL || (len = strlen(data)) == 0) { \
+		len = 0; \
+		WRITE_CACHE_DATA_INT(len, fp); \
+	} else { \
+		len = strlen(data); \
+		WRITE_CACHE_DATA_INT(len, fp); \
+		fwrite(data, len, 1, fp); \
+	} \
+}
+
 void msgcache_write_cache(MsgInfo *msginfo, FILE *fp)
 {
 	MsgTmpFlags flags = msginfo->flags.tmp_flags & MSG_CACHED_FLAG_MASK;
diff --git a/src/procmsg.c b/src/procmsg.c
index 74bb0089c..b47af18f6 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -106,7 +106,6 @@ static gint procmsg_read_cache_data_str(FILE *fp, gchar **str)
 	size_t len;
 
 	if (fread(&len, sizeof(len), 1, fp) == 1) {
-		len = me2ne_32(len);
 		if (len < 0)
 			ret = -1;
 		else {
@@ -156,8 +155,6 @@ static gint procmsg_read_cache_data_str(FILE *fp, gchar **str)
 		g_warning(_("Cache data is corrupted\n")); \
 		procmsg_msginfo_free(msginfo); \
 		break; \
-	} else { \
-		n = me2ne_32(n); \
 	} \
 }
 
diff --git a/src/procmsg.h b/src/procmsg.h
index 01a6b360a..cfbff25ba 100644
--- a/src/procmsg.h
+++ b/src/procmsg.h
@@ -143,20 +143,9 @@ typedef enum
 #define MSG_IS_IGNORE_THREAD(msg)	(((msg).perm_flags & MSG_IGNORE_THREAD) != 0)
 #define MSG_IS_RETRCPT_PENDING(msg)	(((msg).perm_flags & MSG_RETRCPT_PENDING) != 0)
 
-/* code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc. */
-#ifdef BIG_ENDIAN_HOST
-#define me2ne_32(x) (x)
-#else
-#define me2ne_32(x) \
-     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
-      (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
 
-#endif
-
-#define WRITE_CACHE_DATA_INT(n, fp) { \
-	int i = n; i = me2ne_32(i); \
-	fwrite(&i, sizeof(n), 1, fp); \
-}
+#define WRITE_CACHE_DATA_INT(n, fp) \
+	fwrite(&n, sizeof(n), 1, fp)
 
 #define WRITE_CACHE_DATA(data, fp) \
 { \
-- 
2.25.1