tomboy r2395 - in trunk: . Tomboy

[sharm svn gnome org]

Author: sharm
Date: Mon Mar  2 21:51:41 2009
New Revision: 2395
URL: http://svn.gnome.org/viewvc/tomboy?rev=2395&view=rev

Log:
* NEWS: Add Florian's full name.

* Tomboy/Watchers.cs: Patch from Benjamin Podszun to support HTTP URLs
  with the '@' symbol. Fixes bug #573317.

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/Tomboy/Watchers.cs

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Mar  2 21:51:41 2009
@@ -14,7 +14,7 @@
 * Windows installer now requires Novell's GTK# >= 2.12.8 (#569324).
 * Increase/Decrease Indent shortcuts now appear in menu (#570334, Benjamin Podszun).
 * No longer writes to disk every 40 seconds (#514434).
-* Fixes to note linking (#323845, Florian).
+* Fixes to note linking (#323845, Florian Pinault).
 * Add GConf preference for auto-accepting SSL Certs in WebDAV sync (#531364).
 * After succcessfully configuring sync, offer to perform first sync (#553079).
 * Other fixes: #570917, #570918.

Modified: trunk/Tomboy/Watchers.cs
==============================================================================
--- trunk/Tomboy/Watchers.cs	(original)
+++ trunk/Tomboy/Watchers.cs	Mon Mar  2 21:51:41 2009
@@ -444,9 +444,9 @@
 				url = "file://" +
 				      Path.Combine (Environment.GetEnvironmentVariable ("HOME"),
 				                    url.Substring (2));
-			else if (url.IndexOf ("@") > 1 &&
-			                url.IndexOf (".") > 3 &&
-			                !url.StartsWith ("mailto:";))
+			else if (Regex.IsMatch (url, 
+				@"^(?!(news|mailto|http|https|ftp|file|irc):) +  {2,}$",
+				RegexOptions.IgnoreCase))
 				url = "mailto:"; + url;
 
 			return url;