diff options
| author | Kerrick Staley <bugs@kerrickstaley.com> | 2013-11-05 00:10:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-11-05 04:59:14 +0800 |
| commit | 7063a2871097bd62140655a2a0cc8f4e300db4c4 (patch) | |
| tree | 14e1276a398714254e94b87a9d8fff3a40887981 /addressbook | |
| parent | ed2bc85f4fe13a67aec032c8dddef0614df6419f (diff) | |
| download | gsoc2013-evolution-7063a2871097bd62140655a2a0cc8f4e300db4c4.tar gsoc2013-evolution-7063a2871097bd62140655a2a0cc8f4e300db4c4.tar.gz gsoc2013-evolution-7063a2871097bd62140655a2a0cc8f4e300db4c4.tar.bz2 gsoc2013-evolution-7063a2871097bd62140655a2a0cc8f4e300db4c4.tar.lz gsoc2013-evolution-7063a2871097bd62140655a2a0cc8f4e300db4c4.tar.xz gsoc2013-evolution-7063a2871097bd62140655a2a0cc8f4e300db4c4.tar.zst gsoc2013-evolution-7063a2871097bd62140655a2a0cc8f4e300db4c4.zip | |
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.
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/gui/widgets/eab-contact-formatter.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c index 71f7275182..8dbfddf35b 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); |