sync with 0.9.8cvs2
authorPaul Mangan <paul@claws-mail.org>
Mon, 5 Jan 2004 11:26:30 +0000 (11:26 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 5 Jan 2004 11:26:30 +0000 (11:26 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/codeconv.c

index 1c07e66..926716f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-05
+
+       * src/codeconv.c: conv_iconv_strdup(): fixed crashes on LP64
+         environments (thanks to James Noyes).
+       * src/compose.c: compose_select_account(): don't turn off the sign/
+         encrypt option automatically.
+
 2003-12-17
 
        * src/inc.[ch]: made inc_account_mail() public.
index 743143f..68a9aa3 100644 (file)
@@ -1,3 +1,8 @@
+2004-01-05 [paul]      0.9.8claws18
+
+       * sync with 0.9.8cvs2
+               see ChangeLog 2004-01-05
+
 2004-01-03 [luke]      0.9.8claws17
 
        * src/procheader.c
index 60e7d0b..c6ab261 100644 (file)
@@ -1,3 +1,10 @@
+2004-01-05
+
+       * src/codeconv.c: conv_iconv_strdup(): LP64 ´Ä¶­¤Ç¤Î¥¯¥é¥Ã¥·¥å¤ò½¤Àµ
+         (James Noyes ¤µ¤ó thanks)¡£
+       * src/compose.c: compose_select_account(): ¼«Æ°Åª¤Ë½ð̾/°Å¹æ²½
+         ¥ª¥×¥·¥ç¥ó¤ò¥ª¥Õ¤Ë¤·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+
 2003-12-17
 
        * src/inc.[ch]: inc_account_mail() ¤ò public ¤Ë¤·¤¿¡£
index 29a4449..8d81c9d 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
index 2546c8a..94ba39e 100644 (file)
@@ -802,12 +802,12 @@ gchar *conv_iconv_strdup(const gchar *inbuf,
        const gchar *inbuf_p;
        gchar *outbuf;
        gchar *outbuf_p;
-       gint in_size;
-       gint in_left;
-       gint out_size;
-       gint out_left;
-       gint n_conv;
-       gint len;
+       size_t in_size;
+       size_t in_left;
+       size_t out_size;
+       size_t out_left;
+       size_t n_conv;
+       size_t len;
 
        if (!src_code)
                src_code = conv_get_outgoing_charset_str();
@@ -844,7 +844,7 @@ gchar *conv_iconv_strdup(const gchar *inbuf,
 }
 
        while ((n_conv = iconv(cd, (ICONV_CONST gchar **)&inbuf_p, &in_left,
-                              &outbuf_p, &out_left)) < 0) {
+                              &outbuf_p, &out_left)) == (size_t)-1) {
                if (EILSEQ == errno) {
                        inbuf_p++;
                        in_left--;
@@ -864,7 +864,8 @@ gchar *conv_iconv_strdup(const gchar *inbuf,
                }
        }
 
-       while ((n_conv = iconv(cd, NULL, NULL, &outbuf_p, &out_left)) < 0) {
+       while ((n_conv = iconv(cd, NULL, NULL, &outbuf_p, &out_left)) ==
+              (size_t)-1) {
                if (E2BIG == errno) {
                        EXPAND_BUF();
                } else {