Fix zoom in webkit view

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

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 5aab3a3..db45cde 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -297,12 +297,12 @@ 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)
+modest_text_utils_derived_subject (const gchar *subject, gboolean is_reply)
 {
-       gchar *tmp, *subject_dup, *retval;
-       gint prefix_len;
-
-       g_return_val_if_fail (prefix, NULL);
+       gchar *tmp, *subject_dup, *retval, *prefix;
+       const gchar *untranslated_prefix;
+       gint prefix_len, untranslated_prefix_len;
+       gboolean untranslated_found = FALSE;
 
        if (!subject || subject[0] == '\0')
                subject = _("mail_va_no_subject");
@@ -310,13 +310,23 @@ modest_text_utils_derived_subject (const gchar *subject, const gchar *prefix)
        subject_dup = g_strdup (subject);
        tmp = g_strchug (subject_dup);
 
+       prefix = (is_reply) ? _("mail_va_re") : _("mail_va_fw");
+       prefix = g_strconcat (prefix, ":", NULL);
+       prefix_len = g_utf8_strlen (prefix, -1);
+
+       untranslated_prefix =  (is_reply) ? "Re:" : "Fw:";
+       untranslated_prefix_len = 3;
+
        /* 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 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;
 
@@ -338,8 +348,9 @@ modest_text_utils_derived_subject (const gchar *subject, const gchar *prefix)
                }
        } while (tmp);
 
-       retval = g_strdup_printf ("%s %s", prefix, tmp);
+       retval = g_strdup_printf ("%s %s", (untranslated_found) ? untranslated_prefix : prefix, tmp);
        g_free (subject_dup);
+       g_free (prefix);
 
        return retval;
 }
@@ -489,7 +500,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 (html, " ");
+                       g_string_append (html, " ");
                        space_seen = FALSE;
                }
                
@@ -519,7 +530,7 @@ modest_text_utils_convert_buffer_to_html_start (GString *html, const gchar *data
 
                /* don't convert ' --> wpeditor will try to re-convert it... */    
                //case '\'' : g_string_append (html, "'"); break;
-               case '\n' : g_string_append (html, "<br>\n");break_dist= 0; break;
+               case '\n' : g_string_append (html, "<br/>\n");break_dist= 0; break;
                case '\t' : g_string_append (html, MARK_AMP_STR "nbsp;" MARK_AMP_STR "nbsp;" MARK_AMP_STR "nbsp; ");
                        break_dist=0; break; /* note the space at the end*/
                case ' ':
@@ -1807,19 +1818,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"), (int) 0);
+               return g_strdup_printf (_FM_SIZE_KB, (int) 0);
        if (0 <= size && size < KB)
-               return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), (int) 1);
+               return g_strdup_printf (_FM_SIZE_1KB_99KB, (int) 1);
        else if (KB <= size && size < 100 * KB)
-               return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), (int) size / KB);
+               return g_strdup_printf (_FM_SIZE_1KB_99KB, (int) size / KB);
        else if (100*KB <= size && size < MB)
-               return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), (int) size / KB);
+               return g_strdup_printf (_FM_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);
+               return g_strdup_printf (_FM_SIZE_1MB_10MB, (float) size / MB);
        else if (10*MB <= size && size < GB)
-               return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), (float) size / MB);
+               return g_strdup_printf (_FM_SIZE_10MB_1GB, (float) size / MB);
        else
-               return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), (float) size / GB);
+               return g_strdup_printf (_FM_SIZE_1GB_OR_GREATER, (float) size / GB);
 }
 
 static gchar *