[evolution-rss] adapt to evo/eds changes

[Lucian Langa <lucilanga src gnome org>]

commit bf82dafc298d47b687ae76749c10ea22b0c52811
Author: Lucian Langa <lucilanga gnome org>
Date:   Sun Jul 29 20:20:10 2012 +0200

    adapt to evo/eds changes

 src/parser.c    |   12 ++++++++++++
 src/rss-cache.c |    4 ++++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/src/parser.c b/src/parser.c
index 1e45323..f071f86 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -30,6 +30,9 @@
 #else
 #include <mail/mail-ops.h>
 #endif
+#if EVOLUTION_VERSION >= 30505
+#include <mail/e-mail-reader-utils.h>
+#endif
 
 #if (EVOLUTION_VERSION > 30501)
 #include <em-format/e-mail-formatter.h>
@@ -1255,13 +1258,22 @@ parse_channel_line(xmlNode *top, gchar *feed_name, RDF *r, gchar **article_uid)
 
 }
 
+extern EShellView *rss_shell_view;
 void
 refresh_mail_folder(CamelFolder *mail_folder);
 
 void
 refresh_mail_folder(CamelFolder *mail_folder)
 {
+#if EVOLUTION_VERSION < 30505
 	mail_refresh_folder(mail_folder, NULL, NULL);
+#else
+	EShellContent *shell_content;
+	EMailReader *reader;
+	shell_content = e_shell_view_get_shell_content (rss_shell_view);
+	reader = E_MAIL_READER (shell_content);
+	e_mail_reader_refresh_folder(reader, mail_folder);
+#endif
 #if (DATASERVER_VERSION >= 2033001)
 		camel_folder_synchronize (mail_folder, FALSE, G_PRIORITY_DEFAULT,
 			NULL, NULL, NULL);
diff --git a/src/rss-cache.c b/src/rss-cache.c
index 38fab90..b075659 100644
--- a/src/rss-cache.c
+++ b/src/rss-cache.c
@@ -137,7 +137,11 @@ rss_cache_get_filename(gchar *url)
 #if DATASERVER_VERSION <= 2025004
 	return data_cache_path(cache, FALSE, HTTP_CACHE_PATH, url);
 #else
+#if EVOLUTION_VERSION < 30504
 	return camel_data_cache_get_filename(cache, HTTP_CACHE_PATH, url, NULL);
+#else
+	return camel_data_cache_get_filename(cache, HTTP_CACHE_PATH, url);
+#endif
 #endif
 }