From: Colin Leroy <colin@colino.net>
Date: Mon, 8 Nov 2004 12:53:16 +0000 (+0000)
Subject: 2004-11-08 [colin]	0.9.12cvs141
X-Git-Tag: rel_0_9_13~54
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=7da336a5e950705e461c6f62bda6d1d44c6cc1bc

2004-11-08 [colin]	0.9.12cvs141

	* src/textview.c
		fix "colin@colino.net" <colin@colino.net>
		types of URIs
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index f405d3248..e86625751 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-11-08 [colin]	0.9.12cvs141
+
+	* src/textview.c
+		fix "colin@colino.net" <colin@colino.net> 
+		types of URIs
+
 2004-11-06 [colin]	0.9.12cvs140
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
index 102edd23c..5144fe1a2 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -123,3 +123,4 @@
 ( cvs diff -u -r 1.74 -r 1.75 po/POTFILES.in; cvs diff -u -r 1.4 -r 1.5 src/prefs_ext_prog.c; cvs diff -u -r 1.3 -r 1.4 tools/kdeservicemenu/template_sylpheed-attach-files.desktop; cvs diff -u -r 1.3 -r 1.4 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop; ) > 0.9.12cvs138.patchset
 ( cvs diff -u -r 1.3087 -r 1.3088 ChangeLog.claws; cvs diff -u -r 1.451 -r 1.452 src/compose.c; cvs diff -u -r 1.90 -r 1.91 src/procmime.c; cvs diff -u -r 1.1 -r 1.2 src/plugins/trayicon/README; ) > 0.9.12cvs139.patchset
 ( cvs diff -u -r 1.452 -r 1.453 src/compose.c; ) > 0.9.12cvs140.patchset
+( cvs diff -u -r 1.126 -r 1.127 src/textview.c; ) > 0.9.12cvs141.patchset
diff --git a/configure.ac b/configure.ac
index d2ba0d950..c0d99ebb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=140
+EXTRA_VERSION=141
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
diff --git a/src/textview.c b/src/textview.c
index c95c9f64d..cbf9ed295 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1004,7 +1004,7 @@ static void textview_make_clickable_parts(TextView *textview,
 		const gchar	*bp, *ep;	/* text position */
 		gint		 pti;		/* index in parse table */
 		struct txtpos	*next;		/* next */
-	} head = {NULL, NULL, 0,  NULL}, *last = &head;
+	} head = {NULL, NULL, 0,  NULL}, *last = &head, *next = NULL;
 
 	GtkSText *text = GTK_STEXT(textview->text);
 
@@ -1047,7 +1047,15 @@ static void textview_make_clickable_parts(TextView *textview,
 		for (last = head.next; last != NULL;
 		     normal_text = last->ep, last = last->next) {
 			RemoteURI *uri;
-
+			next = last->next;
+			/* fix "colin@colino.net" <colin@colino.net> types of URIs
+			/* FIXME would be better to fix it in the email parser */
+			if (next && next->bp == last->ep) {
+				next->bp = last->bp;
+				if (*(next->bp -1 )=='"' && strchr(next->bp, '"'))
+					next->bp--;
+				continue;
+			}
 			uri = g_new(RemoteURI, 1);
 			if (last->bp - normal_text > 0)
 				gtk_stext_insert(text, font,