* Fixes NB#87346 do not generate nested "Fw:" or "Re:"

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

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index e2802d8..6e89e71 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -288,21 +288,33 @@ modest_text_utils_strftime(char *s, gsize max, const char *fmt, time_t timet)
 gchar *
 modest_text_utils_derived_subject (const gchar *subject, const gchar *prefix)
 {
-       gchar *tmp;
+       gchar *tmp, *subject_dup, *retval;
+       gint prefix_len;
 
        g_return_val_if_fail (prefix, NULL);
 
        if (!subject || subject[0] == '\0')
                subject = _("mail_va_no_subject");
 
-       tmp = g_strchug (g_strdup (subject));
+       subject_dup = g_strdup (subject);
+       tmp = g_strchug (subject_dup);
 
-       if (!strncmp (tmp, prefix, strlen (prefix))) {
-               return tmp;
-       } else {
-               g_free (tmp);
-               return g_strdup_printf ("%s %s", prefix, subject);
-       }
+       /* We do not want things like "Re: Re: Re:" or "Fw: Fw:" so
+          delete the previous ones */
+       prefix_len = strlen (prefix);
+       do {
+               if (g_str_has_prefix (tmp, prefix)) {
+                       tmp += prefix_len;
+                       tmp = g_strchug (tmp);
+               } else {
+                       break;
+               }
+       } while (tmp);
+
+       retval = g_strdup_printf ("%s %s", prefix, tmp);
+       g_free (subject_dup);
+
+       return retval;
 }
 
 gchar*
@@ -1373,10 +1385,8 @@ modest_text_utils_validate_folder_name (const gchar *folder_name)
 
        /* Cannot contain Windows port numbers. I'd like to use GRegex
           but it's still not available in Maemo. sergio */
-       if (g_str_has_prefix (folder_name, "LTP") ||
-           g_str_has_prefix (folder_name, "ltp") ||
-           g_str_has_prefix (folder_name, "COM") ||
-           g_str_has_prefix (folder_name, "com")) {
+       if (g_ascii_strncasecmp (folder_name, "LPT", 3) ||
+           g_ascii_strncasecmp (folder_name, "COM", 3)) {
                glong val;
                gchar *endptr;