[evolution/wip/webkit-composer: 934/966] Bug 726658 - [webkit-composer] Lose format looses some text

[Tomas Popela <tpopela src gnome org>]

commit 39df3df27044c16bae01312cd2583d979321bbd6
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Mar 26 12:58:38 2014 +0100

    Bug 726658 - [webkit-composer] Lose format looses some text

 e-util/e-editor-widget.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/e-util/e-editor-widget.c b/e-util/e-editor-widget.c
index a4cb738..620393c 100644
--- a/e-util/e-editor-widget.c
+++ b/e-util/e-editor-widget.c
@@ -2335,6 +2335,7 @@ parse_html_into_paragraphs (EEditorWidget *widget,
        gchar *inner_html;
        gint citation_level = 0;
        GString *start, *end;
+       gboolean ignore_next_br = FALSE;
 
        webkit_dom_html_element_set_inner_html (
                WEBKIT_DOM_HTML_ELEMENT (blockquote), "", NULL);
@@ -2343,6 +2344,7 @@ parse_html_into_paragraphs (EEditorWidget *widget,
        next_br = strstr (prev_br, "<br>");
 
        while (next_br) {
+               gboolean local_ignore_next_br = ignore_next_br;
                const gchar *citation = NULL, *citation_end = NULL;
                const gchar *rest = NULL, *with_br = NULL;
                gchar *to_insert = NULL;
@@ -2353,6 +2355,8 @@ parse_html_into_paragraphs (EEditorWidget *widget,
 
                with_br = strstr (to_insert, "<br>");
 
+               ignore_next_br = FALSE;
+
                citation = strstr (to_insert, "##CITATION_");
                if (citation) {
                        if (strstr (to_insert, "##CITATION_START##"))
@@ -2377,7 +2381,7 @@ parse_html_into_paragraphs (EEditorWidget *widget,
                                document, -1, citation_level);
                }
 
-               if (with_br) {
+               if (with_br && !*rest && !citation &&!local_ignore_next_br) {
                        WebKitDOMNode *paragraph_clone;
 
                        paragraph_clone = webkit_dom_node_clone_node (
@@ -2425,7 +2429,10 @@ parse_html_into_paragraphs (EEditorWidget *widget,
                                NULL);
                }
 
-               prev_br = next_br + 4;
+               if (citation_end)
+                       ignore_next_br = TRUE;
+
+               prev_br = next_br;
                next_br = strstr (prev_br + 4, "<br>");
                g_free (to_insert);
        }