X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=fb4da8426d6a96c8a42a6552903a0649aff382ee;hp=2fa0e3b23f172d28981aaf0a49ce2a955d6381f4;hb=12a672c559d983c4e49a7e4054ee14c0177ecb1c;hpb=f334560f1bcf72748987e6a35f17ad14b31e80e6;ds=sidebyside

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 2fa0e3b..fb4da84 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -302,7 +302,8 @@ modest_text_utils_derived_subject (const gchar *subject, gboolean is_reply)
 	gchar *tmp, *subject_dup, *retval, *prefix;
 	const gchar *untranslated_prefix;
 	gint prefix_len, untranslated_prefix_len;
-	gboolean untranslated_found = FALSE;
+	gboolean translated_found = FALSE;
+	gboolean first_time;
 
 	if (!subject || subject[0] == '\0')
 		subject = _("mail_va_no_subject");
@@ -319,14 +320,18 @@ modest_text_utils_derived_subject (const gchar *subject, gboolean is_reply)
 
 	/* We do not want things like "Re: Re: Re:" or "Fw: Fw:" so
 	   delete the previous ones */
+	first_time = TRUE;
 	do {
 		if (g_str_has_prefix (tmp, prefix)) {
 			tmp += prefix_len;
 			tmp = g_strchug (tmp);
+			/* Do not consider translated prefixes in the
+			   middle of a Re:Re:..Re: like sequence */
+			if (G_UNLIKELY (first_time))
+				translated_found = TRUE;
 		} else if (g_str_has_prefix (tmp, untranslated_prefix)) {
 			tmp += untranslated_prefix_len;
 			tmp = g_strchug (tmp);
-			untranslated_found = TRUE;
 		} else {
 			gchar *prefix_down, *tmp_down;
 
@@ -346,9 +351,20 @@ modest_text_utils_derived_subject (const gchar *subject, gboolean is_reply)
 				break;
 			}
 		}
+		first_time = FALSE;
 	} while (tmp);
 
-	retval = g_strdup_printf ("%s %s", (untranslated_found) ? untranslated_prefix : prefix, tmp);
+	if (!g_strcmp0 (subject, tmp)) {
+		/* normal case */
+		retval = g_strdup_printf ("%s %s", untranslated_prefix, tmp);
+	} else {
+		if (translated_found) {
+			/* Found a translated prefix, i.e, "VS:" in Finish */
+			retval = g_strdup_printf ("%s %s", prefix, tmp);
+		} else {
+			retval = g_strdup_printf ("%s %s", untranslated_prefix, tmp);
+		}
+	}
 	g_free (subject_dup);
 	g_free (prefix);
 
@@ -636,7 +652,7 @@ modest_text_utils_get_addresses_indexes (const gchar *addresses, GSList **start_
 			gchar *next_char = g_utf8_next_char (cur);
 
 			if (!g_utf8_strchr (start, (cur - start + 1), g_utf8_get_char ("@")) &&
-			    next_char && *next_char != '\n')
+			    next_char && *next_char != '\n' && *next_char != '\0')
 				continue;
 
 			start_index = g_new0 (gint, 1);
@@ -2177,8 +2193,7 @@ static void
 quote_name_part (GString **str, gchar **cur, gchar **start)
 {
 	gchar *blank;
-	gint str_len = g_utf8_pointer_to_offset (*start, *cur) -
-		g_utf8_pointer_to_offset (*start, *start);
+	gint str_len = *cur - *start;
 
 	while (**start == ' ') {
 		*start = g_utf8_next_char (*start);