GNOME.org
 

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

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

    Bump the webkitgtk3 minimal version to 2.2.0

 addressbook/gui/widgets/eab-contact-formatter.c |    8 +-------
 composer/e-composer-private.c                   |    6 +++---
 composer/e-msg-composer.c                       |    2 +-
 configure.ac                                    |    2 +-
 e-util/e-editor-selection.c                     |   21 ++++++---------------
 e-util/e-editor-widget.c                        |    5 ++---
 e-util/e-web-view.c                             |    8 +-------
 modules/itip-formatter/itip-view.c              |   12 +-----------
 8 files changed, 16 insertions(+), 48 deletions(-)
---
diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c
index f4b24a2..fe3ca24 100644
--- a/addressbook/gui/widgets/eab-contact-formatter.c
+++ b/addressbook/gui/widgets/eab-contact-formatter.c
@@ -1196,13 +1196,7 @@ collapse_contacts_list (WebKitDOMEventTarget *event_target,
        gboolean hidden;
 
        document = user_data;
-#if WEBKIT_CHECK_VERSION(2,2,0)  /* XXX should really be (2,1,something) */
-       id = webkit_dom_element_get_id (
-               WEBKIT_DOM_ELEMENT (event_target));
-#else
-       id = webkit_dom_html_element_get_id (
-               WEBKIT_DOM_HTML_ELEMENT (event_target));
-#endif
+       id = webkit_dom_element_get_id (WEBKIT_DOM_ELEMENT (event_target));
 
        list_id = g_strconcat ("list-", id, NULL);
        list = webkit_dom_document_get_element_by_id (document, list_id);
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index a0ddf45..29fdb92 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -837,8 +837,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);
 
@@ -1070,7 +1070,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 3a147d6..5318631 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3091,7 +3091,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/configure.ac b/configure.ac
index 51ae243..520f0f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ m4_define([enchant_minimum_version], [1.1.7])
 m4_define([gnome_desktop_minimum_version], [2.91.3])
 m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])
 m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92])
-m4_define([webkitgtk_minimum_version], [2.0.1])
+m4_define([webkitgtk_minimum_version], [2.2.0])
 m4_define([libgdata_minimum_version], [0.10])
 m4_define([libxml_minimum_version], [2.7.3])
 m4_define([shared_mime_info_minimum_version], [0.22])
diff --git a/e-util/e-editor-selection.c b/e-util/e-editor-selection.c
index 9864e50..7050e89 100644
--- a/e-util/e-editor-selection.c
+++ b/e-util/e-editor-selection.c
@@ -2463,9 +2463,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));
@@ -2519,8 +2517,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);
@@ -3375,8 +3372,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 (
@@ -3925,8 +3921,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);
@@ -4077,9 +4072,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)) {
@@ -4101,9 +4094,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 80f47d3..5d6df42 100644
--- a/e-util/e-web-view.c
+++ b/e-util/e-web-view.c
@@ -3294,15 +3294,9 @@ e_web_view_create_and_add_css_style_sheet (WebKitDOMDocument *document,
        if (!style_element) {
                /* Create new <style> element */
                style_element = webkit_dom_document_create_element (document, "style", NULL);
-#if WEBKIT_CHECK_VERSION(2,2,0)  /* XXX should really be (2,1,something) */
                webkit_dom_element_set_id (
                        WEBKIT_DOM_ELEMENT (style_element),
                        style_sheet_id);
-#else
-               webkit_dom_html_element_set_id (
-                       WEBKIT_DOM_HTML_ELEMENT (style_element),
-                       style_sheet_id);
-#endif
                webkit_dom_html_style_element_set_media (
                        WEBKIT_DOM_HTML_STYLE_ELEMENT (style_element),
                        "screen");
@@ -3470,7 +3464,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);
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c
index f19c418..bc84d3f 100644
--- a/modules/itip-formatter/itip-view.c
+++ b/modules/itip-formatter/itip-view.c
@@ -791,13 +791,7 @@ alarm_check_toggled_cb (WebKitDOMHTMLInputElement *check1,
        WebKitDOMElement *check2;
        gchar *id;
 
-#if WEBKIT_CHECK_VERSION(2,2,0)  /* XXX should really be (2,1,something) */
-       id = webkit_dom_element_get_id (
-               WEBKIT_DOM_ELEMENT (check1));
-#else
-       id = webkit_dom_html_element_get_id (
-               WEBKIT_DOM_HTML_ELEMENT (check1));
-#endif
+       id = webkit_dom_element_get_id (WEBKIT_DOM_ELEMENT (check1));
 
        if (g_strcmp0 (id, CHECKBOX_INHERIT_ALARM)) {
                check2 = webkit_dom_document_get_element_by_id (
@@ -906,11 +900,7 @@ append_info_item_row (ItipView *view,
                WEBKIT_DOM_HTML_TABLE_ELEMENT (table), -1, NULL);
 
        id = g_strdup_printf ("%s_row_%d", table_id, item->id);
-#if WEBKIT_CHECK_VERSION(2,2,0)  /* XXX should really be (2,1,something) */
        webkit_dom_element_set_id (WEBKIT_DOM_ELEMENT (row), id);
-#else
-       webkit_dom_html_element_set_id (row, id);
-#endif
        g_free (id);
 
        switch (item->type) {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]