[evolution/gnome-3-5-5: 1/2] Bug #681400 - Fix build against WebKitGtk+ 1.9.6

[Matthew Barnes <mbarnes src gnome org>]

commit cfc682fa21e20d510207b9fae059bc79b63ffa10
Author: Dan VrÃtil <dvratil redhat com>
Date:   Wed Aug 8 17:50:41 2012 +0200

    Bug #681400 - Fix build against WebKitGtk+ 1.9.6
    
    (cherry picked from commit b24af8b9cd942e50c43c61e7e688fda175ea858f)

 modules/itip-formatter/itip-view.c |   12 ++++++++++--
 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 bc54c65..4a83cf5 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 bb755b1..d84e255 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);