[evolution/wip/webkit-composer: 772/966] Bump the webkitgtk3 minimal version to 2.2.0

[Tomas Popela <tpopela src gnome org>]

commit 4c9150a0112d5c229a3afbe329506b13f1ec1a1c
Author: Tomas Popela <tpopela redhat com>
Date:   Thu Jan 16 17:25:36 2014 +0100

    Bump the webkitgtk3 minimal version to 2.2.0

 composer/e-composer-private.c |    6 +++---
 composer/e-msg-composer.c     |    2 +-
 e-util/e-editor-selection.c   |   21 ++++++---------------
 e-util/e-editor-widget.c      |    5 ++---
 e-util/e-web-view.c           |    2 +-
 5 files changed, 13 insertions(+), 23 deletions(-)
---
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 5f3f303..15160ce 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -855,8 +855,8 @@ composer_move_caret (EMsgComposer *composer)
                element = webkit_dom_document_create_element (document, "DIV", NULL);
                webkit_dom_element_set_class_name (
                        WEBKIT_DOM_ELEMENT (element), "-x-evo-paragraph");
-               webkit_dom_html_element_set_id (
-                       WEBKIT_DOM_HTML_ELEMENT (element), "-x-evo-input-start");
+               webkit_dom_element_set_id (
+                       WEBKIT_DOM_ELEMENT (element), "-x-evo-input-start");
 
                word_wrap_length = e_editor_selection_get_word_wrap_length (editor_selection);
 
@@ -1093,7 +1093,7 @@ insert:
                gchar *id;
 
                node = webkit_dom_node_list_item (signatures, ii);
-               id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (node));
+               id = webkit_dom_element_get_id (WEBKIT_DOM_ELEMENT (node));
 
                /* When we are editing a message with signature we need to set active
                 * signature id in signature combo box otherwise no signature will be added */
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 7625037..a991e83 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3071,7 +3071,7 @@ set_signature_gui (EMsgComposer *composer)
                gchar *id;
 
                node = webkit_dom_node_list_item (nodes, ii);
-               id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (node));
+               id = webkit_dom_element_get_id (WEBKIT_DOM_ELEMENT (node));
                if (id && (strlen (id) == 1) && (*id == '1')) {
                        uid = webkit_dom_element_get_attribute (
                                WEBKIT_DOM_ELEMENT (node), "name");
diff --git a/e-util/e-editor-selection.c b/e-util/e-editor-selection.c
index 9dfb4f9..802fc68 100644
--- a/e-util/e-editor-selection.c
+++ b/e-util/e-editor-selection.c
@@ -2459,9 +2459,7 @@ e_editor_selection_set_monospaced (EEditorSelection *selection,
                        WebKitDOMElement *wrapper;
 
                        wrapper = webkit_dom_document_create_element (document, "SPAN", NULL);
-                       webkit_dom_html_element_set_id (
-                               WEBKIT_DOM_HTML_ELEMENT (wrapper),
-                               "-x-evo-remove-tt");
+                       webkit_dom_element_set_id (wrapper, "-x-evo-remove-tt");
                        webkit_dom_range_surround_contents (range, WEBKIT_DOM_NODE (wrapper), NULL);
 
                        html = webkit_dom_html_element_get_outer_html (WEBKIT_DOM_HTML_ELEMENT (tt_element));
@@ -2515,8 +2513,7 @@ e_editor_selection_set_monospaced (EEditorSelection *selection,
                                return;
                        }
 
-                       webkit_dom_html_element_set_id (
-                               WEBKIT_DOM_HTML_ELEMENT (tt_element), "ev-tt");
+                       webkit_dom_element_set_id (tt_element, "ev-tt");
 
                        inner_html = webkit_dom_html_element_get_inner_html (WEBKIT_DOM_HTML_ELEMENT 
(tt_element));
                        new_inner_html = g_regex_replace_literal (regex, inner_html, -1, 0, "", 0, NULL);
@@ -3371,8 +3368,7 @@ e_editor_selection_save_caret_position (EEditorSelection *selection)
        start_offset_node = webkit_dom_range_get_end_container (range, NULL);
 
        element = webkit_dom_document_create_element (document, "SPAN", NULL);
-       webkit_dom_html_element_set_id (
-               WEBKIT_DOM_HTML_ELEMENT (element), "-x-evo-caret-position");
+       webkit_dom_element_set_id (element, "-x-evo-caret-position");
        webkit_dom_element_set_attribute (
                element, "style", "display: none", NULL);
        webkit_dom_html_element_set_inner_html (
@@ -3921,8 +3917,7 @@ e_editor_selection_wrap_lines (EEditorSelection *selection)
                        return;
 
                webkit_dom_element_remove_attribute (WEBKIT_DOM_ELEMENT (paragraph), "style");
-               webkit_dom_html_element_set_id (
-                       WEBKIT_DOM_HTML_ELEMENT (paragraph),
+               webkit_dom_element_set_id (WEBKIT_DOM_ELEMENT (paragraph),
                        "-x-evo-active-paragraph");
 
                text_content = webkit_dom_node_get_text_content (paragraph);
@@ -4073,9 +4068,7 @@ e_editor_selection_save (EEditorSelection *selection)
 
                marker = webkit_dom_document_create_element (
                        document, "SPAN", NULL);
-               webkit_dom_html_element_set_id (
-                       WEBKIT_DOM_HTML_ELEMENT (marker),
-                       "-x-evolution-selection-start-marker");
+               webkit_dom_element_set_id (marker, "-x-evolution-selection-start-marker");
 
                container = webkit_dom_range_get_start_container (range, NULL);
                if (WEBKIT_DOM_IS_TEXT (container)) {
@@ -4097,9 +4090,7 @@ e_editor_selection_save (EEditorSelection *selection)
 
                marker = webkit_dom_document_create_element (
                        document, "SPAN", NULL);
-               webkit_dom_html_element_set_id (
-                       WEBKIT_DOM_HTML_ELEMENT (marker),
-                       "-x-evolution-selection-end-marker");
+               webkit_dom_element_set_id (marker, "-x-evolution-selection-end-marker");
 
                container = webkit_dom_range_get_end_container (range, NULL);
                if (WEBKIT_DOM_IS_TEXT (container)) {
diff --git a/e-util/e-editor-widget.c b/e-util/e-editor-widget.c
index 207a971..030e5f3 100644
--- a/e-util/e-editor-widget.c
+++ b/e-util/e-editor-widget.c
@@ -756,8 +756,7 @@ editor_widget_set_links_active (EEditorWidget *widget,
                head = webkit_dom_document_get_head (document);
 
                style = webkit_dom_document_create_element (document, "STYLE", NULL);
-               webkit_dom_html_element_set_id (
-                       WEBKIT_DOM_HTML_ELEMENT (style), "--evolution-editor-style-a");
+               webkit_dom_element_set_id (style, "--evolution-editor-style-a");
                webkit_dom_html_element_set_inner_text (
                        WEBKIT_DOM_HTML_ELEMENT (style), "a { cursor: text; }", NULL);
 
@@ -2693,7 +2692,7 @@ html_plain_text_convertor_load_status_changed (WebKitWebView *web_view,
 
                element = webkit_dom_document_create_element (document, "div", NULL);
                element_add_class (element, "-x-evo-paragraph");
-               webkit_dom_html_element_set_id (WEBKIT_DOM_HTML_ELEMENT (element), "-x-evo-input-start");
+               webkit_dom_element_set_id (element, "-x-evo-input-start");
                webkit_dom_node_append_child (
                        WEBKIT_DOM_NODE (webkit_dom_document_get_body (document)),
                        WEBKIT_DOM_NODE (element),
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c
index a951e09..6113c14 100644
--- a/e-util/e-web-view.c
+++ b/e-util/e-web-view.c
@@ -3452,7 +3452,7 @@ element_has_id (WebKitDOMElement *element,
        if (!WEBKIT_DOM_IS_ELEMENT (element))
                return FALSE;
 
-       element_id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (element));
+       element_id = webkit_dom_element_get_id (element);
 
        if (g_ascii_strcasecmp (element_id, id) != 0) {
                g_free (element_id);