X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=d228e17b9fd42fad5890b6cf142b38118418e332;hp=62bd6bb5c8c38d295989a1c794af9b2dd6999c08;hb=e374da56f67092cecb1572dd4bee2ca34e0bc04c;hpb=e45958deaf9701399c552ea0d84c2447efacd4ca

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 62bd6bb..d228e17 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -278,6 +278,11 @@ modest_text_utils_strftime(char *s, gsize max, const char *fmt, time_t timet)
 {
         struct tm tm;
 
+	/* To prevent possible problems in strftime that could leave
+	   garbage in the s variable */
+	if (s)
+		s[0] = '\0';
+
 	/* does not work on old maemo glib: 
 	 *   g_date_set_time_t (&date, timet);
 	 */
@@ -621,8 +626,17 @@ modest_text_utils_split_addresses_list (const gchar *addresses)
 	/* nope, we are at the start of some address
 	 * now, let's find the end of the address */
 	end = my_addrs + 1;
-	while (end[0] && end[0] != ',' && end[0] != ';')
+	while (end[0] && end[0] != ';') {
+		if (end[0] == '\"') {
+			while (end[0] && end[0] != '\"')
+				++end;
+		}
+		if ((end[0] && end[0] == '>')&&(end[1] && end[1] == ',')) {
+			++end;
+			break;
+		}
 		++end;
+	}
 
 	/* we got the address; copy it and remove trailing whitespace */
 	addr = g_strndup (my_addrs, end - my_addrs);
@@ -995,7 +1009,7 @@ cmp_offsets_reverse (const url_match_t *match1, const url_match_t *match2)
 	return match2->offset - match1->offset;
 }
 
-static gboolean url_matches_block = 0;
+static gint url_matches_block = 0;
 static url_match_pattern_t patterns[] = MAIL_VIEWER_URL_MATCH_PATTERNS;
 
 
@@ -1346,10 +1360,11 @@ modest_text_utils_get_display_date (time_t date)
 
 	/* if it's today, show the time, if it's not today, show the date instead */
 
+	/* TODO: take into account the system config for 24/12h */
 	if (day == date_day) /* is the date today? */
-		modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, "%X", date);
+		modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, _HL("wdgt_va_24h_time"), date);
 	else 
-		modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, "%x", date); 
+		modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, _HL("wdgt_va_date"), date); 
 
 	return date_buf; /* this is a static buffer, don't free! */
 }