[evolution/gnome-3-18] Bug 758747 - Reproducible hang after copy&paste of a URL over another URL in quoted section

[Tomas Popela <tpopela src gnome org>]

commit 2d2ee4ca68260980fb83fd3a5aadbf2df27acd4d
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Dec 2 11:05:16 2015 +0100

    Bug 758747 - Reproducible hang after copy&paste of a URL over another URL in quoted section
    
    First, remove the text that will be replaced by pasted text and then insert the
    pasted text, otherwise we could end in loop.

 e-util/e-html-editor-view.c |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 5f1e433..a312288 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -8159,11 +8159,28 @@ html_editor_view_insert_converted_html_into_selection (EHTMLEditorView *view,
 
        has_selection = !e_html_editor_selection_is_collapsed (selection);
        if (has_selection && !view->priv->undo_redo_in_progress) {
-               WebKitDOMRange *range;
+               if (!view->priv->undo_redo_in_progress) {
+                       WebKitDOMRange *range;
 
-               range = html_editor_view_get_dom_range (view);
-               insert_delete_event (view, range);
-               g_object_unref (range);
+                       range = html_editor_view_get_dom_range (view);
+                       insert_delete_event (view, range);
+                       g_object_unref (range);
+               }
+
+               /* Remove the text that was meant to be replaced by the pasted text */
+               e_html_editor_view_exec_command (
+                       view, E_HTML_EDITOR_VIEW_COMMAND_DELETE, NULL);
+
+               e_html_editor_selection_save (selection);
+
+               selection_start_marker = webkit_dom_document_get_element_by_id (
+                       document, "-x-evo-selection-start-marker");
+               selection_end_marker = webkit_dom_document_get_element_by_id (
+                       document, "-x-evo-selection-end-marker");
+               current_block = e_html_editor_get_parent_block_node_from_child (
+                       WEBKIT_DOM_NODE (selection_start_marker));
+               if (WEBKIT_DOM_IS_HTML_BODY_ELEMENT (current_block))
+                       current_block = NULL;
        }
 
        citation_level = get_citation_level (WEBKIT_DOM_NODE (selection_end_marker), FALSE);
@@ -8206,7 +8223,10 @@ html_editor_view_insert_converted_html_into_selection (EHTMLEditorView *view,
                        e_html_editor_view_quote_plain_text_element_after_wrapping (
                                document, WEBKIT_DOM_ELEMENT (parent), citation_level);
 
-                       goto delete;
+                       e_html_editor_selection_restore (selection);
+
+                       g_object_unref (element);
+                       goto out;
                }
 
                /* Pasting content parsed into the multiple paragraphs */
@@ -8320,12 +8340,8 @@ html_editor_view_insert_converted_html_into_selection (EHTMLEditorView *view,
                        quote_plain_text_recursive (document, parent, parent, citation_level);
                        webkit_dom_element_remove_attribute (br, "class");
                }
- delete:
+
                e_html_editor_selection_restore (selection);
-               /* Remove the text that was meant to be replaced by the pasted text */
-               if (has_selection)
-                       e_html_editor_view_exec_command (
-                               view, E_HTML_EDITOR_VIEW_COMMAND_DELETE, NULL);
 
                g_object_unref (element);
                goto out;