X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=7ec2073137740f5d0c4f7c280fc1bd0f8773e41b;hb=b040738627a96d38202e5c876664d8cbe47bffc8;hp=614db37bf760e6b9f699d53b5fd6be3b23674aa1;hpb=dbdd198e6a3f3190425ce030e4d7dbf26195398d;p=modest

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 614db37..7ec2073 100644
--- 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|sip)://[-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 "=?/~#]",\
@@ -286,6 +286,8 @@ modest_text_utils_strftime(char *s, gsize max, const char *fmt, time_t timet)
 	   garbage in the s variable */
 	if (s)
 		s[0] = '\0';
+	else
+		return 0;
 
 	/* does not work on old maemo glib: 
 	 *   g_date_set_time_t (&date, timet);
@@ -1016,7 +1018,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) {