X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=deb2971688832d6fcdbda925349c52984a7cb1a4;hp=9619c8d032c1966f5efc3d78f94af178b806d607;hb=506d8ddd3ac4f45ad5fffb7d2ec83d306fc6f19b;hpb=5052d923fe6b1ab99eb502b4421006d9334196b5
diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 9619c8d..deb2971 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -906,6 +906,7 @@ modest_text_utils_quote_body (GString *output, const gchar *text,
iter = text;
len = strlen(text);
+ remaining = g_string_new ("");
do {
l = get_next_line (text, len, iter);
iter = iter + l->len + 1;
@@ -1004,13 +1005,17 @@ modest_text_utils_quote_html (const gchar *text,
"\n
\n");
if (text || cite || signature) {
+ GString *quoted_text;
g_string_append (result_string, "\n");
if (signature) {
quote_html_add_to_gstring (result_string, SIGNATURE_MARKER);
quote_html_add_to_gstring (result_string, signature);
}
quote_html_add_to_gstring (result_string, cite);
- quote_html_add_to_gstring (result_string, text);
+ quoted_text = g_string_new ("");
+ quoted_text = modest_text_utils_quote_body (quoted_text, text, ">", limit);
+ quote_html_add_to_gstring (result_string, quoted_text->str);
+ g_string_free (quoted_text, TRUE);
if (attachments) {
gchar *attachments_string = quoted_attachments (attachments);
quote_html_add_to_gstring (result_string, attachments_string);
@@ -1650,8 +1655,10 @@ modest_text_utils_get_display_size (guint64 size)
const guint MB=1024 * KB;
const guint GB=1024 * MB;
+ if (size == 0)
+ return g_strdup_printf (_FM("sfil_li_size_kb"));
if (0 <= size && size < KB)
- return g_strdup_printf (_FM("sfil_li_size_kb"), 1);
+ return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), 1);
else if (KB <= size && size < 100 * KB)
return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), size / KB);
else if (100*KB <= size && size < MB)