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 /e-util/e-web-view.c | |
| 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 'e-util/e-web-view.c')
| -rw-r--r-- | e-util/e-web-view.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c index 2f614dc208..b013f3d031 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"); |