2005-06-21 [colin] 1.9.11cvs85

	* src/textview.c
		Prevent email addresses from spanning accross
		lines - fixes bug # 646 (newline-chars in
		email addresses)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index aa92848583384ab449a90a5bb0b0e9efe3e26f86..3c3a759f518a79096c2ae151775eccfed90e47e4 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-06-21 [colin]     1.9.11cvs85
+
+       * src/textview.c
+               Prevent email addresses from spanning accross
+               lines - fixes bug # 646 (newline-chars in 
+               email addresses)
+
 2005-06-20 [colin]     1.9.11cvs84
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index a5d3668e5c187bb5a5749930ca603679ac9a4c8d..321b8435166808ffd4bbb44496fe7e74495e006c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -573,3 +573,4 @@
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/imap_gtk.c;  ) > 1.9.11cvs82.patchset
 ( cvs diff -u -r 1.207.2.42 -r 1.207.2.43 src/folderview.c;  cvs diff -u -r 1.179.2.35 -r 1.179.2.36 src/imap.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/imap_gtk.c;  cvs diff -u -r 1.79.2.12 -r 1.79.2.13 src/mh.c;  cvs diff -u -r 1.83.2.33 -r 1.83.2.34 src/mimeview.c;  ) > 1.9.11cvs83.patchset
 ( cvs diff -u -r 1.213.2.35 -r 1.213.2.36 src/folder.c;  ) > 1.9.11cvs84.patchset
+( cvs diff -u -r 1.96.2.57 -r 1.96.2.58 src/textview.c;  ) > 1.9.11cvs85.patchset

diff --git a/configure.ac b/configure.ac
index 7730de1eab430e6c257dbadba49428e602b7c6b3..040569758bd1912ee3fa689976dec4abe1caa6e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=84
+EXTRA_VERSION=85
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/textview.c b/src/textview.c
index 24b8199b0ccfea5634cde94b81227ef702c2bdb2..f70e83013e061ee53bd0766aeabf309e728a8e5b 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1078,7 +1078,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 */
-                       } else if (!strchr(",;:=?./+<>!&", *bp_)) {
+                       } else if (!strchr(",;:=?./+<>!&\r\n\t", *bp_)) {
                                /* but anything not being a punctiation
                                   is ok */
                        } else {