[evolution] EHTMLEditorSelection - Remove just the BR elements that are used for the wrapping unless it is force

[Tomas Popela <tpopela src gnome org>]

commit ed8e9ec9fec8b32c17b4cb51a9052751cb5d74b4
Author: Tomas Popela <tpopela redhat com>
Date:   Thu Aug 7 11:33:51 2014 +0200

    EHTMLEditorSelection - Remove just the BR elements that are used for the wrapping unless it is forced

 e-util/e-html-editor-selection.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/e-util/e-html-editor-selection.c b/e-util/e-html-editor-selection.c
index 86f96ce..ee9937f 100644
--- a/e-util/e-html-editor-selection.c
+++ b/e-util/e-html-editor-selection.c
@@ -5090,8 +5090,12 @@ wrap_lines (EHTMLEditorSelection *selection,
 
                        while (nd) {
                                WebKitDOMNode *next_nd = webkit_dom_node_get_next_sibling (nd);
-                               if (WEBKIT_DOM_IS_HTMLBR_ELEMENT (nd))
-                                       remove_node (nd);
+                               if (WEBKIT_DOM_IS_HTMLBR_ELEMENT (nd)) {
+                                       if (remove_all_br)
+                                               remove_node (nd);
+                                       else if (element_has_class (WEBKIT_DOM_ELEMENT (nd), 
"-x-evo-wrap-br"))
+                                               remove_node (nd);
+                               }
                                nd = next_nd;
                        }
                }