[evolution-rss] fix webkit defines



commit 59e8c4b824c258bab2341f903eb886aa745134ac
Author: Lucian Langa <lucilanga gnome org>
Date:   Mon Aug 3 21:20:27 2009 +0300

    fix webkit defines

 configure.ac |    2 ++
 src/rss.c    |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 43818ec..ee34533 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,6 +186,8 @@ if test "x$have_webkit" == "xno"; then
 	AC_DEFINE_UNQUOTED(WEBKIT_UNSTD, 1, [unstandard webkit installation])
 	WEBKIT_CFLAGS=$WebKitGtk_CFLAGS
 	WEBKIT_LIBS=$WebKitGtk_LIBS
+	WEBKIT_VERSION=`$PKG_CONFIG --modversion WebKitGtk` 
+	WEBKIT_VERSION=`echo $WEBKIT_VERSION|$AWK -F . '{print $1 * 1000000 + $2 * 1000 + $3}'`
 else
 	WEBKIT_VERSION=`$PKG_CONFIG --modversion webkit-1.0` 
 	WEBKIT_VERSION=`echo $WEBKIT_VERSION|$AWK -F . '{print $1 * 1000000 + $2 * 1000 + $3}'`
diff --git a/src/rss.c b/src/rss.c
index a4c4b65..d31318c 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -1417,10 +1417,12 @@ void
 webkit_set_preferences(void)
 {
 #ifdef HAVE_WEBKIT
+#if (WEBKIT_VERSION >= 1001001)
 	webkit_session = webkit_get_default_session();
 	if (rss_soup_jar)
 		soup_session_add_feature(webkit_session, SOUP_SESSION_FEATURE(rss_soup_jar));
 #endif
+#endif
 	//requires webkit >= 1.1.11
 	gchar *agstr = g_strdup_printf("Evolution/%s; Evolution-RSS/%s",
                         EVOLUTION_VERSION_STRING, VERSION);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]