[evolution/gnome-3-16] EHTMLEditorView - WebKitDOMRange is lost when editing quoted content

[Tomas Popela <tpopela src gnome org>]

commit b885a156a55b99f479eb54dd1babbc922f61debd
Author: Tomas Popela <tpopela redhat com>
Date:   Mon Apr 20 16:38:18 2015 +0200

    EHTMLEditorView - WebKitDOMRange is lost when editing quoted content

 e-util/e-html-editor-view.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index e6928d8..19fd622 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -2734,8 +2734,7 @@ body_input_event_cb (WebKitDOMElement *element,
                view->priv->undo_redo_in_progress = FALSE;
                view->priv->dont_save_history_in_body_input = FALSE;
                e_html_editor_view_force_spell_check_for_current_paragraph (view);
-               g_object_unref (range);
-               return;
+               goto out;
        }
 
        if (!save_history_after_event_in_table (view)) {
@@ -2918,12 +2917,12 @@ body_input_event_cb (WebKitDOMElement *element,
 
                citation_level = get_citation_level (node, FALSE);
                if (citation_level == 0)
-                       return;
+                       goto out;
 
                selection_start_marker = webkit_dom_document_query_selector (
                        document, "span#-x-evo-selection-start-marker", NULL);
                if (selection_start_marker)
-                       return;
+                       goto out;
 
                e_html_editor_selection_save (selection);
 
@@ -2951,7 +2950,7 @@ body_input_event_cb (WebKitDOMElement *element,
                        WEBKIT_DOM_NODE (selection_start_marker)));
                if (WEBKIT_DOM_IS_HTML_PRE_ELEMENT (parent)) {
                        e_html_editor_selection_restore (selection);
-                       return;
+                       goto out;
                }
 
                if (selection_start_marker) {
@@ -3014,11 +3013,12 @@ body_input_event_cb (WebKitDOMElement *element,
                                e_html_editor_selection_restore (selection);
                                e_html_editor_view_force_spell_check_for_current_paragraph  (view);
 
-                               return;
+                               goto out;
                        }
                }
                e_html_editor_selection_restore (selection);
        }
+ out:
        g_object_unref (range);
 }