[evolution/wip/webkit-composer: 484/966] EEditorSelection - Fix detection of Blockquote block format

[Tomas Popela <tpopela src gnome org>]

commit 991a6fa8e76f5c155b274d8513b50fae3ca99a4b
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Jan 24 13:40:25 2014 +0100

    EEditorSelection - Fix detection of Blockquote block format

 e-util/e-editor-selection.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/e-util/e-editor-selection.c b/e-util/e-editor-selection.c
index 07e45ec..35aef6d 100644
--- a/e-util/e-editor-selection.c
+++ b/e-util/e-editor-selection.c
@@ -169,6 +169,8 @@ get_has_style (EEditorSelection *selection,
                        accept_citation = TRUE;
                        result = ((strlen (element_tag) == 10 /* strlen ("blockquote") */) &&
                                (g_ascii_strncasecmp (element_tag, "blockquote", 10) == 0));
+                       if (element_has_class (element, "-x-evo-indented"))
+                               result = FALSE;
                } else {
                        result = ((tag_len == strlen (element_tag)) &&
                                (g_ascii_strncasecmp (element_tag, style_tag, tag_len) == 0));
@@ -185,6 +187,9 @@ get_has_style (EEditorSelection *selection,
                                        result = FALSE;
                                }
                                g_free (type);
+                       } else {
+                               if (accept_citation)
+                                       result = FALSE;
                        }
                }
 
@@ -1245,20 +1250,17 @@ e_editor_selection_get_block_format (EEditorSelection *selection)
                result = E_EDITOR_SELECTION_BLOCK_FORMAT_H5;
        } else if (e_editor_dom_node_find_parent_element (node, "H6")) {
                result = E_EDITOR_SELECTION_BLOCK_FORMAT_H6;
+       } else if ((element = e_editor_dom_node_find_parent_element (node, "BLOCKQUOTE")) != NULL) {
+               if (element_has_class (element, "-x-evo-indented"))
+                       result = E_EDITOR_SELECTION_BLOCK_FORMAT_PARAGRAPH;
+               else
+                       result = E_EDITOR_SELECTION_BLOCK_FORMAT_BLOCKQUOTE;
        } else if (e_editor_dom_node_find_parent_element (node, "P")) {
                result = E_EDITOR_SELECTION_BLOCK_FORMAT_PARAGRAPH;
        } else {
                result = E_EDITOR_SELECTION_BLOCK_FORMAT_PARAGRAPH;
        }
 
-       element = webkit_dom_node_get_parent_element (node);
-       if (element) {
-               /* Indented paragraphs should have the same format as unindented */
-               if (element_has_tag (element, "blockquote"))
-                       if (!element_has_class (element, "-x-evo-indented"))
-                               result = E_EDITOR_SELECTION_BLOCK_FORMAT_BLOCKQUOTE;
-       }
-
        return result;
 }