From cfd46b1d74a13b1b8066bc64dfdabf43d49d2f2d Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Fri, 22 May 2009 12:24:59 +0200 Subject: [PATCH] Fixes NB#118220, properly hyperlinkify URL's. We were not parsing "&" and "?" characters because we're assuming that they were previously escaped --- src/modest-text-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c index 6bba7f1..7a89d08 100644 --- a/src/modest-text-utils.c +++ b/src/modest-text-utils.c @@ -109,8 +109,8 @@ struct _url_match_t { /* note: match MARK_AMP_URI_STR as well, because after txt->html, a '&' will look like $(MARK_AMP_URI_STR)"amp;" */ #define MAIL_VIEWER_URL_MATCH_PATTERNS { \ - { "(feed:|)(file|rtsp|http|ftp|https|mms|mmsh|webcal|feed|rtsp|rdp|lastfm|sip)://[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR \ - "]+[-a-z0-9_$%" MARK_AMP_URI_STR "=?/~#]", \ + { "(feed:|)(file|rtsp|http|ftp|https|mms|mmsh|webcal|feed|rtsp|rdp|lastfm|sip)://[-a-z0-9_$.+!*(),;:@%=\?/~#&" MARK_AMP_URI_STR \ + "]+[-a-z0-9_$%&" MARK_AMP_URI_STR "=?/~#]", \ NULL, NULL },\ { "www\\.[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR "]+[-a-z0-9_$%" MARK_AMP_URI_STR "=?/~#]",\ NULL, "http://" }, \ -- 1.7.9.5