diff options
| author | Dan Vrátil <dvratil@redhat.com> | 2012-08-08 23:50:41 +0800 |
|---|---|---|
| committer | Dan Vrátil <dvratil@redhat.com> | 2012-08-08 23:50:41 +0800 |
| commit | b24af8b9cd942e50c43c61e7e688fda175ea858f (patch) | |
| tree | cc49bc20b2c359899f3c1660789652b7759409ab | |
| parent | c9f87334633b90f76e2052710acdd42fedb15ebb (diff) | |
| download | gsoc2013-evolution-b24af8b9cd942e50c43c61e7e688fda175ea858f.tar.gz gsoc2013-evolution-b24af8b9cd942e50c43c61e7e688fda175ea858f.tar.zst gsoc2013-evolution-b24af8b9cd942e50c43c61e7e688fda175ea858f.zip | |
Bug #681400 - Fix build against WebKitGtk+ 1.9.6
| -rw-r--r-- | modules/itip-formatter/itip-view.c | 12 | ||||
| -rw-r--r-- | widgets/misc/e-web-view.c | 13 |
2 files changed, 21 insertions, 4 deletions
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c index bc54c65139..4a83cf5932 100644 --- a/modules/itip-formatter/itip-view.c +++ b/modules/itip-formatter/itip-view.c @@ -1105,8 +1105,16 @@ itip_view_rebuild_source_list (ItipView *view) webkit_dom_html_element_set_inner_html ( WEBKIT_DOM_HTML_ELEMENT (option), e_source_get_display_name (source), NULL); - webkit_dom_html_element_set_class_name ( - WEBKIT_DOM_HTML_ELEMENT (option), "calendar"); + + /* See https://bugzilla.gnome.org/show_bug.cgi?id=681400 + * FIXME: This can be removed once we require WebKitGtk 1.10+ */ + #if WEBKIT_CHECK_VERSION (1, 9, 6) + webkit_dom_element_set_class_name ( + WEBKIT_DOM_ELEMENT (option), "calendar"); + #else + webkit_dom_html_element_set_class_name ( + WEBKIT_DOM_HTML_ELEMENT (option), "calendar"); + #endif if (!e_source_get_writable (source)) { webkit_dom_html_option_element_set_disabled ( diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c index bb7f64e8bf..ddac836f26 100644 --- a/widgets/misc/e-web-view.c +++ b/widgets/misc/e-web-view.c @@ -469,8 +469,17 @@ web_view_update_document_highlights (EWebView *web_view) WebKitDOMElement *span; span = webkit_dom_document_create_element (document, "span", NULL); - webkit_dom_html_element_set_class_name ( - WEBKIT_DOM_HTML_ELEMENT (span), "__evo-highlight"); + + /* See https://bugzilla.gnome.org/show_bug.cgi?id=681400 + * FIXME: This can be removed once we require WebKitGtk 1.10+ */ + #if WEBKIT_CHECK_VERSION (1, 9, 6) + webkit_dom_element_set_class_name ( + span, "__evo-highlight"); + #else + webkit_dom_html_element_set_class_name ( + WEBKIT_DOM_HTML_ELEMENT (span), "__evo-highlight"); + #endif + webkit_dom_html_element_set_inner_text ( WEBKIT_DOM_HTML_ELEMENT (span), iter->data, NULL); |