[evolution/wip/webkit2] EHTMLEditorView - Opening a draft that was not created in composer should respect the wrap/don't wra

[Tomas Popela <tpopela src gnome org>]

commit bc3134804539a685b007446095f8db657ec60def
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Jun 29 16:26:43 2016 +0200

    EHTMLEditorView - Opening a draft that was not created in composer should respect the wrap/don't wrap 
preference
    
    Otherwise doing anything similar to:
    
    mv `git format-patch HEAD^` ~/.local/share/evolution/mail/local/.Drafts/new/
    
    will always end wrapped and some spaces could be replaced with non-breaking spaces

 .../web-extension/e-editor-dom-functions.c         |   25 ++++++++------------
 1 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c 
b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
index 93da842..d077c5d 100644
--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
@@ -5126,25 +5126,20 @@ parse_html_into_blocks (EEditorPage *editor_page,
        webkit_dom_element_set_inner_html (parent, "", NULL);
 
        if (!block_template) {
-               if (WEBKIT_DOM_IS_HTML_QUOTE_ELEMENT (parent)) {
-                       gboolean use_paragraphs;
-                       GSettings *settings;
+               gboolean use_paragraphs;
+               GSettings *settings;
 
-                       settings = e_util_ref_settings ("org.gnome.evolution.mail");
+               settings = e_util_ref_settings ("org.gnome.evolution.mail");
 
-                       use_paragraphs = g_settings_get_boolean (
-                               settings, "composer-wrap-quoted-text-in-replies");
+               use_paragraphs = g_settings_get_boolean (
+                       settings, "composer-wrap-quoted-text-in-replies");
 
-                       if (use_paragraphs)
-                               block_template = e_editor_dom_get_paragraph_element (
-                                       editor_page, -1, 0);
-                       else
-                               block_template = webkit_dom_document_create_element (document, "pre", NULL);
+               if (use_paragraphs)
+                       block_template = e_editor_dom_get_paragraph_element (editor_page, -1, 0);
+               else
+                       block_template = webkit_dom_document_create_element (document, "pre", NULL);
 
-                       g_object_unref (settings);
-               } else
-                       block_template = e_editor_dom_get_paragraph_element (
-                               editor_page, -1, 0);
+               g_object_unref (settings);
        }
 
        prev_br = html;