sync with 0.9.8cvs3
authorPaul Mangan <paul@claws-mail.org>
Tue, 20 Jan 2004 07:35:18 +0000 (07:35 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 20 Jan 2004 07:35:18 +0000 (07:35 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/gtk/gtkstext.c

index 926716f..137928e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-20
+
+       * src/gtkstext.c: find_line_params(): break lines between multibyte
+         characters on word wrap mode.
+
 2004-01-05
 
        * src/codeconv.c: conv_iconv_strdup(): fixed crashes on LP64
index 7e57a9b..ff879ac 100644 (file)
@@ -1,9 +1,16 @@
+2004-01-20 [paul]      0.9.8clawws35
+
+       * sync with 0.9.8cvs3
+               see ChangeLog 2004-01-20
+
 2004-01-19 [keith]     0.9.8claws34
+
        * src/folderview.c
                don't show 'Search folder...' on popup menu
                if folder has no mails in it
 
 2004-01-17 [keith]     0.9.8claws33
+
        * src/compose.c
          src/prefs_common.c
          src/prefs_common.h
index c6ab261..83875df 100644 (file)
@@ -1,3 +1,8 @@
+2004-01-20
+
+       * src/gtkstext.c: find_line_params(): ¥ï¡¼¥É¥é¥Ã¥×¥â¡¼¥É¤Î¤È¤­
+         ¥Þ¥ë¥Á¥Ð¥¤¥Èʸ»ú´Ö¤Ç¤â²þ¹Ô¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
 2004-01-05
 
        * src/codeconv.c: conv_iconv_strdup(): LP64 ´Ä¶­¤Ç¤Î¥¯¥é¥Ã¥·¥å¤ò½¤Àµ
index 9afa68c..8dadb46 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=34
+EXTRA_VERSION=35
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
index 52b2ad8..08d2383 100644 (file)
@@ -36,7 +36,7 @@
 
 #include <ctype.h>
 #include <string.h>
-
+#include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdki18n.h>
 #include <gtk/gtkmain.h>
@@ -5227,11 +5227,17 @@ find_line_params (GtkSText* text,
                      
                      if (text->use_wchar)
                        {
+                         gchar mb[MB_LEN_MAX];
+
                          while (!gdk_iswspace (GTK_STEXT_INDEX (text, lp.end.index)) &&
                                 (lp.end.index > lp.start.index))
                            {
                              decrement_mark (&lp.end);
                              lp.displayable_chars -= 1;
+
+                             /* multibyte chars are always breakable */
+                             if (wctomb (mb, GTK_STEXT_INDEX (text, lp.end.index)) > 1)
+                               break;
                            }
                        }
                      else