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

[Tomas Popela <tpopela src gnome org>]

commit 05631a27322b065af05eda4f7f4fb09a63a3988f
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Feb 4 18:22:29 2015 +0100

    EHTMLEditorView - The links in composer are clickable by default

 e-util/e-html-editor-view.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 36db5ef..c071093 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -7311,16 +7311,19 @@ html_editor_view_load_status_changed (EHTMLEditorView *view)
        webkit_dom_element_set_attribute (
                WEBKIT_DOM_ELEMENT (body), "data-message", "", NULL);
 
-       /* Make the quote marks non-selectable. */
-       disable_quote_marks_select (document);
-
        if (view->priv->convert_in_situ) {
                html_editor_convert_view_content (view, NULL);
+               /* Make the quote marks non-selectable. */
+               disable_quote_marks_select (document);
+               html_editor_view_set_links_active (view, FALSE);
                view->priv->convert_in_situ = FALSE;
 
                return;
        }
 
+       /* Make the quote marks non-selectable. */
+       disable_quote_marks_select (document);
+       html_editor_view_set_links_active (view, FALSE);
        put_body_in_citation (document);
        move_elements_to_body (document);
        repair_gmail_blockquotes (document);
@@ -7616,8 +7619,6 @@ e_html_editor_view_init (EHTMLEditorView *view)
        webkit_web_view_load_string (
                WEBKIT_WEB_VIEW (view), "", "text/html", "UTF-8", "file://");
 
-       html_editor_view_set_links_active (view, FALSE);
-
        if (emd_global_http_cache == NULL) {
                user_cache_dir = e_get_user_cache_dir ();
                emd_global_http_cache = camel_data_cache_new (user_cache_dir, NULL);