[evolution] Bug 707112 - Replace webkit_dom_html_element_get_id usage

[Matthew Barnes <mbarnes src gnome org>]

commit 7063a2871097bd62140655a2a0cc8f4e300db4c4
Author: Kerrick Staley <bugs kerrickstaley com>
Date:   Mon Nov 4 11:10:12 2013 -0500

    Bug 707112 - Replace webkit_dom_html_element_get_id usage
    
    webkit_dom_element_get_id() was introduced for WebKitGTK+ 2.2 and
    deprecates webkit_dom_html_element_get_id().  But Evolution only
    requires WebKitGTK+ 2.0.1.
    
    Ordinarily this would sit on a shelf until we require WebKitGTK+ 2.2,
    however WebKitGTK+ has now started issuing deprecation warnings about
    webkit_dom_html_element_get_id() at *runtime*, which is pointless and
    only fills up users' .xsession-errors file.
    
    To put a stop to this, we'll call the new function subject to a pre-
    processor WebKit version check, with a fallback to the old function.
    
    The build requirement remains at WebKitGTK+ 2.0.1.

 addressbook/gui/widgets/eab-contact-formatter.c |    8 +++++++-
 e-util/e-web-view.c                             |    6 ++++++
 modules/itip-formatter/itip-view.c              |   14 +++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c
index 71f7275..8dbfddf 100644
--- a/addressbook/gui/widgets/eab-contact-formatter.c
+++ b/addressbook/gui/widgets/eab-contact-formatter.c
@@ -1158,7 +1158,13 @@ collapse_contacts_list (WebKitDOMEventTarget *event_target,
        gboolean hidden;
 
        document = user_data;
-       id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (event_target));
+#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
 
        list_id = g_strconcat ("list-", id, NULL);
        list = webkit_dom_document_get_element_by_id (document, list_id);
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c
index 2f614dc..b013f3d 100644
--- a/e-util/e-web-view.c
+++ b/e-util/e-web-view.c
@@ -3305,9 +3305,15 @@ 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");
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c
index 45f0b1d..769b45a 100644
--- a/modules/itip-formatter/itip-view.c
+++ b/modules/itip-formatter/itip-view.c
@@ -796,7 +796,15 @@ alarm_check_toggled_cb (WebKitDOMHTMLInputElement *check1,
                         ItipView *view)
 {
        WebKitDOMElement *check2;
-       gchar *id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (check1));
+       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
 
        if (g_strcmp0 (id, CHECKBOX_INHERIT_ALARM)) {
                check2 = webkit_dom_document_get_element_by_id (
@@ -905,7 +913,11 @@ 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) {