[evolution-rss] Be able to build against eds/evo 3.3.4

[Lucian Langa <lucilanga src gnome org>]

commit 5bfb98b00894700b8d62e3107fc06cacfb048563
Author: Milan Crha <mcrha redhat com>
Date:   Wed Feb 8 10:01:30 2012 +0100

    Be able to build against eds/evo 3.3.4

 configure.ac             |    3 +++
 src/parser.c             |    4 ++++
 src/rss-config-factory.c |    4 ++++
 src/rss-evo-common.c     |    4 ++++
 src/rss.c                |   20 ++++++++++++++------
 5 files changed, 29 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 550fffc..2c7f5f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,12 +79,14 @@ LIBGLIB_REQUIRED=2.16.2
 LIBGTK_VERSION=2
 LIBGTK_REQUIRED=2.12.0
 EVOLUTION_REQUIRED=2.4.1
+EVOLUTION_ADDITIONAL=
 LIBSOUP_REQUIRED=2.2
 
 if test "$EVOLUTION_BASE_VERSION_S" = "-3.0"; then
 	LIBGTK_VERSION=3
 	LIBGTK_REQUIRED=2.99.3
 	EVOLUTION_REQUIRED=2.91.6
+	EVOLUTION_ADDITIONAL="libemail-utils libemail-engine"
 fi
 
 PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
@@ -93,6 +95,7 @@ PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
    libsoup$SOUP >= $LIBSOUP_REQUIRED dnl
    evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
    evolution-shell$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
+   $EVOLUTION_ADDITIONAL dnl
    libebook-1.2 dnl
 ])
 
diff --git a/src/parser.c b/src/parser.c
index 91484a5..f5b422b 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -25,7 +25,11 @@
 #include <libxml/HTMLparser.h>
 #include <libxml/HTMLtree.h>
 #include <libxml/debugXML.h>
+#if EVOLUTION_VERSION >= 30305
+#include <libemail-engine/mail-ops.h>
+#else
 #include <mail/mail-ops.h>
+#endif
 #include <mail/em-format-html.h>
 #if (DATASERVER_VERSION >= 2031001)
 #include <camel/camel.h>
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index ebb8bb1..1f85541 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -50,9 +50,13 @@
 #include <mail/e-mail-local.h>
 #endif
 #include <mail/em-folder-selector.h>
+#if EVOLUTION_VERSION >= 30305
+#include <libemail-engine/e-mail-folder-utils.h>
+#else
 #if EVOLUTION_VERSION >= 30101
 #include <mail/e-mail-folder-utils.h>
 #endif
+#endif
 
 #include <mail/em-utils.h>
 #include <shell/e-shell.h>
diff --git a/src/rss-evo-common.c b/src/rss-evo-common.c
index 2300e57..ee5603f 100644
--- a/src/rss-evo-common.c
+++ b/src/rss-evo-common.c
@@ -26,9 +26,13 @@
 #if (EVOLUTION_VERSION < 30303)
 #include <mail/e-mail-local.h>
 #endif
+#if EVOLUTION_VERSION >= 30305
+#include <libemail-engine/e-mail-folder-utils.h>
+#else
 #if EVOLUTION_VERSION >= 30101
 #include <mail/e-mail-folder-utils.h>
 #endif
+#endif
 #include <mail/e-mail-reader.h>
 #include <mail/em-folder-utils.h>
 #include <libedataserver/e-proxy.h>
diff --git a/src/rss.c b/src/rss.c
index 47a18fd..7a6f611 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -51,9 +51,6 @@ int rss_verbose_debug = 0;
 #include <mail/em-event.h>
 #include <mail/em-utils.h>
 #include <mail/em-folder-tree.h>
-#if EVOLUTION_VERSION >= 30101
-#include <mail/e-mail-folder-utils.h>
-#endif
 
 #if EVOLUTION_VERSION < 22900 //kb//
 #include <e-util/e-error.h>
@@ -69,9 +66,7 @@ int rss_verbose_debug = 0;
 #if EVOLUTION_VERSION < 30303
 #include <mail/e-mail-local.h>
 #endif
-#if EVOLUTION_VERSION >= 29101
-#include <mail/e-mail-session.h>
-#else
+#if EVOLUTION_VERSION < 29101
 #include <mail/mail-session.h>
 #endif
 #include <shell/e-shell.h>
@@ -81,8 +76,21 @@ int rss_verbose_debug = 0;
 #endif
 #endif
 
+#if EVOLUTION_VERSION >= 30305
+#include <libemail-engine/mail-tools.h>
+#include <libemail-engine/mail-ops.h>
+#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/e-mail-folder-utils.h>
+#else
+#if EVOLUTION_VERSION >= 30101
+#include <mail/e-mail-folder-utils.h>
+#endif
 #include <mail/mail-tools.h>
 #include <mail/mail-ops.h>
+#if EVOLUTION_VERSION >= 29101
+#include <mail/e-mail-session.h>
+#endif
+#endif
 
 #include <mail/em-format-html.h>
 #include <mail/em-format-hook.h>