|
 |
f0a9c3 |
From 6022b2b7816fea84919eef5993363f636bf734dc Mon Sep 17 00:00:00 2001
|
|
|
f0a9c3 |
From: Milan Crha <mcrha@redhat.com>
|
|
|
f0a9c3 |
Date: Mon, 3 Sep 2018 09:43:50 +0200
|
|
|
f0a9c3 |
Subject: evo-I#86 - Quoting of plain text mail into HTML mode mangles deeper
|
|
|
f0a9c3 |
levels
|
|
|
f0a9c3 |
|
|
|
f0a9c3 |
Related to https://gitlab.gnome.org/GNOME/evolution/issues/86
|
|
|
f0a9c3 |
|
|
|
f0a9c3 |
diff --git a/src/camel/camel-mime-filter-tohtml.c b/src/camel/camel-mime-filter-tohtml.c
|
|
|
f0a9c3 |
index 07024aa1a..df6283655 100644
|
|
|
f0a9c3 |
--- a/src/camel/camel-mime-filter-tohtml.c
|
|
|
f0a9c3 |
+++ b/src/camel/camel-mime-filter-tohtml.c
|
|
|
f0a9c3 |
@@ -303,6 +303,7 @@ html_convert (CamelMimeFilter *mime_filter,
|
|
|
f0a9c3 |
outend = mime_filter->outbuf + mime_filter->outsize;
|
|
|
f0a9c3 |
|
|
|
f0a9c3 |
if (priv->flags & CAMEL_MIME_FILTER_TOHTML_PRE && !priv->pre_open) {
|
|
|
f0a9c3 |
+ outptr = check_size (mime_filter, outptr, &outend, 6);
|
|
|
f0a9c3 |
outptr = g_stpcpy (outptr, "");
|
|
|
f0a9c3 |
priv->pre_open = TRUE;
|
|
|
f0a9c3 |
}
|
|
|
f0a9c3 |
@@ -339,13 +340,13 @@ html_convert (CamelMimeFilter *mime_filter,
|
|
|
f0a9c3 |
|
|
|
f0a9c3 |
depth = citation_depth (start, inend, &skip);
|
|
|
f0a9c3 |
while (priv->blockquote_depth < depth) {
|
|
|
f0a9c3 |
- outptr = check_size (mime_filter, outptr, &outend, 30);
|
|
|
f0a9c3 |
- outptr = g_stpcpy (outptr, "\n");
|
|
|
f0a9c3 |
+ outptr = check_size (mime_filter, outptr, &outend, 25);
|
|
|
f0a9c3 |
+ outptr = g_stpcpy (outptr, "");
|
|
|
f0a9c3 |
priv->blockquote_depth++;
|
|
|
f0a9c3 |
}
|
|
|
f0a9c3 |
while (priv->blockquote_depth > depth) {
|
|
|
f0a9c3 |
- outptr = check_size (mime_filter, outptr, &outend, 15);
|
|
|
f0a9c3 |
- outptr = g_stpcpy (outptr, "\n");
|
|
|
f0a9c3 |
+ outptr = check_size (mime_filter, outptr, &outend, 14);
|
|
|
f0a9c3 |
+ outptr = g_stpcpy (outptr, "");
|
|
|
f0a9c3 |
priv->blockquote_depth--;
|
|
|
f0a9c3 |
}
|
|
|
f0a9c3 |
#if FOOLISHLY_UNMUNGE_FROM
|
|
|
f0a9c3 |
@@ -463,14 +464,14 @@ html_convert (CamelMimeFilter *mime_filter,
|
|
|
f0a9c3 |
outptr, &outend);
|
|
|
f0a9c3 |
|
|
|
f0a9c3 |
while (priv->blockquote_depth > 0) {
|
|
|
f0a9c3 |
- outptr = check_size (mime_filter, outptr, &outend, 15);
|
|
|
f0a9c3 |
+ outptr = check_size (mime_filter, outptr, &outend, 14);
|
|
|
f0a9c3 |
outptr = g_stpcpy (outptr, "");
|
|
|
f0a9c3 |
priv->blockquote_depth--;
|
|
|
f0a9c3 |
}
|
|
|
f0a9c3 |
|
|
|
f0a9c3 |
if (priv->pre_open) {
|
|
|
f0a9c3 |
/* close the pre-tag */
|
|
|
f0a9c3 |
- outptr = check_size (mime_filter, outptr, &outend, 10);
|
|
|
f0a9c3 |
+ outptr = check_size (mime_filter, outptr, &outend, 7);
|
|
|
f0a9c3 |
outptr = g_stpcpy (outptr, "");
|
|
|
f0a9c3 |
priv->pre_open = FALSE;
|
|
|
f0a9c3 |
}
|