[evolution-rss] Bug 617717 - evolution-rss doesn't compile with evolution master

[Lucian Langa <lucilanga src gnome org>]

commit cd42f4d7f2081ac61234dc0fc5267625dfced6e4
Author: Lucian Langa <lucilanga gnome org>
Date:   Wed May 5 21:55:13 2010 +0300

    Bug 617717 - evolution-rss doesn't compile with evolution master

 src/rss-config-factory.c |    8 ++++++++
 src/rss.c                |    4 ++++
 2 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index f97fee7..d00ff9f 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -3160,7 +3160,11 @@ void rss_folder_factory_commit (EPlugin *epl, EConfigTarget *target)
 	EMConfigTargetFolder *targetfolder =
 		(EMConfigTargetFolder *)target->config->target;
 	gchar *main_folder = lookup_main_folder();
+#if (DATASERVER_VERSION >= 2031001)
+	gchar *folder = (gchar *)camel_folder_get_full_name(targetfolder->folder);
+#else
 	gchar *folder = targetfolder->folder->full_name;
+#endif
 
 	if (folder == NULL
 	|| g_ascii_strncasecmp(folder, main_folder, strlen(main_folder))
@@ -3279,7 +3283,11 @@ rss_folder_factory (EPlugin *epl, EConfigHookItemFactoryData *data)
 	EMConfigTargetFolder *target = (EMConfigTargetFolder *)data->config->target;
 	gchar *url = NULL, *ofolder = NULL;
 	gchar *main_folder = lookup_main_folder();
+#if (DATASERVER_VERSION >= 2031001)
+	gchar *folder = (gchar *)camel_folder_get_full_name(target->folder);
+#else
 	gchar *folder = target->folder->full_name;
+#endif
 	add_feed *feed = NULL;
 	GtkWidget *action_area, *ok;
 	GtkAccelGroup *accel_group = gtk_accel_group_new ();
diff --git a/src/rss.c b/src/rss.c
index b6ee2c2..d307f59 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -3015,7 +3015,11 @@ void org_gnome_cooly_folder_refresh(void *ep, EShellView *shell_view)
 	g_object_get (shell_sidebar, "folder-tree", &folder_tree, NULL);
 	folder = em_folder_tree_get_selected_folder (folder_tree);
 	g_return_if_fail (folder != NULL);
+#if (DATASERVER_VERSION >= 2031001)
+	folder_name = camel_folder_get_full_name(folder);
+#else
 	folder_name = folder->full_name;
+#endif
 #else
 	guint taskid;
 	folder_name = t->uri;