[evolution/gnome-3-16] Composer - Don't remove wrapping from user wrapped blocks

[Tomas Popela <tpopela src gnome org>]

commit 972b4c7f62723d0a388898f5e819c9104476f307
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Apr 3 12:37:28 2015 +0200

    Composer - Don't remove wrapping from user wrapped blocks
    
    User wrapped blocks are blocks that were wrapped with "Wrap Lines" action.

 e-util/e-html-editor-selection.c |   17 ++++++++++++++---
 e-util/e-html-editor-view.c      |    1 +
 2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/e-util/e-html-editor-selection.c b/e-util/e-html-editor-selection.c
index 36c938e..bd9bd46 100644
--- a/e-util/e-html-editor-selection.c
+++ b/e-util/e-html-editor-selection.c
@@ -1963,7 +1963,11 @@ remove_wrapping_from_element (WebKitDOMElement *element)
        length = webkit_dom_node_list_get_length (list);
        for (ii = 0; ii < length; ii++) {
                WebKitDOMNode *node = webkit_dom_node_list_item (list, ii);
-               remove_node (node);
+               WebKitDOMNode *parent;
+
+               parent = get_parent_block_node_from_child (node);
+               if (!webkit_dom_element_has_attribute (WEBKIT_DOM_ELEMENT (parent), "data-user-wrapped"))
+                       remove_node (node);
                g_object_unref (node);
        }
        g_object_unref (list);
@@ -1973,10 +1977,14 @@ remove_wrapping_from_element (WebKitDOMElement *element)
        length = webkit_dom_node_list_get_length (list);
        for (ii = 0; ii < length; ii++) {
                WebKitDOMNode *hidden_space_node;
+               WebKitDOMNode *parent;
 
                hidden_space_node = webkit_dom_node_list_item (list, ii);
-               webkit_dom_html_element_set_outer_text (
-                       WEBKIT_DOM_HTML_ELEMENT (hidden_space_node), " ", NULL);
+               parent = get_parent_block_node_from_child (hidden_space_node);
+               if (!webkit_dom_element_has_attribute (WEBKIT_DOM_ELEMENT (parent), "data-user-wrapped")) {
+                       webkit_dom_html_element_set_outer_text (
+                               WEBKIT_DOM_HTML_ELEMENT (hidden_space_node), " ", NULL);
+               }
                g_object_unref (hidden_space_node);
        }
        g_object_unref (list);
@@ -6387,6 +6395,9 @@ e_html_editor_selection_wrap_lines (EHTMLEditorSelection *selection)
                wrapped_paragraph = e_html_editor_selection_wrap_paragraph_length (
                        selection, WEBKIT_DOM_ELEMENT (block), selection->priv->word_wrap_length - quote);
 
+               webkit_dom_element_set_attribute (
+                       wrapped_paragraph, "data-user-wrapped", "", NULL);
+
                if (quoted && !html_mode)
                        e_html_editor_view_quote_plain_text_element (view, wrapped_paragraph);
 
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index c1182ff..6acf5e8 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -7752,6 +7752,7 @@ remove_evolution_attributes (WebKitDOMElement *element)
        webkit_dom_element_remove_attribute (element, "data-message");
        webkit_dom_element_remove_attribute (element, "data-name");
        webkit_dom_element_remove_attribute (element, "data-new-message");
+       webkit_dom_element_remove_attribute (element, "data-user-wrapped");
        webkit_dom_element_remove_attribute (element, "spellcheck");
 }
 /*