sync with main 0.9.11cvs1

diff --git a/ChangeLog b/ChangeLog
index 0fb7cadded66cfe2e58228c56d4e0b39f9cec7e6..7783f2007956a2874d08f9821a0d027d0b101715 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-06-03
+
+       * src/procmsg.c: procmsg_read_cache_data_str(): changed gint32 to
+         guint32 for some platforms.
+       * src/summaryview.c: restored 'Print' menu.
+
+2004-06-01
+
+       * src/about.c: modified copyright year.
+

 2004-05-28
 
        * version 0.9.11
 2004-05-28
 
        * version 0.9.11

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a9cd42da64966d40c597ad8008b02358f1205afc..97636773b0eab6e2b472af03ee9212cff22cc7bc 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-06-03 [paul]      0.9.11cvs2
+
+       * src/msgcache.c
+               sync with main 0.9.11cvs1: "changed gint32 to
+               guint32 for some platforms"
+

 2004-06-02 [christoph] 0.9.11cvs1
 
        * src/common/ssl.c
 2004-06-02 [christoph] 0.9.11cvs1
 
        * src/common/ssl.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 571758625181722a11fdd40f3a360605e4ad3575..65da38d1d9b21adbf46160fa1aecebe511914fb9 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,14 @@
+2004-06-03
+
+       * src/procmsg.c: procmsg_read_cache_data_str(): ¤¤¤¯¤Ä¤«¤Î´Ä¶­¤Î¤¿¤á
+         ¤Ë gint32 ¤ò guint32 ¤ËÊѹ¹¡£
+       * src/summaryview.c: ¡Ö°õºþ¡×¥á¥Ë¥å¡¼¤òÉü³è¤·¡¢¡Ö¿¶¤êʬ¤±¥ë¡¼¥ë¤ò
+         ºîÀ®¡×¥á¥Ë¥å¡¼¤òºï½ü¡£
+
+2004-06-01
+
+       * src/about.c: Ãøºî¸¢¤Îǯ¤ò½¤Àµ¡£
+

 2004-05-28
 
        * version 0.9.11
 2004-05-28
 
        * version 0.9.11

diff --git a/configure.ac b/configure.ac
index bbbe19b0c8defebeb11a6790be29834088cb8b69..8dbe7fa4f070a899def4f3e1a4926c6e695012af 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=1
+EXTRA_VERSION=2

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/msgcache.c b/src/msgcache.c
index f3ac8788501c4ebb607d4652a55d166ff183417c..0a3c956744012449ee52cea557fe5c33029c61db 100644 (file)
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -305,10 +305,10 @@ static gint msgcache_read_cache_data_str(FILE *fp, gchar **str)
 {
        gchar buf[BUFFSIZE];
        gint ret = 0;
 {
        gchar buf[BUFFSIZE];
        gint ret = 0;

-       gint32 len;
+       guint32 len;

 
        if (fread(&len, sizeof(len), 1, fp) == 1) {
 
        if (fread(&len, sizeof(len), 1, fp) == 1) {

-               if (len < 0)
+               if (len > G_MAXINT)

                        ret = -1;
                else {
                        gchar *tmp = NULL;
                        ret = -1;
                else {
                        gchar *tmp = NULL;