sync with main 0.9.11cvs1
authorPaul Mangan <paul@claws-mail.org>
Thu, 3 Jun 2004 08:39:56 +0000 (08:39 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 3 Jun 2004 08:39:56 +0000 (08:39 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/msgcache.c

index 0fb7cad..7783f20 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
index a9cd42d..9763677 100644 (file)
@@ -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
index 5717586..65da38d 100644 (file)
@@ -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
index bbbe19b..8dbe7fa 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 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
index f3ac878..0a3c956 100644 (file)
@@ -305,10 +305,10 @@ static gint msgcache_read_cache_data_str(FILE *fp, gchar **str)
 {
        gchar buf[BUFFSIZE];
        gint ret = 0;
-       gint32 len;
+       guint32 len;
 
        if (fread(&len, sizeof(len), 1, fp) == 1) {
-               if (len < 0)
+               if (len > G_MAXINT)
                        ret = -1;
                else {
                        gchar *tmp = NULL;