[evolution-rss] Bug 666374 - Adapt to API changes in Evolution 3.3.3

[Lucian Langa <lucilanga src gnome org>]

commit a6b656aeb4a1e0d06955fd599c50a8b68fed1922
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Dec 19 20:33:07 2011 +0100

    Bug 666374 - Adapt to API changes in Evolution 3.3.3

 src/notification.c       |    7 +++++++
 src/rss-config-factory.c |    8 ++++++++
 src/rss-evo-common.c     |   27 +++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 0 deletions(-)
---
diff --git a/src/notification.c b/src/notification.c
index ce32334..696cecc 100644
--- a/src/notification.c
+++ b/src/notification.c
@@ -107,9 +107,16 @@ rss_error(gpointer key, gchar *name, gchar *error, gchar *emsg)
 
 #if (EVOLUTION_VERSION >= 29102)
 			backend = (EMailBackend *)e_shell_get_backend_by_name (shell, "mail");
+#if (EVOLUTION_VERSION >= 30303)
+			e_alert_submit (
+				e_mail_backend_get_alert_sink (backend),
+				"org-gnome-evolution-rss:feederr",
+				error, msg, NULL);
+#else
 			e_mail_backend_submit_alert (
 				backend, "org-gnome-evolution-rss:feederr",
 				error, msg, NULL);
+#endif
 #else
 			ed = e_alert_dialog_new_for_args(parent,
 				"org-gnome-evolution-rss:feederr",
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index ef71595..28ec498 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -488,6 +488,13 @@ folder_cb (GtkWidget *widget, gpointer data)
 #if EVOLUTION_VERSION >= 30105
 	model = em_folder_tree_model_get_default ();
 #endif
+#if EVOLUTION_VERSION >= 30303
+	dialog = em_folder_selector_new (
+			window,
+			model,
+			EM_FOLDER_SELECTOR_CAN_CREATE,
+			_("Move to Folder"), NULL, _("M_ove"));
+#else
 	dialog = em_folder_selector_new (
 			window,
 #if EVOLUTION_VERSION >= 30101
@@ -500,6 +507,7 @@ folder_cb (GtkWidget *widget, gpointer data)
 #endif
 			EM_FOLDER_SELECTOR_CAN_CREATE,
 			_("Move to Folder"), NULL, _("M_ove"));
+#endif
 
 #if EVOLUTION_VERSION >= 30101
 	selector = EM_FOLDER_SELECTOR (dialog);
diff --git a/src/rss-evo-common.c b/src/rss-evo-common.c
index 6c6ca6e..a3103cb 100644
--- a/src/rss-evo-common.c
+++ b/src/rss-evo-common.c
@@ -120,6 +120,15 @@ rss_emfu_copy_folder_selected (EMailBackend *backend,
 		CAMEL_SESSION (session), cfd->fi->uri, &local_error);
 	if (fromstore == NULL) {
 #endif
+#if EVOLUTION_VERSION >= 30303
+		e_alert_submit (
+			e_mail_backend_get_alert_sink (backend),
+			cfd->delete ?
+				"mail:no-move-folder-notexist" :
+				"mail:no-copy-folder-notexist",
+			cfd->source_folder_name, uri,
+			local_error->message, NULL);
+#else
 		e_mail_backend_submit_alert (
 			backend, cfd->delete ?
 				"mail:no-move-folder-notexist" :
@@ -130,6 +139,7 @@ rss_emfu_copy_folder_selected (EMailBackend *backend,
 			cfd->fi->full_name, uri,
 #endif
 			local_error->message, NULL);
+#endif
 		goto fail;
 	}
 
@@ -143,6 +153,12 @@ rss_emfu_copy_folder_selected (EMailBackend *backend,
 
 	if (cfd->delete && fromstore == local_store && rss_emfu_is_special_local_folder (cfd->fi->full_name)) {
 #endif
+#if EVOLUTION_VERSION >= 30303
+		e_alert_submit (
+			e_mail_backend_get_alert_sink (backend),
+			"mail:no-rename-special-folder",
+			cfd->source_folder_name, NULL);
+#else
 		e_mail_backend_submit_alert (
 			backend, "mail:no-rename-special-folder",
 #if EVOLUTION_VERSION >= 30101
@@ -150,6 +166,7 @@ rss_emfu_copy_folder_selected (EMailBackend *backend,
 #else
 			cfd->fi->full_name, NULL);
 #endif
+#endif
 		goto fail;
 	}
 
@@ -170,6 +187,15 @@ rss_emfu_copy_folder_selected (EMailBackend *backend,
 		CAMEL_SESSION (session), uri, &local_error);
 	if (tostore == NULL) {
 #endif
+#if EVOLUTION_VERSION >= 30303
+		e_alert_submit (
+			e_mail_backend_get_alert_sink (backend),
+			cfd->delete ?
+				"mail:no-move-folder-to-notexist" :
+				"mail:no-copy-folder-to-notexist",
+			cfd->source_folder_name, uri,
+			local_error->message, NULL);
+#else
 		e_mail_backend_submit_alert (
 			backend, cfd->delete ?
 				"mail:no-move-folder-to-notexist" :
@@ -180,6 +206,7 @@ rss_emfu_copy_folder_selected (EMailBackend *backend,
 			cfd->fi->full_name, uri,
 #endif
 			local_error->message, NULL);
+#endif
 		goto fail;
 	}