[evolution-patches] Fix for Bug 328322[gtkhtml]

[Rohini <srohini novell com>]

Hi

Attached Fix for Bug 328322 – sftp URLs get highlighted as ftp URLs

Please Review.


Thanks,
Rohini

Index: htmltext.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltext.c,v
retrieving revision 1.286
diff -u -p -r1.286 htmltext.c
--- htmltext.c	16 Jan 2006 06:25:22 -0000	1.286
+++ htmltext.c	27 Jan 2006 05:07:17 -0000
@@ -2933,7 +2933,7 @@ struct _HTMLMagicInsertMatch
 typedef struct _HTMLMagicInsertMatch HTMLMagicInsertMatch;
 
 static HTMLMagicInsertMatch mim [] = {
-	{ "(news|telnet|nttp|file|http|ftp|https)://([-a-z0-9]+(:[-a-z0-9]+)?@)?[-a-z0-9.]+[-a-z0-9](:[0-9]*)?(([.])?/[-a-z0-9_$.+!*(),;:@%&=?/~#]*[^]'.}>\\) ,?!;:\"]?)?", NULL, NULL },
+	{ "(news|telnet|nttp|file|http|ftp|sftp|https)://([-a-z0-9]+(:[-a-z0-9]+)?@)?[-a-z0-9.]+[-a-z0-9](:[0-9]*)?(([.])?/[-a-z0-9_$.+!*(),;:@%&=?/~#]*[^]'.}>\\) ,?!;:\"]?)?", NULL, NULL },
 	{ "www\\.[-a-z0-9.]+[-a-z0-9](:[0-9]*)?(([.])?/[-A-Za-z0-9_$.+!*(),;:@%&=?/~#]*[^]'.}>\\) ,?!;:\"]?)?", NULL, "http://"; },
 	{ "ftp\\.[-a-z0-9.]+[-a-z0-9](:[0-9]*)?(([.])?/[-A-Za-z0-9_$.+!*(),;:@%&=?/~#]*[^]'.}>\\) ,?!;:\"]?)?", NULL, "ftp://"; },
 	{ "[-_a-z0-9.'\\+]+ [-_a-z0-9 ]+", NULL, "mailto:"; }
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.2153
diff -u -p -r1.2153 ChangeLog
--- ChangeLog	16 Jan 2006 06:25:21 -0000	1.2153
+++ ChangeLog	27 Jan 2006 05:11:03 -0000
@@ -1,3 +1,9 @@
+2006-01-27  Rohini S  <srohini novell com>
+
+	* htmltext.c: Changed regular expression to match sftp url's too.
+
+	Fixes bug #328322
+
 2006-01-16  Srinivasa Ragavan  <sragavan novell com>
 
 	** Fixes bug #256142 (Committing Rohini's patch)

Index: camel-mime-filter-tohtml.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-mime-filter-tohtml.c,v
retrieving revision 1.20
diff -u -p -r1.20 camel-mime-filter-tohtml.c
--- camel-mime-filter-tohtml.c	31 Aug 2005 04:21:56 -0000	1.20
+++ camel-mime-filter-tohtml.c	27 Jan 2006 05:28:39 -0000
@@ -53,6 +53,7 @@ static struct {
 } patterns[] = {
 	{ CONVERT_WEB_URLS, { "file://",   "",        camel_url_file_start,     camel_url_file_end     } },
 	{ CONVERT_WEB_URLS, { "ftp://";,    "",        camel_url_web_start,      camel_url_web_end      } },
+	{ CONVERT_WEB_URLS, { "sftp://";,   "",        camel_url_web_start,      camel_url_web_end      } },
 	{ CONVERT_WEB_URLS, { "http://";,   "",        camel_url_web_start,      camel_url_web_end      } },
 	{ CONVERT_WEB_URLS, { "https://";,  "",        camel_url_web_start,      camel_url_web_end      } },
 	{ CONVERT_WEB_URLS, { "news://";,   "",        camel_url_web_start,      camel_url_web_end      } },
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/ChangeLog,v
retrieving revision 1.2518
diff -u -p -r1.2518 ChangeLog
--- ChangeLog	25 Jan 2006 08:28:32 -0000	1.2518
+++ ChangeLog	27 Jan 2006 05:29:14 -0000
@@ -1,3 +1,9 @@
+2006-01-27  Rohini S  <srohini novell com>
+
+	** Fixes bug #328322
+
+	* camel-mime-filter-tohtml.c : add new pattern for sftp urls.
+
 2006-01-25  Not Zed  <NotZed Ximian com>
  
  	* camel-folder-search.c (search_match_threads): add new