X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-text-utils.c;h=f1c40b4f811e468569fb669dffeefc58dcaf7fc7;hb=8d4419037aad046e1587b0df5dc9acff343adaf4;hp=f2d9242509db8429ca6964b9d5762950d37ce5c7;hpb=fa8f6bccc4b6a4f8725848ac8f2c655603266e59;p=modest

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index f2d9242..f1c40b4 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -109,14 +109,14 @@ 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|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 "=?/~#]",\
 			NULL, "http://" },				\
 	{ "ftp\\.[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR "]+[-a-z0-9_$%" MARK_AMP_URI_STR "=?/~#]",\
 	  NULL, "ftp://" },\
-	{ "(jabberto|voipto|sipto|sip|chatto|xmpp):[-_a-z@0-9.+]+", \
+	{ "(jabberto|voipto|sipto|sip|chatto|skype|xmpp):[-_a-z@0-9.+]+", \
 	   NULL, NULL},						    \
 	{ "mailto:[-_a-z0-9.\\+]+@[-_a-z0-9.]+",		    \
 	  NULL, NULL},\
@@ -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) {
@@ -1661,19 +1663,19 @@ modest_text_utils_get_display_size (guint64 size)
 	const guint GB=1024 * MB;
 
 	if (size == 0)
-		return g_strdup_printf (_FM("sfil_li_size_kb"), 0);
+		return g_strdup_printf (_FM("sfil_li_size_kb"), (int) 0);
 	if (0 <= size && size < KB)
-		return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), 1);
+		return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), (int) 1);
 	else if (KB <= size && size < 100 * KB)
-		return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), size / KB);
+		return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), (int) size / KB);
 	else if (100*KB <= size && size < MB)
 		return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), (float) size / MB);
 	else if (MB <= size && size < 10*MB)
 		return g_strdup_printf (_FM("sfil_li_size_1mb_10mb"), (float) size / MB);
 	else if (10*MB <= size && size < GB)
-		return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), size / MB);
+		return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), (int) size / MB);
 	else
-		return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), (float) size / GB);	
+		return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), (float) size / GB);
 }
 
 static gchar *
@@ -1690,11 +1692,11 @@ get_email_from_address (const gchar * address)
 		return g_strndup (left_limit + 1, (right_limit - left_limit) - 1);
 }
 
-gchar *      
+gchar *
 modest_text_utils_get_color_string (GdkColor *color)
 {
 	g_return_val_if_fail (color, NULL);
-	
+
 	return g_strdup_printf ("#%x%x%x%x%x%x%x%x%x%x%x%x",
 				(color->red >> 12)   & 0xf, (color->red >> 8)   & 0xf,
 				(color->red >>  4)   & 0xf, (color->red)        & 0xf,