[evolution/gnome-3-24] Bug 785031 - Indefinite loop under e_editor_dom_merge_siblings_if_necessary()

[Milan Crha <mcrha src gnome org>]

commit 58b4e7c0e545596ee4fcb027d67e4361ac1b84ee
Author: Milan Crha <mcrha redhat com>
Date:   Tue Jul 18 11:02:52 2017 +0200

    Bug 785031 - Indefinite loop under e_editor_dom_merge_siblings_if_necessary()

 .../web-extension/e-editor-dom-functions.c         |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c 
b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
index 6c2c8fb..df3bee2 100644
--- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
@@ -3768,7 +3768,7 @@ e_editor_dom_merge_siblings_if_necessary (EEditorPage *editor_page,
        if ((element = webkit_dom_document_get_element_by_id (document, "-x-evo-main-cite")))
                webkit_dom_element_remove_attribute (element, "id");
 
-       element = webkit_dom_document_query_selector (document, "blockquote:not([data-evo-query-skip]) + 
blockquote", NULL);
+       element = webkit_dom_document_query_selector (document, "blockquote:not([data-evo-query-skip]) + 
blockquote:not([data-evo-query-skip])", NULL);
        if (!element)
                goto signature;
  repeat:
@@ -3802,7 +3802,7 @@ e_editor_dom_merge_siblings_if_necessary (EEditorPage *editor_page,
        } else
                webkit_dom_element_set_attribute (element, "data-evo-query-skip", "", NULL);
 
-       element = webkit_dom_document_query_selector (document, "blockquote:not([data-evo-query-skip]) + 
blockquote", NULL);
+       element = webkit_dom_document_query_selector (document, "blockquote:not([data-evo-query-skip]) + 
blockquote:not([data-evo-query-skip])", NULL);
        if (element)
                goto repeat;