sync with 0.9.8cvs2

diff --git a/ChangeLog b/ChangeLog
index 1c07e66fb62ce56788c9b6df7c8ddb29bf143c65..926716fd8281a9e051d63f6aa1428585cf4c17da 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.
 2003-12-17
 
        * src/inc.[ch]: made inc_account_mail() public.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 743143f6d2ed4276df6cbc3adc6f852d2e47d340..68a9aa349abc28389ea46ca666f623fa4d24b309 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -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
 2004-01-03 [luke]      0.9.8claws17
 
        * src/procheader.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 60e7d0b0e291794519dc4df3136f61989f26e13b..c6ab2612f4ddf60c400737e9972237d8ee231796 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -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 ¤Ë¤·¤¿¡£
 2003-12-17
 
        * src/inc.[ch]: inc_account_mail() ¤ò public ¤Ë¤·¤¿¡£

diff --git a/configure.ac b/configure.ac
index 29a44493c7a99662b0ce87b802c0b594f04033b1..8d81c9d5ab393bce3b3001c714b18d68ed376da5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/codeconv.c b/src/codeconv.c
index 2546c8a0c438f49c0bd897a29e8d4f488b6e48c6..94ba39ef2c24698c173d510bbd96e7787e4ca2ca 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -802,12 +802,12 @@ gchar *conv_iconv_strdup(const gchar *inbuf,
        const gchar *inbuf_p;
        gchar *outbuf;
        gchar *outbuf_p;
        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();
 
        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,
 }
 
        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--;
                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 {
                if (E2BIG == errno) {
                        EXPAND_BUF();
                } else {