summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik van Pienbroek <epienbro@fedoraproject.org>2012-05-09 20:55:41 (GMT)
committerErik van Pienbroek <epienbro@fedoraproject.org>2012-05-09 20:55:41 (GMT)
commit37652a0b94bd1ac363da28bf7f703e7ee548ad41 (patch)
tree22f58e9256dcafbbedac832552cc344b07d0fa73
parentd50843d5ee85bfd062a2ac891894b27fd14f4935 (diff)
downloadmail-notification-37652a0b94bd1ac363da28bf7f703e7ee548ad41.zip
mail-notification-37652a0b94bd1ac363da28bf7f703e7ee548ad41.tar.gz
mail-notification-37652a0b94bd1ac363da28bf7f703e7ee548ad41.tar.xz
Fix compatibility with latest evolution (again..)
-rw-r--r--mail-notification-5.4-evolution-3-0-support.patch28
-rw-r--r--mail-notification.spec5
2 files changed, 32 insertions, 1 deletions
diff --git a/mail-notification-5.4-evolution-3-0-support.patch b/mail-notification-5.4-evolution-3-0-support.patch
index 0cc1194..6e89b01 100644
--- a/mail-notification-5.4-evolution-3-0-support.patch
+++ b/mail-notification-5.4-evolution-3-0-support.patch
@@ -258,3 +258,31 @@
g_free(selfp->name);
selfp->name = name;
+--- build/src/mn-evolution-folder-tree-server.c.orig 2012-05-09 22:30:51.870995975 +0200
++++ build/src/mn-evolution-folder-tree-server.c 2012-05-09 22:32:06.031523970 +0200
+@@ -416,7 +416,11 @@
+ #if EDS_CHECK_VERSION(3,1,0)
+ EShell *shell = e_shell_get_default();
+ EShellBackend *shell_backend = e_shell_get_backend_by_name(shell, "mail");
++#if EDS_CHECK_VERSION(3,5,1)
++ GtkWidget *browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend), NULL, NULL, EM_FORMAT_WRITE_MODE_NORMAL);
++#else
+ GtkWidget *browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend));
++#endif
+ EAlertSink *alert_sink = e_mail_reader_get_alert_sink(E_MAIL_READER(browser));
+ #if EDS_CHECK_VERSION(3,4,0)
+ selfp->tree = em_folder_tree_new(e_mail_session_new(), alert_sink);
+--- build/src/mn-evolution-server.c.orig 2012-05-09 22:40:19.949022881 +0200
++++ build/src/mn-evolution-server.c 2012-05-09 22:41:09.307372669 +0200
+@@ -636,7 +636,11 @@
+ shell = e_shell_get_default ();
+ shell_backend = e_shell_get_backend_by_name (shell, "mail");
+
++#if EDS_CHECK_VERSION(3,5,1)
++ browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend), NULL, NULL, EM_FORMAT_WRITE_MODE_NORMAL);
++#else
+ browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend));
++#endif
+ #if EDS_CHECK_VERSION(3,1,0)
+ e_mail_reader_set_folder (E_MAIL_READER (browser), folder);
+ #else
diff --git a/mail-notification.spec b/mail-notification.spec
index ec79140..983c3ea 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,6 +1,6 @@
Name: mail-notification
Version: 5.4
-Release: 55%{?dist}
+Release: 56%{?dist}
Summary: Status icon that informs you if you have new mail
Group: Applications/Internet
@@ -239,6 +239,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
%changelog
+* Wed May 9 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 5.4-56
+- Fix compatibility with latest evolution (again..)
+
* Mon Apr 9 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 5.4-55
- Adding mailboxes was broken with evolution 3.4. Fixed
- Various minor improvements in the gtk3 user interface