sync with 0.8.10

diff --git a/ChangeLog b/ChangeLog
index a39a6baab91bd704558b8839a4035be7f4a672d9..233faf86d15bddd7f151f9684373612ae09eae7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-04
+
+       * src/procmsg.h: WRITE_CACHE_DATA(): little speed improvement
+         (thanks to Colin Leroy).
+       * src/mh.c: mh_get_msginfo(): added NULL check (thanks to Thorsten
+         Maerz).
+
 2003-02-03
 
        * src/textview.c: textview_write_line(): don't convert if conv is

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7f7a18e81167e9e80df42fd4ccacddac3d1b00fe..cd0400b55eb8ec6f7b6564bd4bb3232935dc0356 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-02-04 [paul]      0.8.9claws37
+
+       * sync with 0.8.10
+               see ChangeLog 2003-02-04
+
 2003-02-04 [paul]      0.8.9claws36
 
        * sync with 0.8.9cvs6

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 00f68fcc636188d4731a1ebfe2a81317385a3789..25da8d8758e9ac2e30bf7f62a4e3963fbee31a9c 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,10 @@
+2003-02-04
+
+       * src/procmsg.h: WRITE_CACHE_DATA(): ®ÅÙ¤ò¾¯¤·¸þ¾å(Colin Leroy
+         ¤µ¤ó thanks)¡£
+       * src/mh.c: mh_get_msginfo(): NULL ¥Á¥§¥Ã¥¯¤òÄɲÃ(Thorsten Maerz
+         ¤µ¤ó thanks)¡£
+
 2003-02-03
 
        * src/textview.c: textview_write_line(): conv ¤¬ NULL ¤Î¾ì¹ç¤Ï

diff --git a/configure.ac b/configure.ac
index 277f6f4b2323a20cf5310b563e1e8cd572a55350..60a3689ca45898063e418fd4a8aae2d0138f2f20 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws36
+EXTRA_VERSION=claws37
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/procmsg.h b/src/procmsg.h
index cd9823ea444315417b756a615e941341ce823389..a83d9471f1f97585d757adaae601f39c63cab829 100644 (file)
--- a/src/procmsg.h
+++ b/src/procmsg.h
@@ -147,18 +147,19 @@ typedef enum
 #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); \
-       } \
+#define WRITE_CACHE_DATA(data, fp)                     \
+{                                                      \
+       gint len;                                       \
+                                                       \
+       if (data == NULL) {                             \
+               len = 0;                                \
+               WRITE_CACHE_DATA_INT(len, fp);          \
+       } else {                                        \
+               len = strlen(data);                     \
+               WRITE_CACHE_DATA_INT(len, fp);          \
+               if (len > 0)                            \
+                       fwrite(data, len, 1, fp);       \
+       }                                               \
 }
 
 struct _MsgFlags