Fixes FwNULL 15/16

[modest] / src / modest-text-utils.c

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 59f5cac..4203b03 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -109,7 +109,7 @@ 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  {                              \
-       { "(file|rtsp|http|ftp|https|mms|mmsh|webcal|feed|rtsp|rdp|lastfm)://[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR \
+       { "(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 "=?/~#]",\
@@ -1016,7 +1016,7 @@ modest_text_utils_quote_html (const gchar *text,
                }
                quote_html_add_to_gstring (result_string, cite);
                quoted_text = g_string_new ("");
-               quoted_text = modest_text_utils_quote_body (quoted_text, text, ">", limit);
+               quoted_text = modest_text_utils_quote_body (quoted_text, (text) ? text : "", ">", limit);
                quote_html_add_to_gstring (result_string, quoted_text->str);
                g_string_free (quoted_text, TRUE);
                if (attachments) {