r2987 - in /experimental/evolution/debian: changelog control patches/lower-webkit-dependency.patch patches/series
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Mon Aug 15 17:10:42 UTC 2016
Author: jbicha-guest
Date: Mon Aug 15 17:10:42 2016
New Revision: 2987
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2987
Log:
lower-webkit-dependency.patch: don't require webkit2gtk 2.13 yet
Added:
experimental/evolution/debian/patches/lower-webkit-dependency.patch
Modified:
experimental/evolution/debian/changelog
experimental/evolution/debian/control
experimental/evolution/debian/patches/series
Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=2987&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Mon Aug 15 17:10:42 2016
@@ -11,6 +11,8 @@
- Bump e-d-s dependencies and build-dependencies to 3.21.90
* debian/rules:
- Fix evolution-dbg migration rule
+ * debian/patches/lower-webkit-dependency.patch:
+ - Don't require webkit2gtk 2.13 yet
-- Jeremy Bicha <jbicha at ubuntu.com> Mon, 08 Aug 2016 13:14:56 -0400
Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=2987&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Mon Aug 15 17:10:42 2016
@@ -27,7 +27,7 @@
libebackend1.2-dev (>= 3.21.90),
evolution-data-server-dev (>= 3.21.90),
evolution-data-server-dev (<< 3.23),
- libwebkit2gtk-4.0-dev (>= 2.13.0),
+ libwebkit2gtk-4.0-dev (>= 2.12.0),
libgcr-3-dev (>= 3.4),
libgtkspell3-3-dev,
libgeocode-glib-dev (>= 3.10),
@@ -138,7 +138,7 @@
libebackend1.2-dev,
libgtk-3-dev (>= 3.10),
libgnome-desktop-3-dev,
- libwebkit2gtk-4.0-dev (>= 2.13.0),
+ libwebkit2gtk-4.0-dev (>= 2.12.0),
libedataserver1.2-dev,
libedataserverui1.2-dev,
Description: development library files for Evolution
Added: experimental/evolution/debian/patches/lower-webkit-dependency.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/lower-webkit-dependency.patch?rev=2987&op=file
==============================================================================
--- experimental/evolution/debian/patches/lower-webkit-dependency.patch (added)
+++ experimental/evolution/debian/patches/lower-webkit-dependency.patch Mon Aug 15 17:10:42 2016
@@ -0,0 +1,870 @@
+From 8ebf62366b2b7cd96399e25d41aa5d62097609ca Mon Sep 17 00:00:00 2001
+From: Tomas Popela <tpopela at redhat.com>
+Date: Thu, 24 Mar 2016 12:03:00 +0100
+Subject: Revert "Adapt the code to the latest WebKit's GObject DOM API
+ deprecations"
+
+Postpone changes once the WebKitGTK+ 2.13.1 is released.
+
+This reverts commit 61991d69f8703d5f421e7c4f5130cc7938b0bea0.
+
+Index: evolution-3.21.90/configure.ac
+===================================================================
+--- evolution-3.21.90.orig/configure.ac
++++ evolution-3.21.90/configure.ac
+@@ -50,7 +50,7 @@ m4_define([gcr_minimum_version], [3.4])
+ m4_define([enchant_minimum_version], [1.1.7])
+ m4_define([gnome_desktop_minimum_version], [2.91.3])
+ m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92])
+-m4_define([webkit2gtk_minimum_version], [2.13.0])
++m4_define([webkit2gtk_minimum_version], [2.12.0])
+ m4_define([libxml_minimum_version], [2.7.3])
+ m4_define([shared_mime_info_minimum_version], [0.22])
+ m4_define([libpst_minimum_version], [0.6.54])
+Index: evolution-3.21.90/modules/webkit-editor/web-extension/e-composer-dom-functions.c
+===================================================================
+--- evolution-3.21.90.orig/modules/webkit-editor/web-extension/e-composer-dom-functions.c
++++ evolution-3.21.90/modules/webkit-editor/web-extension/e-composer-dom-functions.c
+@@ -751,12 +751,12 @@ e_composer_dom_save_drag_and_drop_histor
+ /* The removed line. */
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (fragment),
+- webkit_dom_node_clone_node_with_error (actual_block, TRUE, NULL),
++ webkit_dom_node_clone_node (actual_block, TRUE),
+ NULL);
+ /* The following block, but empty. */
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (fragment),
+- webkit_dom_node_clone_node_with_error (tmp_block, FALSE, NULL),
++ webkit_dom_node_clone_node (tmp_block, FALSE),
+ NULL);
+ g_object_set_data (
+ G_OBJECT (fragment),
+Index: evolution-3.21.90/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
+===================================================================
+--- evolution-3.21.90.orig/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
++++ evolution-3.21.90/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
+@@ -291,8 +291,8 @@ e_dialogs_dom_cell_mark_current_cell_ele
+ table = dom_node_find_parent_element (
+ WEBKIT_DOM_NODE (cell), "TABLE");
+ if (table)
+- ev->data.dom.from = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (table), TRUE, NULL);
++ ev->data.dom.from = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (table), TRUE);
+
+ e_editor_undo_redo_manager_insert_history_event (manager, ev);
+ }
+@@ -319,8 +319,8 @@ e_dialogs_dom_cell_save_history_on_exit
+
+ manager = e_editor_page_get_undo_redo_manager (editor_page);
+ ev = e_editor_undo_redo_manager_get_current_history_event (manager);
+- ev->data.dom.to = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (table), TRUE, NULL);
++ ev->data.dom.to = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (table), TRUE);
+
+ if (ev->data.dom.from && webkit_dom_node_is_equal_node (ev->data.dom.from, ev->data.dom.to))
+ e_editor_undo_redo_manager_remove_current_history_event (manager);
+@@ -523,8 +523,8 @@ e_dialogs_dom_h_rule_find_hrule (EEditor
+
+ e_editor_dom_selection_get_coordinates (editor_page, &ev->before.start.x, &ev->before.start.y, &ev->before.end.x, &ev->before.end.y);
+ if (!created)
+- ev->data.dom.from = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (rule), FALSE, NULL);
++ ev->data.dom.from = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (rule), FALSE);
+ else
+ ev->data.dom.from = NULL;
+
+@@ -553,8 +553,8 @@ e_dialogs_dom_h_rule_dialog_on_close (EE
+ manager = e_editor_page_get_undo_redo_manager (editor_page);
+ ev = e_editor_undo_redo_manager_get_current_history_event (manager);
+
+- ev->data.dom.to = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (element), TRUE, NULL);
++ ev->data.dom.to = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (element), TRUE);
+
+ if (ev->data.dom.from && webkit_dom_node_is_equal_node (ev->data.dom.from, ev->data.dom.to))
+ e_editor_undo_redo_manager_remove_current_history_event (manager);
+@@ -592,7 +592,7 @@ e_dialogs_dom_image_mark_image (EEditorP
+ ev->type = HISTORY_IMAGE_DIALOG;
+
+ e_editor_dom_selection_get_coordinates (editor_page, &ev->before.start.x, &ev->before.start.y, &ev->before.end.x, &ev->before.end.y);
+- ev->data.dom.from = webkit_dom_node_clone_node_with_error (node_under_mouse_click, FALSE, NULL);
++ ev->data.dom.from = webkit_dom_node_clone_node (node_under_mouse_click, FALSE);
+
+ e_editor_undo_redo_manager_insert_history_event (manager, ev);
+ }
+@@ -616,8 +616,8 @@ e_dialogs_dom_image_save_history_on_exit
+
+ manager = e_editor_page_get_undo_redo_manager (editor_page);
+ ev = e_editor_undo_redo_manager_get_current_history_event (manager);
+- ev->data.dom.to = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (element), TRUE, NULL);
++ ev->data.dom.to = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (element), TRUE);
+
+ if (ev->data.dom.from && webkit_dom_node_is_equal_node (ev->data.dom.from, ev->data.dom.to))
+ e_editor_undo_redo_manager_remove_current_history_event (manager);
+@@ -808,8 +808,8 @@ e_dialogs_dom_link_dialog_on_close (EEdi
+ manager = e_editor_page_get_undo_redo_manager (editor_page);
+ ev = e_editor_undo_redo_manager_get_current_history_event (manager);
+ if (ev->type == HISTORY_LINK_DIALOG) {
+- ev->data.dom.to = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (link), TRUE, NULL);
++ ev->data.dom.to = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (link), TRUE);
+
+ if (ev->data.dom.from && webkit_dom_node_is_equal_node (ev->data.dom.from, ev->data.dom.to))
+ e_editor_undo_redo_manager_remove_current_history_event (manager);
+@@ -868,8 +868,8 @@ e_dialogs_dom_link_dialog_on_open (EEdit
+ e_editor_dom_selection_get_coordinates (
+ editor_page, &ev->before.start.x, &ev->before.start.y, &ev->before.end.x, &ev->before.end.y);
+ if (link)
+- ev->data.dom.from = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (link), TRUE, NULL);
++ ev->data.dom.from = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (link), TRUE);
+ else
+ ev->data.dom.from = NULL;
+ e_editor_undo_redo_manager_insert_history_event (manager, ev);
+@@ -951,7 +951,7 @@ e_dialogs_dom_page_save_history (EEditor
+
+ e_editor_dom_selection_get_coordinates (editor_page, &ev->before.start.x, &ev->before.start.y, &ev->before.end.x, &ev->before.end.y);
+ body = webkit_dom_document_get_body (document);
+- ev->data.dom.from = webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (body), FALSE, NULL);
++ ev->data.dom.from = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (body), FALSE);
+
+ e_editor_undo_redo_manager_insert_history_event (manager, ev);
+ }
+@@ -972,7 +972,7 @@ e_dialogs_dom_page_save_history_on_exit
+ manager = e_editor_page_get_undo_redo_manager (editor_page);
+ ev = e_editor_undo_redo_manager_get_current_history_event (manager);
+ body = webkit_dom_document_get_body (document);
+- ev->data.dom.to = webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (body), FALSE, NULL);
++ ev->data.dom.to = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (body), FALSE);
+
+ if (!webkit_dom_node_is_equal_node (ev->data.dom.from, ev->data.dom.to)) {
+ e_editor_dom_selection_get_coordinates (editor_page, &ev->after.start.x, &ev->after.start.y, &ev->after.end.x, &ev->after.end.y);
+@@ -1328,7 +1328,7 @@ create_table (EEditorPage *editor_page)
+ empty = text_content && !*text_content;
+ g_free (text_content);
+
+- clone = webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (element), FALSE, NULL);
++ clone = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (element), FALSE);
+ br = webkit_dom_document_create_element (document, "BR", NULL);
+ webkit_dom_node_append_child (clone, WEBKIT_DOM_NODE (br), NULL);
+ webkit_dom_node_insert_before (
+@@ -1413,8 +1413,8 @@ e_dialogs_dom_table_show (EEditorPage *e
+
+ e_editor_dom_selection_get_coordinates (editor_page, &ev->before.start.x, &ev->before.start.y, &ev->before.end.x, &ev->before.end.y);
+ if (!created)
+- ev->data.dom.from = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (table), TRUE, NULL);
++ ev->data.dom.from = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (table), TRUE);
+ else
+ ev->data.dom.from = NULL;
+
+@@ -1445,8 +1445,8 @@ e_dialogs_dom_table_save_history_on_exit
+
+ manager = e_editor_page_get_undo_redo_manager (editor_page);
+ ev = e_editor_undo_redo_manager_get_current_history_event (manager);
+- ev->data.dom.to = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (element), TRUE, NULL);
++ ev->data.dom.to = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (element), TRUE);
+
+ if (ev->data.dom.from && webkit_dom_node_is_equal_node (ev->data.dom.from, ev->data.dom.to))
+ e_editor_undo_redo_manager_remove_current_history_event (manager);
+Index: evolution-3.21.90/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+===================================================================
+--- evolution-3.21.90.orig/modules/webkit-editor/web-extension/e-editor-dom-functions.c
++++ evolution-3.21.90/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+@@ -143,8 +143,8 @@ prepare_history_for_table (EEditorPage *
+
+ e_editor_dom_selection_get_coordinates (editor_page, &ev->before.start.x, &ev->before.start.y, &ev->before.end.x, &ev->before.end.y);
+
+- ev->data.dom.from = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (table), TRUE, NULL);
++ ev->data.dom.from = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (table), TRUE);
+ }
+
+
+@@ -156,8 +156,8 @@ save_history_for_table (EEditorPage *edi
+ EEditorUndoRedoManager *manager;
+
+ if (table)
+- ev->data.dom.to = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (table), TRUE, NULL);
++ ev->data.dom.to = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (table), TRUE);
+ else
+ ev->data.dom.to = NULL;
+
+@@ -1031,7 +1031,7 @@ e_editor_dom_quote_plain_text_element_af
+
+ webkit_dom_node_insert_before (
+ webkit_dom_node_get_parent_node (br),
+- webkit_dom_node_clone_node_with_error (quoted_node, TRUE, NULL),
++ webkit_dom_node_clone_node (quoted_node, TRUE),
+ webkit_dom_node_get_next_sibling (br),
+ NULL);
+ g_object_unref (br);
+@@ -1168,7 +1168,7 @@ e_editor_dom_insert_new_line_into_citati
+ current_block = e_editor_dom_get_parent_block_node_from_child (
+ WEBKIT_DOM_NODE (selection_start_marker));
+
+- block_clone = webkit_dom_node_clone_node_with_error (current_block, TRUE, NULL);
++ block_clone = webkit_dom_node_clone_node (current_block, TRUE);
+ /* Find selection start marker and restore it after the new line
+ * is inserted */
+ selection_start_marker = webkit_dom_element_query_selector (
+@@ -1182,7 +1182,7 @@ e_editor_dom_insert_new_line_into_citati
+ WebKitDOMNode *node;
+
+ parent_block = parent;
+- node = webkit_dom_node_clone_node_with_error (parent_block, FALSE, NULL);
++ node = webkit_dom_node_clone_node (parent_block, FALSE);
+ webkit_dom_node_append_child (node, block_clone, NULL);
+ block_clone = node;
+ parent = webkit_dom_node_get_parent_node (parent_block);
+@@ -2102,7 +2102,7 @@ emoticon_insert_span (EEmoticon *emotico
+ fragment = webkit_dom_document_create_document_fragment (document);
+ node = webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (fragment),
+- webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (inserted_node), TRUE, NULL),
++ webkit_dom_node_clone_node (WEBKIT_DOM_NODE (inserted_node), TRUE),
+ NULL);
+ if (e_editor_page_get_unicode_smileys_enabled (editor_page)) {
+ webkit_dom_node_append_child (
+@@ -2725,7 +2725,7 @@ save_history_before_event_in_table (EEdi
+
+ if (block) {
+ e_editor_dom_selection_save (editor_page);
+- ev->data.dom.from = webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (block), TRUE, NULL);
++ ev->data.dom.from = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (block), TRUE);
+ e_editor_dom_selection_restore (editor_page);
+ } else
+ ev->data.dom.from = NULL;
+@@ -3035,7 +3035,7 @@ save_history_after_event_in_table (EEdit
+ &ev->after.end.x,
+ &ev->after.end.y);
+
+- ev->data.dom.to = webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (element), TRUE, NULL);
++ ev->data.dom.to = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (element), TRUE);
+
+ e_editor_dom_selection_restore (editor_page);
+
+@@ -3117,7 +3117,7 @@ save_history_for_input (EEditorPage *edi
+ while (parent_start && parent_end && !webkit_dom_node_is_same_node (parent_start, parent_end)) {
+ webkit_dom_node_insert_before (
+ WEBKIT_DOM_NODE (fragment),
+- webkit_dom_node_clone_node_with_error (parent_start, FALSE, NULL),
++ webkit_dom_node_clone_node (parent_start, FALSE),
+ webkit_dom_node_get_first_child (WEBKIT_DOM_NODE (fragment)),
+ NULL);
+ parent_start = webkit_dom_node_get_parent_node (parent_start);
+@@ -3728,8 +3728,8 @@ e_editor_dom_merge_siblings_if_necessary
+ goto signature;
+
+ equal_nodes = webkit_dom_node_is_equal_node (
+- webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (element), FALSE, NULL),
+- webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (prev_element), FALSE, NULL));
++ webkit_dom_node_clone_node (WEBKIT_DOM_NODE (element), FALSE),
++ webkit_dom_node_clone_node (WEBKIT_DOM_NODE (prev_element), FALSE));
+
+ if (equal_nodes) {
+ if (webkit_dom_element_get_child_element_count (element) >
+@@ -3781,7 +3781,7 @@ e_editor_dom_merge_siblings_if_necessary
+ remove_node (webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (element)));
+ webkit_dom_node_replace_child (
+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (element)),
+- webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (right_signature), TRUE, NULL),
++ webkit_dom_node_clone_node (WEBKIT_DOM_NODE (right_signature), TRUE),
+ WEBKIT_DOM_NODE (element),
+ NULL);
+ }
+@@ -4142,7 +4142,7 @@ e_editor_dom_move_quoted_block_level_up
+ ev->type = HISTORY_UNQUOTE;
+
+ e_editor_dom_selection_get_coordinates (editor_page, &ev->before.start.x, &ev->before.start.y, &ev->before.end.x, &ev->before.end.y);
+- ev->data.dom.from = webkit_dom_node_clone_node_with_error (block, TRUE, NULL);
++ ev->data.dom.from = webkit_dom_node_clone_node (block, TRUE);
+ }
+
+ if (citation_level == 1) {
+@@ -4249,7 +4249,7 @@ e_editor_dom_move_quoted_block_level_up
+ * the citation that is one level lower */
+ WebKitDOMNode *clone, *child;
+
+- clone = webkit_dom_node_clone_node_with_error (parent, FALSE, NULL);
++ clone = webkit_dom_node_clone_node (parent, FALSE);
+
+ /* Move nodes that are after the currect block into the
+ * new blockquote */
+@@ -4679,7 +4679,7 @@ e_editor_dom_quote_plain_text_element (E
+ g_return_val_if_fail (E_IS_EDITOR_PAGE (editor_page), NULL);
+
+ document = e_editor_page_get_document (editor_page);
+- element_clone = webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (element), TRUE, NULL);
++ element_clone = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (element), TRUE);
+ level = e_editor_dom_get_citation_level (WEBKIT_DOM_NODE (element), TRUE);
+
+ /* Remove old quote characters if the exists */
+@@ -4733,7 +4733,7 @@ dom_quote_plain_text (WebKitDOMDocument
+ return NULL;
+
+ body = webkit_dom_document_get_body (document);
+- body_clone = webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (body), TRUE, NULL);
++ body_clone = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (body), TRUE);
+
+ /* Clean unwanted spaces before and after blockquotes */
+ list = webkit_dom_element_query_selector_all (
+@@ -4958,8 +4958,8 @@ create_and_append_new_block (EEditorPage
+
+ g_return_val_if_fail (E_IS_EDITOR_PAGE (editor_page), NULL);
+
+- block = WEBKIT_DOM_ELEMENT (webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (block_template), FALSE, NULL));
++ block = WEBKIT_DOM_ELEMENT (webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (block_template), FALSE));
+
+ webkit_dom_element_set_inner_html (block, content, NULL);
+
+@@ -5833,7 +5833,7 @@ e_editor_dom_convert_content (EEditorPag
+ inner_html = webkit_dom_element_get_inner_html (content_wrapper);
+
+ /* Replace the old body with the new one. */
+- node = webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (body), FALSE, NULL);
++ node = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (body), FALSE);
+ webkit_dom_node_replace_child (
+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (body)),
+ node,
+@@ -6379,8 +6379,8 @@ e_editor_dom_convert_and_insert_html_int
+ webkit_dom_element_remove_attribute (WEBKIT_DOM_ELEMENT (parent), "id");
+
+ /* Check if WebKit created wrong structure */
+- clone1 = webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (block), FALSE, NULL);
+- clone2 = webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (parent), FALSE, NULL);
++ clone1 = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (block), FALSE);
++ clone2 = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (parent), FALSE);
+ if (webkit_dom_node_is_equal_node (clone1, clone2) ||
+ (WEBKIT_DOM_IS_HTML_DIV_ELEMENT (clone1) && WEBKIT_DOM_IS_HTML_DIV_ELEMENT (clone2) &&
+ !element_has_class (WEBKIT_DOM_ELEMENT (clone2), "-x-evo-indented"))) {
+@@ -6907,7 +6907,7 @@ convert_element_from_html_to_plain_text
+ if (signature) {
+ WebKitDOMNode *parent = webkit_dom_node_get_parent_node (
+ WEBKIT_DOM_NODE (signature));
+- signature_clone = webkit_dom_node_clone_node_with_error (parent, TRUE, NULL);
++ signature_clone = webkit_dom_node_clone_node (parent, TRUE);
+ remove_node (parent);
+ }
+ from = WEBKIT_DOM_NODE (element);
+@@ -7683,8 +7683,8 @@ e_editor_dom_process_content_for_draft (
+
+ document_element = webkit_dom_document_get_document_element (document);
+
+- document_element_clone = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (document_element), TRUE, NULL);
++ document_element_clone = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (document_element), TRUE);
+
+ list = webkit_dom_element_query_selector_all (
+ WEBKIT_DOM_ELEMENT (document_element_clone), "a.-x-evo-visited-link", NULL);
+@@ -7891,7 +7891,7 @@ e_editor_dom_process_content_to_plain_te
+ plain_text = g_string_sized_new (1024);
+
+ body = WEBKIT_DOM_NODE (webkit_dom_document_get_body (document));
+- source = webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (body), TRUE, NULL);
++ source = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (body), TRUE);
+
+ e_editor_dom_selection_save (editor_page);
+
+@@ -8116,8 +8116,8 @@ e_editor_dom_process_content_to_html_for
+
+ document = e_editor_page_get_document (editor_page);
+
+- document_clone = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (webkit_dom_document_get_document_element (document)), TRUE, NULL);
++ document_clone = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (webkit_dom_document_get_document_element (document)), TRUE);
+ element = webkit_dom_element_query_selector (
+ WEBKIT_DOM_ELEMENT (document_clone), "style#-x-evo-quote-style", NULL);
+ if (element)
+@@ -8910,22 +8910,22 @@ save_history_for_delete_or_backspace (EE
+ if (delete_key) {
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (fragment),
+- webkit_dom_node_clone_node_with_error (actual_block, TRUE, NULL),
++ webkit_dom_node_clone_node (actual_block, TRUE),
+ NULL);
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (fragment),
+- webkit_dom_node_clone_node_with_error (tmp_block, TRUE, NULL),
++ webkit_dom_node_clone_node (tmp_block, TRUE),
+ NULL);
+ if (delete_key)
+ next_block = tmp_block;
+ } else {
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (fragment),
+- webkit_dom_node_clone_node_with_error (tmp_block, TRUE, NULL),
++ webkit_dom_node_clone_node (tmp_block, TRUE),
+ NULL);
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (fragment),
+- webkit_dom_node_clone_node_with_error (actual_block, TRUE, NULL),
++ webkit_dom_node_clone_node (actual_block, TRUE),
+ NULL);
+ }
+ g_object_set_data (
+@@ -9133,7 +9133,7 @@ save_history_for_delete_or_backspace (EE
+ !element_has_class (WEBKIT_DOM_ELEMENT (child), "-x-evo-quoted")))) {
+ webkit_dom_node_insert_before (
+ webkit_dom_node_get_parent_node (child),
+- webkit_dom_node_clone_node_with_error (sibling, TRUE, NULL),
++ webkit_dom_node_clone_node (sibling, TRUE),
+ child,
+ NULL);
+ }
+@@ -9162,7 +9162,7 @@ save_history_for_delete_or_backspace (EE
+ WebKitDOMNode *clone;
+
+ tmp_fragment = webkit_dom_document_create_document_fragment (document);
+- clone = webkit_dom_node_clone_node_with_error (node, FALSE, NULL);
++ clone = webkit_dom_node_clone_node (node, FALSE);
+ clone = webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (tmp_fragment), clone, NULL);
+ webkit_dom_node_append_child (clone, WEBKIT_DOM_NODE (fragment), NULL);
+@@ -9183,7 +9183,7 @@ save_history_for_delete_or_backspace (EE
+ if (signature) {
+ webkit_dom_node_replace_child (
+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (tmp_element)),
+- webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (signature), TRUE, NULL),
++ webkit_dom_node_clone_node (WEBKIT_DOM_NODE (signature), TRUE),
+ WEBKIT_DOM_NODE (tmp_element),
+ NULL);
+ }
+@@ -9717,7 +9717,7 @@ return_pressed_in_image_wrapper (EEditor
+ block = e_editor_dom_get_parent_block_node_from_child (
+ WEBKIT_DOM_NODE (selection_start_marker));
+
+- clone = webkit_dom_node_clone_node_with_error (block, FALSE, NULL);
++ clone = webkit_dom_node_clone_node (block, FALSE);
+ webkit_dom_node_append_child (
+ clone, WEBKIT_DOM_NODE (webkit_dom_document_create_element (document, "br", NULL)), NULL);
+
+@@ -9730,7 +9730,7 @@ return_pressed_in_image_wrapper (EEditor
+ if (ev) {
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (fragment),
+- webkit_dom_node_clone_node_with_error (clone, TRUE, NULL),
++ webkit_dom_node_clone_node (clone, TRUE),
+ NULL);
+
+ e_editor_dom_selection_get_coordinates (editor_page,
+@@ -9817,7 +9817,7 @@ return_pressed_after_h_rule (EEditorPage
+
+ block = webkit_dom_node_get_previous_sibling (hr);
+
+- clone = webkit_dom_node_clone_node_with_error (block, FALSE, NULL);
++ clone = webkit_dom_node_clone_node (block, FALSE);
+
+ webkit_dom_node_append_child (
+ clone, WEBKIT_DOM_NODE (webkit_dom_document_create_element (document, "br", NULL)), NULL);
+@@ -9841,7 +9841,7 @@ return_pressed_after_h_rule (EEditorPage
+ if (ev) {
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (fragment),
+- webkit_dom_node_clone_node_with_error (clone, TRUE, NULL),
++ webkit_dom_node_clone_node (clone, TRUE),
+ NULL);
+
+ e_editor_dom_selection_get_coordinates (editor_page,
+@@ -10051,7 +10051,7 @@ e_editor_dom_key_press_event_process_ret
+ node = webkit_dom_node_get_previous_sibling (table);
+ if (!node) {
+ node = webkit_dom_node_get_next_sibling (table);
+- node = webkit_dom_node_clone_node_with_error (node, FALSE, NULL);
++ node = webkit_dom_node_clone_node (node, FALSE);
+ webkit_dom_node_append_child (
+ node,
+ WEBKIT_DOM_NODE (webkit_dom_document_create_element (
+@@ -10150,7 +10150,7 @@ remove_empty_bulleted_list_item (EEditor
+ if (prev_item)
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (fragment),
+- webkit_dom_node_clone_node_with_error (prev_item, TRUE, NULL),
++ webkit_dom_node_clone_node (prev_item, TRUE),
+ NULL);
+
+ webkit_dom_node_append_child (
+@@ -11007,7 +11007,7 @@ e_editor_dom_insert_base64_image (EEdito
+ fragment = webkit_dom_document_create_document_fragment (document);
+ node = webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (fragment),
+- webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (resizable_wrapper), TRUE, NULL),
++ webkit_dom_node_clone_node (WEBKIT_DOM_NODE (resizable_wrapper), TRUE),
+ NULL);
+
+ webkit_dom_html_element_insert_adjacent_html (
+@@ -11399,7 +11399,7 @@ e_editor_dom_selection_unlink (EEditorPa
+ fragment = webkit_dom_document_create_document_fragment (document);
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (fragment),
+- webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (link), TRUE, NULL),
++ webkit_dom_node_clone_node (WEBKIT_DOM_NODE (link), TRUE),
+ NULL);
+ ev->data.fragment = fragment;
+
+@@ -12198,9 +12198,9 @@ unindent_list (WebKitDOMDocument *docume
+ WEBKIT_DOM_NODE (selection_start_marker));
+ source_list = webkit_dom_node_get_parent_node (item);
+ new_list = WEBKIT_DOM_ELEMENT (
+- webkit_dom_node_clone_node_with_error (source_list, FALSE, NULL));
++ webkit_dom_node_clone_node (source_list, FALSE));
+ current_list = source_list;
+- source_list_clone = webkit_dom_node_clone_node_with_error (source_list, FALSE, NULL);
++ source_list_clone = webkit_dom_node_clone_node (source_list, FALSE);
+
+ webkit_dom_node_insert_before (
+ webkit_dom_node_get_parent_node (source_list),
+@@ -12287,7 +12287,7 @@ unindent_block (EEditorPage *editor_page
+ while ((child = webkit_dom_node_get_first_child (WEBKIT_DOM_NODE (element)))) {
+ if (webkit_dom_node_is_equal_node (child, block_to_process)) {
+ before_node = FALSE;
+- node_clone = webkit_dom_node_clone_node_with_error (child, TRUE, NULL);
++ node_clone = webkit_dom_node_clone_node (child, TRUE);
+ remove_node (child);
+ continue;
+ }
+@@ -13268,7 +13268,7 @@ wrap_lines (EEditorPage *editor_page,
+ return WEBKIT_DOM_ELEMENT (block);
+ }
+
+- block_clone = webkit_dom_node_clone_node_with_error (block, TRUE, NULL);
++ block_clone = webkit_dom_node_clone_node (block, TRUE);
+
+ /* When we wrap, we are wrapping just the text after caret, text
+ * before the caret is already wrapped, so unwrap the text after
+@@ -14501,8 +14501,8 @@ set_font_style (WebKitDOMDocument *docum
+ WebKitDOMNode *clone;
+ WebKitDOMNode *sibling;
+
+- clone = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (parent), FALSE, NULL);
++ clone = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (parent), FALSE);
+
+ while ((sibling = webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (element))))
+ webkit_dom_node_insert_before (
+@@ -14861,7 +14861,7 @@ monospace_selection (EEditorPage *editor
+ /* Prepare the monospaced element. */
+ monospace = webkit_dom_node_insert_before (
+ webkit_dom_node_get_parent_node (node),
+- first ? monospace : webkit_dom_node_clone_node_with_error (monospace, FALSE, NULL),
++ first ? monospace : webkit_dom_node_clone_node (monospace, FALSE),
+ first ? node : webkit_dom_node_get_next_sibling (node),
+ NULL);
+ } else
+@@ -14899,7 +14899,7 @@ monospace_selection (EEditorPage *editor
+
+ monospace = webkit_dom_node_insert_before (
+ block,
+- webkit_dom_node_clone_node_with_error (monospace, FALSE, NULL),
++ webkit_dom_node_clone_node (monospace, FALSE),
+ webkit_dom_node_get_first_child (block),
+ NULL);
+
+@@ -14914,7 +14914,7 @@ monospace_selection (EEditorPage *editor
+ while (block && node && !webkit_dom_node_is_same_node (block, node)) {
+ monospace = webkit_dom_node_insert_before (
+ webkit_dom_node_get_parent_node (node),
+- webkit_dom_node_clone_node_with_error (monospace, FALSE, NULL),
++ webkit_dom_node_clone_node (monospace, FALSE),
+ webkit_dom_node_get_next_sibling (node),
+ NULL);
+
+@@ -15012,7 +15012,7 @@ unmonospace_selection (EEditorPage *edit
+ goto out;
+
+ /* Make a clone of current monospaced element. */
+- clone = webkit_dom_node_clone_node_with_error (monospace, TRUE, NULL);
++ clone = webkit_dom_node_clone_node (monospace, TRUE);
+
+ /* First block */
+ /* Remove all the nodes that are after the selection start point as they
+@@ -16374,8 +16374,8 @@ do_format_change_list_to_list (WebKitDOM
+ WebKitDOMNode *clone, *child;
+
+ /* Create new list from template. */
+- clone = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (new_list_template), FALSE, NULL);
++ clone = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (new_list_template), FALSE);
+
+ /* Insert it before the list that we are processing. */
+ webkit_dom_node_insert_before (
+@@ -16422,7 +16422,7 @@ format_change_list_from_list (EEditorPag
+ item = get_list_item_node_from_child (WEBKIT_DOM_NODE (selection_start_marker));
+ source_list = webkit_dom_node_get_parent_node (item);
+ current_list = source_list;
+- source_list_clone = webkit_dom_node_clone_node_with_error (source_list, FALSE, NULL);
++ source_list_clone = webkit_dom_node_clone_node (source_list, FALSE);
+
+ new_list = create_list_element (editor_page, to, 0, html_mode);
+
+@@ -16490,8 +16490,8 @@ format_change_list_from_list (EEditorPag
+ if (ii == 0) {
+ WebKitDOMNode *clone, *child;
+
+- clone = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (new_list), FALSE, NULL);
++ clone = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (new_list), FALSE);
+
+ webkit_dom_node_append_child (
+ after_selection_end ?
+@@ -16521,8 +16521,8 @@ format_change_list_from_list (EEditorPag
+ while (!done) {
+ WebKitDOMNode *clone, *child;
+
+- clone = webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (new_list), FALSE, NULL);
++ clone = webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (new_list), FALSE);
+
+ webkit_dom_node_append_child (
+ tmp_parent, clone, NULL);
+@@ -16551,7 +16551,7 @@ format_change_list_from_list (EEditorPag
+ }
+
+ if (selection_end) {
+- source_list_clone = webkit_dom_node_clone_node_with_error (current_list, FALSE, NULL);
++ source_list_clone = webkit_dom_node_clone_node (current_list, FALSE);
+ remove_node_if_empty (current_list);
+ after_selection_end = TRUE;
+ }
+Index: evolution-3.21.90/modules/webkit-editor/web-extension/e-editor-undo-redo-manager.c
+===================================================================
+--- evolution-3.21.90.orig/modules/webkit-editor/web-extension/e-editor-undo-redo-manager.c
++++ evolution-3.21.90/modules/webkit-editor/web-extension/e-editor-undo-redo-manager.c
+@@ -332,7 +332,7 @@ split_node_into_two (WebKitDOMNode *item
+ WebKitDOMNode *clone, *first_child, *insert_before = NULL, *sibling;
+
+ first_child = webkit_dom_node_get_first_child (WEBKIT_DOM_NODE (fragment));
+- clone = webkit_dom_node_clone_node_with_error (parent, FALSE, NULL);
++ clone = webkit_dom_node_clone_node (parent, FALSE);
+ webkit_dom_node_insert_before (
+ WEBKIT_DOM_NODE (fragment), clone, first_child, NULL);
+
+@@ -396,7 +396,7 @@ undo_delete (EEditorPage *editor_page,
+ dom_selection = webkit_dom_dom_window_get_selection (dom_window);
+ g_clear_object (&dom_window);
+
+- fragment = webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (event->data.fragment), TRUE, NULL);
++ fragment = webkit_dom_node_clone_node (WEBKIT_DOM_NODE (event->data.fragment), TRUE);
+ first_child = webkit_dom_node_get_first_child (fragment);
+
+ content = webkit_dom_node_get_text_content (fragment);
+@@ -840,8 +840,8 @@ undo_delete (EEditorPage *editor_page,
+ if (prev_sibling && next_sibling) {
+ WebKitDOMNode *clone_prev, *clone_next;
+
+- clone_prev = webkit_dom_node_clone_node_with_error (prev_sibling, FALSE, NULL);
+- clone_next = webkit_dom_node_clone_node_with_error (next_sibling, FALSE, NULL);
++ clone_prev = webkit_dom_node_clone_node (prev_sibling, FALSE);
++ clone_next = webkit_dom_node_clone_node (next_sibling, FALSE);
+
+ if (webkit_dom_node_is_equal_node (clone_prev, clone_next)) {
+ WebKitDOMNode *child;
+@@ -1148,8 +1148,8 @@ undo_redo_page_dialog (EEditorPage *edit
+ if (g_strcmp0 (name, name_history) == 0) {
+ WebKitDOMNode *attr_clone;
+
+- attr_clone = webkit_dom_node_clone_node_with_error (
+- undo ? attr_history : attr, TRUE, NULL);
++ attr_clone = webkit_dom_node_clone_node (
++ undo ? attr_history : attr, TRUE);
+ webkit_dom_element_set_attribute_node (
+ WEBKIT_DOM_ELEMENT (body),
+ WEBKIT_DOM_ATTR (attr_clone),
+@@ -1187,7 +1187,7 @@ undo_redo_page_dialog (EEditorPage *edit
+ webkit_dom_element_set_attribute_node (
+ WEBKIT_DOM_ELEMENT (body),
+ WEBKIT_DOM_ATTR (
+- webkit_dom_node_clone_node_with_error (attr, TRUE, NULL)),
++ webkit_dom_node_clone_node (attr, TRUE)),
+ NULL);
+ }
+ }
+@@ -1234,7 +1234,7 @@ undo_redo_hrule_dialog (EEditorPage *edi
+ else
+ webkit_dom_node_replace_child (
+ webkit_dom_node_get_parent_node (node),
+- webkit_dom_node_clone_node_with_error (event->data.dom.from, TRUE, NULL),
++ webkit_dom_node_clone_node (event->data.dom.from, TRUE),
+ node,
+ NULL);
+ }
+@@ -1250,7 +1250,7 @@ undo_redo_hrule_dialog (EEditorPage *edi
+ if (node && WEBKIT_DOM_IS_HTML_HR_ELEMENT (node))
+ webkit_dom_node_replace_child (
+ webkit_dom_node_get_parent_node (node),
+- webkit_dom_node_clone_node_with_error (event->data.dom.to, TRUE, NULL),
++ webkit_dom_node_clone_node (event->data.dom.to, TRUE),
+ node,
+ NULL);
+ } else {
+@@ -1310,7 +1310,7 @@ undo_redo_image_dialog (EEditorPage *edi
+
+ webkit_dom_node_replace_child (
+ webkit_dom_node_get_parent_node (image),
+- webkit_dom_node_clone_node_with_error (undo ? event->data.dom.from : event->data.dom.to, TRUE, NULL),
++ webkit_dom_node_clone_node (undo ? event->data.dom.from : event->data.dom.to, TRUE),
+ image,
+ NULL);
+
+@@ -1349,7 +1349,7 @@ undo_redo_link_dialog (EEditorPage *edit
+ else
+ webkit_dom_node_replace_child (
+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (anchor)),
+- webkit_dom_node_clone_node_with_error (event->data.dom.from, TRUE, NULL),
++ webkit_dom_node_clone_node (event->data.dom.from, TRUE),
+ WEBKIT_DOM_NODE (anchor),
+ NULL);
+ }
+@@ -1361,13 +1361,13 @@ undo_redo_link_dialog (EEditorPage *edit
+ if (WEBKIT_DOM_IS_ELEMENT (event->data.dom.from) && anchor) {
+ webkit_dom_node_replace_child (
+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (anchor)),
+- webkit_dom_node_clone_node_with_error (event->data.dom.to, TRUE, NULL),
++ webkit_dom_node_clone_node (event->data.dom.to, TRUE),
+ WEBKIT_DOM_NODE (anchor),
+ NULL);
+ } else {
+ webkit_dom_node_insert_before (
+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (element)),
+- webkit_dom_node_clone_node_with_error (event->data.dom.to, TRUE, NULL),
++ webkit_dom_node_clone_node (event->data.dom.to, TRUE),
+ WEBKIT_DOM_NODE (element),
+ NULL);
+
+@@ -1411,7 +1411,7 @@ undo_redo_table_dialog (EEditorPage *edi
+ parent = get_parent_block_element (WEBKIT_DOM_NODE (element));
+ webkit_dom_node_insert_before (
+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (parent)),
+- webkit_dom_node_clone_node_with_error (undo ? event->data.dom.from : event->data.dom.to, TRUE, NULL),
++ webkit_dom_node_clone_node (undo ? event->data.dom.from : event->data.dom.to, TRUE),
+ WEBKIT_DOM_NODE (parent),
+ NULL);
+ restore_selection_to_history_event_state (editor_page, event->before);
+@@ -1426,7 +1426,7 @@ undo_redo_table_dialog (EEditorPage *edi
+ else
+ webkit_dom_node_replace_child (
+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (table)),
+- webkit_dom_node_clone_node_with_error (event->data.dom.from, TRUE, NULL),
++ webkit_dom_node_clone_node (event->data.dom.from, TRUE),
+ WEBKIT_DOM_NODE (table),
+ NULL);
+ } else {
+@@ -1435,7 +1435,7 @@ undo_redo_table_dialog (EEditorPage *edi
+ else
+ webkit_dom_node_replace_child (
+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (table)),
+- webkit_dom_node_clone_node_with_error (event->data.dom.to, TRUE, NULL),
++ webkit_dom_node_clone_node (event->data.dom.to, TRUE),
+ WEBKIT_DOM_NODE (table),
+ NULL);
+ }
+@@ -1489,7 +1489,7 @@ undo_redo_table_input (EEditorPage *edit
+
+ webkit_dom_node_replace_child (
+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (element)),
+- webkit_dom_node_clone_node_with_error (undo ? event->data.dom.from : event->data.dom.to, TRUE, NULL),
++ webkit_dom_node_clone_node (undo ? event->data.dom.from : event->data.dom.to, TRUE),
+ WEBKIT_DOM_NODE (element),
+ NULL);
+
+@@ -1645,7 +1645,7 @@ undo_redo_image (EEditorPage *editor_pag
+ /* Insert the deleted content back to the body. */
+ webkit_dom_node_insert_before (
+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (element)),
+- webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (event->data.fragment), TRUE, NULL),
++ webkit_dom_node_clone_node (WEBKIT_DOM_NODE (event->data.fragment), TRUE),
+ WEBKIT_DOM_NODE (element),
+ NULL);
+
+@@ -1804,7 +1804,7 @@ undo_redo_remove_link (EEditorPage *edit
+ g_clear_object (&range);
+ webkit_dom_node_insert_before (
+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (element)),
+- webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (event->data.fragment), TRUE, NULL),
++ webkit_dom_node_clone_node (WEBKIT_DOM_NODE (event->data.fragment), TRUE),
+ WEBKIT_DOM_NODE (element),
+ NULL);
+ remove_node (WEBKIT_DOM_NODE (element));
+@@ -1837,7 +1837,7 @@ undo_return_in_empty_list_item (EEditorP
+ dom_remove_selection_markers (document);
+ webkit_dom_node_insert_before (
+ webkit_dom_node_get_parent_node (parent),
+- webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (event->data.fragment), TRUE, NULL),
++ webkit_dom_node_clone_node (WEBKIT_DOM_NODE (event->data.fragment), TRUE),
+ webkit_dom_node_get_next_sibling (parent),
+ NULL);
+
+@@ -2020,8 +2020,8 @@ undo_redo_citation_split (EEditorPage *e
+ if (in_situ && event->data.fragment) {
+ webkit_dom_node_append_child (
+ webkit_dom_node_get_parent_node (last_child),
+- webkit_dom_node_clone_node_with_error (
+- WEBKIT_DOM_NODE (event->data.fragment), TRUE, NULL),
++ webkit_dom_node_clone_node (
++ WEBKIT_DOM_NODE (event->data.fragment), TRUE),
+ NULL);
+ } else {
+ e_editor_dom_remove_quoting_from_element (WEBKIT_DOM_ELEMENT (child));
+@@ -2112,7 +2112,7 @@ undo_redo_unquote (EEditorPage *editor_p
+ if (prev_sibling && e_editor_dom_node_is_citation_node (prev_sibling)) {
+ webkit_dom_node_append_child (
+ prev_sibling,
+- webkit_dom_node_clone_node_with_error (event->data.dom.from, TRUE, NULL),
++ webkit_dom_node_clone_node (event->data.dom.from, TRUE),
+ NULL);
+
+ if (next_sibling && e_editor_dom_node_is_citation_node (next_sibling)) {
+@@ -2127,7 +2127,7 @@ undo_redo_unquote (EEditorPage *editor_p
+ } else if (next_sibling && e_editor_dom_node_is_citation_node (next_sibling)) {
+ webkit_dom_node_insert_before (
+ next_sibling,
+- webkit_dom_node_clone_node_with_error (event->data.dom.from, TRUE, NULL),
++ webkit_dom_node_clone_node (event->data.dom.from, TRUE),
+ webkit_dom_node_get_first_child (next_sibling),
+ NULL);
+ }
+Index: evolution-3.21.90/web-extensions/e-dom-utils.c
+===================================================================
+--- evolution-3.21.90.orig/web-extensions/e-dom-utils.c
++++ evolution-3.21.90/web-extensions/e-dom-utils.c
+@@ -1659,7 +1659,7 @@ split_list_into_two (WebKitDOMNode *item
+ WebKitDOMNode *clone, *first_child, *insert_before = NULL, *sibling;
+
+ first_child = webkit_dom_node_get_first_child (WEBKIT_DOM_NODE (fragment));
+- clone = webkit_dom_node_clone_node_with_error (parent, FALSE, NULL);
++ clone = webkit_dom_node_clone_node (parent, FALSE);
+ webkit_dom_node_insert_before (
+ WEBKIT_DOM_NODE (fragment), clone, first_child, NULL);
+
+@@ -1940,7 +1940,7 @@ dom_get_node_inner_html (WebKitDOMNode *
+ div = webkit_dom_document_create_element (document, "div", NULL);
+ webkit_dom_node_append_child (
+ WEBKIT_DOM_NODE (div),
+- webkit_dom_node_clone_node_with_error (node, TRUE, NULL),
++ webkit_dom_node_clone_node (node, TRUE),
+ NULL);
+
+ inner_html = webkit_dom_element_get_inner_html (div);
Modified: experimental/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/series?rev=2987&op=diff
==============================================================================
--- experimental/evolution/debian/patches/series (original)
+++ experimental/evolution/debian/patches/series Mon Aug 15 17:10:42 2016
@@ -1,2 +1,3 @@
02_nss_paths.patch
10_revert_libevolution_avoid-version.patch
+lower-webkit-dependency.patch
More information about the pkg-evolution-commits
mailing list