sync with 0.8.10cvs11
authorPaul Mangan <paul@claws-mail.org>
Fri, 14 Feb 2003 06:44:25 +0000 (06:44 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 14 Feb 2003 06:44:25 +0000 (06:44 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/codeconv.c
src/quote_fmt_parse.y
src/unmime.c

index fe1f170..d53ee51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-14
+
+       * src/quote_fmt_parse.y: removed gettext translatable strings.
+       * src/unmime.c: unmime_header(): remove broken characters when
+         code conversion failed.
+       * src/codeconv.c: conv_encode_header(): fixed a bug that broken
+         headers if long words more than 75 characters are entered.
+
 2003-02-13
 
        * src/prefs_account.c: prefs_account_receive_create()
index fd90378..b6c70b8 100644 (file)
@@ -1,3 +1,8 @@
+2003-02-14 [paul]      0.8.10claws10
+
+       * sync with 0.8.10cvs11
+               see ChangeLog 2003-02-14
+
 2003-02-13 [thorsten]  0.8.10claws9
 
        * src/news.c
index 4282ae6..2fc30f6 100644 (file)
@@ -1,3 +1,11 @@
+2003-02-14
+
+       * src/quote_fmt_parse.y: gettext ËÝÌõ²Äǽ¤Êʸ»úÎó¤òºï½ü¡£
+       * src/unmime.c: unmime_header(): ¥³¡¼¥ÉÊÑ´¹¤Ë¼ºÇÔ¤·¤¿¤È¤­¤Ï²õ¤ì¤¿
+         Ê¸»ú¤òºï½ü¡£
+       * src/codeconv.c: conv_encode_header(): 75 Ê¸»ú°Ê¾å¤ÎŤ¤Ã±¸ì¤¬
+         ÆþÎϤµ¤ì¤ë¤È¥Ø¥Ã¥À¤ò²õ¤·¤Æ¤¤¤¿¥Ð¥°¤ò½¤Àµ¡£
+
 2003-02-13
 
        * src/codeconv.c: isprintableeuckanji(): 1¥Ð¥¤¥ÈÌܤǠ0xf4 ¤òĶ¤¨¤ë
index 3c9a8b1..cc6e8a6 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws9
+EXTRA_VERSION=claws10
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 747ac71..fa1bb18 100644 (file)
@@ -1234,14 +1234,16 @@ void conv_unmime_header(gchar *outbuf, gint outlen, const gchar *str,
        }                                                       \
                                                                \
        if ((cond) && *srcp) {                                  \
-               if (destp > dest && isspace(*(destp - 1)))      \
-                       destp--;                                \
-               else if (plaintext && isspace(*srcp))           \
-                       srcp++;                                 \
-               if (destp > dest && *srcp) {                    \
-                       *destp++ = '\n';                        \
-                       *destp++ = ' ';                         \
-                       left = MAX_LINELEN - 1;                 \
+               if (destp > dest && left < MAX_LINELEN - 1) {   \
+                       if (isspace(*(destp - 1)))              \
+                               destp--;                        \
+                       else if (plaintext && isspace(*srcp))   \
+                               srcp++;                         \
+                       if (*srcp) {                            \
+                               *destp++ = '\n';                \
+                               *destp++ = ' ';                 \
+                               left = MAX_LINELEN - 1;         \
+                       }                                       \
                }                                               \
        }                                                       \
 }
index 4993937..13cb1aa 100644 (file)
@@ -27,7 +27,6 @@
 #include "procmsg.h"
 #include "procmime.h"
 #include "utils.h"
-#include "intl.h"
 #include "procheader.h"
 
 #include "quote_fmt.h"
index 8649f47..dc2b4f4 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -119,7 +119,7 @@ void unmime_header(gchar *out, const gchar *str)
                        g_free(conv_str);
                } else {
                        len = strlen(decoded_text);
-                       memcpy(outp, decoded_text, len);
+                       conv_localetodisp(outp, len + 1, decoded_text);
                }
                outp += len;