Fixes NB#124324, remove the original instance of "Fw:" in any of its forms ("FW:...

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

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index a644625..99c4bf6 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -316,7 +316,23 @@ modest_text_utils_derived_subject (const gchar *subject, const gchar *prefix)
                        tmp += prefix_len;
                        tmp = g_strchug (tmp);
                } else {
-                       break;
+                       gchar *prefix_down, *tmp_down;
+
+                       /* We need this to properly check the cases of
+                          some clients adding FW: instead of Fw: for
+                          example */
+                       prefix_down = g_utf8_strdown (prefix, -1);
+                       tmp_down = g_utf8_strdown (tmp, -1);
+                       if (g_str_has_prefix (tmp_down, prefix_down)) {
+                               tmp += prefix_len;
+                               tmp = g_strchug (tmp);
+                               g_free (prefix_down);
+                               g_free (tmp_down);
+                       } else {
+                               g_free (prefix_down);
+                               g_free (tmp_down);
+                               break;
+                       }
                }
        } while (tmp);
 
@@ -416,6 +432,9 @@ modest_text_utils_remove_duplicate_addresses (const gchar *address_list)
        g_slist_foreach (addresses, (GFunc)g_free, NULL);
        g_slist_free (addresses);
 
+       if (new_list == NULL)
+               new_list = g_strdup ("");
+
        return new_list;
 }
 
@@ -435,7 +454,7 @@ modest_text_utils_convert_buffer_to_html_start (GString *html, const gchar *data
                guchar kar = data[i];
                
                if (space_seen && kar != ' ') {
-                       g_string_append_c (html, ' ');
+                       g_string_append (html, " ");
                        space_seen = FALSE;
                }
                
@@ -1713,11 +1732,11 @@ modest_text_utils_get_display_size (guint64 size)
        else if (KB <= size && size < 100 * 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);
+               return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), (int) size / KB);
        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"), (int) size / MB);
+               return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), (float) size / MB);
        else
                return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), (float) size / GB);
 }
@@ -1952,3 +1971,39 @@ modest_text_utils_simplify_recipients (const gchar *recipients)
        return g_string_free (result, FALSE);
 
 }
+
+GSList *
+modest_text_utils_remove_duplicate_addresses_list (GSList *address_list)
+{
+       GSList *new_list, *iter;
+       GHashTable *table;
+
+       g_return_val_if_fail (address_list, NULL);
+
+       table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
+       new_list = address_list;
+       iter = address_list;
+       while (iter) {
+               const gchar* address = (const gchar*)iter->data;
+
+               /* We need only the email to just compare it and not
+                  the full address which would make "a <a@a.com>"
+                  different from "a@a.com" */
+               const gchar *email = get_email_from_address (address);
+
+               /* ignore the address if already seen */
+               if (g_hash_table_lookup (table, email) == 0) {
+                       g_hash_table_insert (table, (gchar*)email, GINT_TO_POINTER(1));
+                       iter = g_slist_next (iter);
+               } else {
+                       GSList *tmp = g_slist_next (iter);
+                       new_list = g_slist_delete_link (new_list, iter);
+                       iter = tmp;
+               }
+       }
+
+       g_hash_table_unref (table);
+
+       return new_list;
+}