[mail-notification] Fixed the compilation against the latest evolution
epienbro
epienbro at fedoraproject.org
Fri Jun 17 22:53:21 UTC 2011
commit b7f03557bc87f55d6a9698de9bf0acc194996d4f
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sat Jun 18 00:52:44 2011 +0200
Fixed the compilation against the latest evolution
More changes are still needed for full compatibility
mail-notification-5.4-evolution-3-0-support.patch | 27 ++++++++++++++++++++-
mail-notification.spec | 6 ++++-
2 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/mail-notification-5.4-evolution-3-0-support.patch b/mail-notification-5.4-evolution-3-0-support.patch
index b3e818e..51938b5 100644
--- a/mail-notification-5.4-evolution-3-0-support.patch
+++ b/mail-notification-5.4-evolution-3-0-support.patch
@@ -28,6 +28,18 @@
#include <mail/em-event.h>
#include <mail/mail-tools.h>
#include "mn-evolution.h"
+@@ -240,7 +241,11 @@
+ EMEventTargetFolder *folder)
+ {
+ if (evo_server)
++#if EDS_CHECK_VERSION(3,1,0)
++ mn_evolution_server_folder_changed(evo_server, e_mail_folder_uri_build(folder->store, folder->folder_name));
++#else
+ mn_evolution_server_folder_changed(evo_server, folder->uri);
++#endif
+ }
+
+ void
@@ -249,10 +250,16 @@
{
if (evo_server)
@@ -38,7 +50,7 @@
+#else
+ char *url = mail_tools_folder_to_url(message->folder);
+#endif
-
+
- url = mail_tools_folder_to_url(message->folder);
mn_evolution_server_message_reading(evo_server, url);
+
@@ -95,3 +107,16 @@
e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
gtk_widget_show (browser);
#else
+--- build/src/mn-evolution-folder-tree-server.c.orig 2011-06-17 22:01:49.226886994 +0200
++++ build/src/mn-evolution-folder-tree-server.c 2011-06-18 00:34:23.046889847 +0200
+@@ -444,7 +444,9 @@
+ {
+ #line 61 "src/mn-evolution-folder-tree-server.gob"
+
+-#if EDS_CHECK_VERSION(2,91,0)
++#if EDS_CHECK_VERSION(3,1,0)
++ selfp->tree = em_folder_tree_new(NULL, NULL);
++#elif EDS_CHECK_VERSION(2,91,0)
+ selfp->session = e_mail_session_new();
+ selfp->tree = em_folder_tree_new(selfp->session);
+ #elif EDS_CHECK_VERSION(2,29,0)
diff --git a/mail-notification.spec b/mail-notification.spec
index 9d6ed58..70fb95e 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,6 +1,6 @@
Name: mail-notification
Version: 5.4
-Release: 37%{?dist}
+Release: 38%{?dist}
Summary: Status icon that informs you if you have new mail
Group: Applications/Internet
@@ -245,6 +245,10 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
%changelog
+* Fri Jun 17 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4-38
+- Fixed the compilation against the latest evolution
+ More changes are still needed for full compatibility
+
* Wed Jun 15 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-37
- rebuild for new evolution-data-server
More information about the scm-commits
mailing list