[evolution/wip/webkit2] EHTMLEditorView - The links in composer are clickable by default

[Tomas Popela <tpopela src gnome org>]

commit 4cf33975dd210eb5b759ddc31fe2729d22c08474
Author: Tomas Popela <tpopela redhat com>
Date:   Tue Mar 24 11:42:24 2015 +0100

    EHTMLEditorView - The links in composer are clickable by default

 web-extensions/e-html-editor-view-dom-functions.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/web-extensions/e-html-editor-view-dom-functions.c 
b/web-extensions/e-html-editor-view-dom-functions.c
index f7371e3..9cee713 100644
--- a/web-extensions/e-html-editor-view-dom-functions.c
+++ b/web-extensions/e-html-editor-view-dom-functions.c
@@ -5949,16 +5949,19 @@ dom_process_content_after_load (WebKitDOMDocument *document,
        webkit_dom_element_set_attribute (
                WEBKIT_DOM_ELEMENT (body), "data-message", "", NULL);
 
-       /* Make the quote marks non-selectable. */
-       disable_quote_marks_select (document);
-
        if (e_html_editor_web_extension_get_convert_in_situ (extension)) {
                dom_convert_content (document, extension, NULL);
+               /* Make the quote marks non-selectable. */
+               disable_quote_marks_select (document);
+               dom_set_links_active (document, FALSE);
                e_html_editor_web_extension_set_convert_in_situ (extension, FALSE);
 
                return;
        }
 
+       /* Make the quote marks non-selectable. */
+       disable_quote_marks_select (document);
+       dom_set_links_active (document, FALSE);
        put_body_in_citation (document);
        move_elements_to_body (document);
        repair_gmail_blockquotes (document);
@@ -5970,8 +5973,6 @@ dom_process_content_after_load (WebKitDOMDocument *document,
                dom_remove_embed_style_sheet (document);
        }
 
-       dom_set_links_active (document, FALSE);
-
        /* The composer body could be empty in some case (loading an empty string
         * or empty HTML. In that case create the initial paragraph. */
        if (!webkit_dom_node_get_first_child (WEBKIT_DOM_NODE (body))) {