sync with sylpheed 0.6.5cvs10

diff --git a/AUTHORS b/AUTHORS
index 11d7bb8..116aed5 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -94,3 +94,4 @@ contributors (beside the above; based on Changelog)
        KAJIWARA
        Hironori IWANE
        Manrat Chobchuen
+       Shimamoto "Neko" Tatsuya

diff --git a/ChangeLog b/ChangeLog
index 4597117..6e176f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-19
+
+       * src/textview.c: get_email_part(): replaced isalnum() with
+         the macro IS_ASCII_ALNUM() which restricts the range of
+         characters to 7bit ASCII (thanks to Shimamoto).
+
 2001-11-18
 
        * src/textview.c: textview_show_part(): show headers on nested

diff --git a/ChangeLog.claws b/ChangeLog.claws
index ddda7e9..b4ee71d 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-11-19 [paul]      0.6.5claws21
+
+       * sync with sylpheed 0.6.5cvs10
+               see ChangeLog entry 2001-11-19
+
 2001-11-18 [alfons]    0.6.5claws20
        
        * src/filtering.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 9c612dc..694b1a2 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,9 @@
+2001-11-19
+
+       * src/textview.c: get_email_part(): isalnum() ¤òʸ»ú¤ÎÈϰϤò
+         7bit ASCII ¤ÎÈϰϤ˲¡¤µ¤¨¤ë¥Þ¥¯¥í IS_ASCII_ALNUM() ¤ÇÃÖ¤­´¹¤¨¤¿
+         (ÅçËܤµ¤ó thanks)¡£
+
 2001-11-18
 
        * src/textview.c: textview_show_part(): ¥Í¥¹¥È¤µ¤ì¤¿¥Þ¥ë¥Á¥Ñ¡¼¥È

diff --git a/configure.in b/configure.in
index 8e596d4..0e7e12b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws20
+EXTRA_VERSION=claws21
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/textview.c b/src/textview.c
index f96309c..c9ab5c9 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -486,8 +486,7 @@ static gboolean get_uri_part(const gchar *start, const gchar *scanpos,
         * should pass some URI type to this function and decide on that whether
         * to perform punctuation stripping */
 
-#define IS_REAL_PUNCT(ch) \
-       (ispunct(ch) && ((ch) != '/')) 
+#define IS_REAL_PUNCT(ch)      (ispunct(ch) && ((ch) != '/')) 
 
        for (; ep_ - 1 > scanpos + 1 && IS_REAL_PUNCT(*(ep_ - 1)); ep_--)
                ;
@@ -512,6 +511,8 @@ static gchar *make_uri_string(const gchar *bp, const gchar *ep)
         !isspace(ch) && \
         !strchr("()<>\"", (ch)))
 
+/* alphabet and number within 7bit ASCII */
+#define IS_ASCII_ALNUM(ch)     (isascii(ch) && isalnum(ch))
 #define IS_QUOTE(ch) ((ch) == '\'' || (ch) == '"')
 
 /* get_email_part() - retrieves an email address. Returns TRUE if succesful */
@@ -541,7 +542,7 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
 
        /* TODO: should start with an alnum? */
        bp_++;
-       for (; bp_ < scanpos && !isalnum(*bp_); bp_++)
+       for (; bp_ < scanpos && !IS_ASCII_ALNUM(*bp_); bp_++)
                ;
 
        if (bp_ != scanpos) {
@@ -550,7 +551,7 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
                        ;
 
                /* TODO: really should terminate with an alnum? */
-               for (; ep_ > scanpos  && !isalnum(*ep_); --ep_)
+               for (; ep_ > scanpos && !IS_ASCII_ALNUM(*ep_); --ep_)
                        ;
                ep_++;