2005-02-13 [colin] 1.0.1cvs5.2

	* src/textview.c
		Fix email informative part parsing with
		accentued chars in it. ispunct() returns
		true for them in utf8...

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index eadb167505dfdc9328d6051a986a8b8736024ab8..9d4fab4d43520214ed45cadbbd45959b14dc4035 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-02-13 [colin]     1.0.1cvs5.2
+
+       * src/textview.c
+               Fix email informative part parsing with
+               accentued chars in it. ispunct() returns
+               true for them in utf8...
+

 2005-02-12 [colin]     1.0.1cvs5.1
 
        * src/filtering.c
 2005-02-12 [colin]     1.0.1cvs5.1
 
        * src/filtering.c

diff --git a/PATCHSETS b/PATCHSETS
index c09366b7a0d55075fa9f531cf0bdf0bf79374018..3b7fc435546b4ca3130596fbbd2a631f4a72b31d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -375,3 +375,4 @@
 ( cvs diff -u -r 1.96.2.44 -r 1.96.2.45 src/textview.c; ) > 1.0.1cvs4.4.patchset
 ( cvs diff -u -r 1.96.2.45 -r 1.96.2.46 src/textview.c; ) > 1.0.1cvs4.5.patchset
 ( cvs diff -u -r 1.60.2.4 -r 1.60.2.5 src/filtering.c; ) > 1.0.1cvs5.1.patchset
 ( cvs diff -u -r 1.96.2.44 -r 1.96.2.45 src/textview.c; ) > 1.0.1cvs4.4.patchset
 ( cvs diff -u -r 1.96.2.45 -r 1.96.2.46 src/textview.c; ) > 1.0.1cvs4.5.patchset
 ( cvs diff -u -r 1.60.2.4 -r 1.60.2.5 src/filtering.c; ) > 1.0.1cvs5.1.patchset

+( cvs diff -u -r 1.96.2.46 -r 1.96.2.47 src/textview.c; ) > 1.0.1cvs5.2.patchset

diff --git a/configure.ac b/configure.ac
index 102e164b196705d367cc50621ee25bd5a7015167..8cf1e697ac8ae946926597cebdf5bc9b6e58b07f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=5
 EXTRA_RELEASE=
 BINARY_AGE=0
 EXTRA_VERSION=5
 EXTRA_RELEASE=

-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2

 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/textview.c b/src/textview.c
index c5356b519a94e0058dcf5063b429b6c0df3c639e..831242566ec0c5a8cd78450b67dd958a4c76e811 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -985,7 +985,7 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
                        && (((bp_ + 1) < ep_)    && isalnum(*(bp_ + 1)))) {
                                /* hyphens are allowed, but only in
                                   between alnums */
                        && (((bp_ + 1) < ep_)    && isalnum(*(bp_ + 1)))) {
                                /* hyphens are allowed, but only in
                                   between alnums */

-                       } else if (!ispunct(*bp_)) {
+                       } else if (!strchr(",;:=?./+<>!&", *bp_)) {

                                /* but anything not being a punctiation
                                   is ok */
                        } else {
                                /* but anything not being a punctiation
                                   is ok */
                        } else {