[evolution/gnome-3-16] Bug 749217 - Backspace unindents multiple pasted paragraphs

[Tomas Popela <tpopela src gnome org>]

commit 73913aaa4fbd30270d96f629be589489dd8ba261
Author: Tomas Popela <tpopela redhat com>
Date:   Mon May 11 15:02:03 2015 +0200

    Bug 749217 - Backspace unindents multiple pasted paragraphs
    
    The DOM structure was not fixed after pasting the content into the
    indented paragraph.

 e-util/e-html-editor-view.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 0a0e17d..6398cec 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -7277,7 +7277,8 @@ html_editor_view_insert_converted_html_into_selection (EHTMLEditorView *view,
                /* Check if WebKit created wrong structure */
                clone1 = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (paragraph), FALSE);
                clone2 = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (parent), FALSE);
-               if (webkit_dom_node_is_equal_node (clone1, clone2)) {
+               if (webkit_dom_node_is_equal_node (clone1, clone2) ||
+                   (WEBKIT_DOM_IS_HTML_DIV_ELEMENT (clone1) && WEBKIT_DOM_IS_HTML_DIV_ELEMENT (clone2))) {
                        fix_structure_after_pasting_multiline_content (paragraph);
                        if (g_strcmp0 (html, "\n") == 0) {
                                WebKitDOMElement *br;