Bug #729084 - Use tel: URI instead of callto: for phone numbers

This change does a bit more, actually:
- learn the code of "tel" URI, being handler similar to "sip", "callto", "h323"
- generate tel: URIs for phone numbers, but only if the leading character of the
  phone number is a plus ("+") sign
- always remove spaces in href part in the e_text_to_html() when
  E_TEXT_TO_HTML_URL_IS_WHOLE_TEXT flag is set

1 files changed, 14 insertions, 1 deletions

diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index 260e26bdc0..9187b75057 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -231,7 +231,7 @@ is_citation (const guchar *c,
  *     user will only see "www.example.com")
  *
  *   - E_TEXT_TO_HTML_URL_IS_WHOLE_TEXT: set when the whole @input text
- *     represents a URL
+ *     represents a URL; any spaces are removed in the href part.
  *
  * Returns: a newly-allocated string containing HTML
  **/
@@ -302,6 +302,7 @@ e_text_to_html_full (const gchar *input,
 			    !g_ascii_strncasecmp ((gchar *) cur, "callto:", 7) ||
 			    !g_ascii_strncasecmp ((gchar *) cur, "h323:", 5) ||
 			    !g_ascii_strncasecmp ((gchar *) cur, "sip:", 4) ||
+			    !g_ascii_strncasecmp ((gchar *) cur, "tel:", 4) ||
 			    !g_ascii_strncasecmp ((gchar *) cur, "webcal:", 7)) {
 				tmpurl = url_extract (&cur, TRUE, (flags & E_TEXT_TO_HTML_URL_IS_WHOLE_TEXT) != 0);
 				if (tmpurl) {
@@ -335,6 +336,18 @@ e_text_to_html_full (const gchar *input,
 			}
 
 			if (tmpurl) {
+				if ((flags & E_TEXT_TO_HTML_URL_IS_WHOLE_TEXT) != 0) {
+					/* also remove any spaces in refurl */
+					gchar *replaced, **split_url;
+
+					split_url = g_strsplit (refurl, " ", 0);
+					replaced = g_strjoinv ("", split_url);
+					g_strfreev (split_url);
+
+					g_free (refurl);
+					refurl = replaced;
+				}
+
 				out = check_size (
 					&buffer, &buffer_size, out,
 					strlen (refurl) +