[evolution/gnome-3-16] EHTMLEditorView - Lines of text appended after the signature are sent on one line

[Tomas Popela <tpopela src gnome org>]

commit a18a75a1afdc5f29034bdbe02cc354f3b94a1794
Author: Tomas Popela <tpopela redhat com>
Date:   Tue Jul 21 16:37:33 2015 +0200

    EHTMLEditorView - Lines of text appended after the signature are sent on one line
    
    If the user edited the signature or added more content after it, WebKit just
    duplicated the DOM structure and left us with multiple PRE elements that don't
    have the BR elements on their end. The content is rendered fine (every pre has
    its own line), but when we try to get a plain text version of the signature we
    will get the text from these PRE elements on one line. As a solution we need to
    insert the BR elements on the end of earch PRE element (if not presented) to get
    the correct text from signature.

 e-util/e-html-editor-view.c |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 257116c..be65df0 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -8633,7 +8633,44 @@ process_elements (EHTMLEditorView *view,
                                        WEBKIT_DOM_ELEMENT (first_child));
                        }
                        if (to_plain_text && !changing_mode) {
+                               WebKitDOMDocument *document;
+                               WebKitDOMNodeList *list_pre;
+                               gint jj, pre_count;
+
                                g_string_append (buffer, "\n");
+
+                               /* If the user edited the signature or added more
+                                * content after it, WebKit just duplicated the DOM
+                                * structure and left us with multiple PRE elements
+                                * that don't have the BR elements on their ends.
+                                * The content is rendered fine (every pre has its
+                                * own line), but when we below try to get a plain text
+                                * version of the signature we will get the text from
+                                * these PRE elements on one line. As a solution we need
+                                * to insert the BR elements on the end of each PRE
+                                * element (if not presented) to get the correct text
+                                * from signature. */
+                               document = webkit_dom_node_get_owner_document (child);
+                               list_pre = webkit_dom_element_query_selector_all (
+                                       WEBKIT_DOM_ELEMENT (first_child), "pre", NULL);
+                               pre_count = webkit_dom_node_list_get_length (list_pre);
+                               for (jj = 0; jj < pre_count; jj++) {
+                                       WebKitDOMNode *last_pre_child, *pre_node;
+
+                                       pre_node = webkit_dom_node_list_item (list_pre, jj);
+                                       last_pre_child = webkit_dom_node_get_last_child (pre_node);
+
+                                       if (last_pre_child && !WEBKIT_DOM_IS_HTMLBR_ELEMENT (last_pre_child)) 
{
+                                               WebKitDOMElement *br;
+
+                                               br = webkit_dom_document_create_element (document, "br", 
NULL);
+                                               webkit_dom_node_append_child (
+                                                       pre_node, WEBKIT_DOM_NODE (br), NULL);
+                                       }
+                                       g_object_unref (pre_node);
+                               }
+                               g_object_unref (list_pre);
+
                                content = webkit_dom_html_element_get_inner_text (
                                        WEBKIT_DOM_HTML_ELEMENT (first_child));
                                g_string_append (buffer, content);