diff options
| author | Tomas Popela <tpopela@redhat.com> | 2014-09-12 15:55:52 +0800 |
|---|---|---|
| committer | Tomas Popela <tpopela@redhat.com> | 2014-09-12 16:23:26 +0800 |
| commit | fd226bf07d20e124a3e498f1b0776a5341aa93ce (patch) | |
| tree | c4902ea8f3e5ad1a7de773365545e3c7f747477f | |
| parent | e574751387406936204f7c146401b0576f3412c6 (diff) | |
| download | gsoc2013-evolution-fd226bf07d20e124a3e498f1b0776a5341aa93ce.tar gsoc2013-evolution-fd226bf07d20e124a3e498f1b0776a5341aa93ce.tar.gz gsoc2013-evolution-fd226bf07d20e124a3e498f1b0776a5341aa93ce.tar.bz2 gsoc2013-evolution-fd226bf07d20e124a3e498f1b0776a5341aa93ce.tar.lz gsoc2013-evolution-fd226bf07d20e124a3e498f1b0776a5341aa93ce.tar.xz gsoc2013-evolution-fd226bf07d20e124a3e498f1b0776a5341aa93ce.tar.zst gsoc2013-evolution-fd226bf07d20e124a3e498f1b0776a5341aa93ce.zip | |
Replace the webkit_dom_node_get_node_type function with equivalent macros
| -rw-r--r-- | e-util/e-html-editor-selection.c | 6 | ||||
| -rw-r--r-- | e-util/e-html-editor.c | 2 | ||||
| -rw-r--r-- | plugins/external-editor/external-editor.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/e-util/e-html-editor-selection.c b/e-util/e-html-editor-selection.c index 08bcd62040..de3e43174c 100644 --- a/e-util/e-html-editor-selection.c +++ b/e-util/e-html-editor-selection.c @@ -894,16 +894,16 @@ e_html_editor_selection_has_text (EHTMLEditorSelection *selection) range = html_editor_selection_get_current_range (selection); node = webkit_dom_range_get_start_container (range, NULL); - if (webkit_dom_node_get_node_type (node) == 3) + if (WEBKIT_DOM_IS_TEXT (node)) return TRUE; node = webkit_dom_range_get_end_container (range, NULL); - if (webkit_dom_node_get_node_type (node) == 3) + if (WEBKIT_DOM_IS_TEXT (node)) return TRUE; node = WEBKIT_DOM_NODE (webkit_dom_range_clone_contents (range, NULL)); while (node) { - if (webkit_dom_node_get_node_type (node) == 3) + if (WEBKIT_DOM_IS_TEXT (node)) return TRUE; if (webkit_dom_node_has_child_nodes (node)) { diff --git a/e-util/e-html-editor.c b/e-util/e-html-editor.c index aef38bc6f8..74b4a9b65c 100644 --- a/e-util/e-html-editor.c +++ b/e-util/e-html-editor.c @@ -352,7 +352,7 @@ html_editor_update_actions (EHTMLEditor *editor, visible = (WEBKIT_DOM_IS_HTMLHR_ELEMENT (node)); gtk_action_set_visible (ACTION (CONTEXT_PROPERTIES_RULE), visible); - visible = (webkit_dom_node_get_node_type (node) == 3); + visible = (WEBKIT_DOM_IS_TEXT (node)); gtk_action_set_visible (ACTION (CONTEXT_PROPERTIES_TEXT), visible); visible = diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index 9ada39f0be..5efff46979 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -287,7 +287,7 @@ get_caret_position (EHTMLEditorView *view) node, webkit_dom_dom_selection_get_anchor_node (selection))) { break; - } else if (webkit_dom_node_get_node_type (node) == 3) { + } else if (WEBKIT_DOM_IS_TEXT (node)) { gchar *text = webkit_dom_node_get_text_content (node); range_count += strlen (text); g_free (text); |