[mail-notification] Fixed compatibility with latest evolution

[epienbro]

commit bfe64ce14c457c1709f8c3f93b162db3d78288bb
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Nov 24 14:53:03 2011 +0100

    Fixed compatibility with latest evolution

 mail-notification-5.4-evolution-3-0-support.patch |   19 ++++++++++++-------
 mail-notification.spec                            |    5 ++++-
 2 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/mail-notification-5.4-evolution-3-0-support.patch b/mail-notification-5.4-evolution-3-0-support.patch
index 51938b5..cfef509 100644
--- a/mail-notification-5.4-evolution-3-0-support.patch
+++ b/mail-notification-5.4-evolution-3-0-support.patch
@@ -5,7 +5,7 @@
      minversion = "2.12";
  
 -  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.15 gtkhtml-editor-3.14", minversion);
-+  packages = g_strdup_printf("evolution-plugin-3.0 >= %s libgtkhtml-4.0 gtkhtml-editor-4.0", minversion);
++  packages = g_strdup_printf("evolution-plugin-3.0 >= %s evolution-shell-3.0", minversion);
    result = jb_check_packages("Evolution", "evolution-plugin", packages);
    g_free(packages);
  
@@ -20,15 +20,18 @@
        if (! plugindir)
 --- src/mn-evolution-plugin.c.orig	2011-02-09 00:07:37.422002566 +0100
 +++ src/mn-evolution-plugin.c	2011-02-09 00:12:43.652678682 +0100
-@@ -25,6 +25,7 @@
+@@ -25,8 +25,10 @@
  #include <dbus/dbus-glib-lowlevel.h>
  #include <dbus/dbus-glib-bindings.h>
  #include <camel/camel.h>
 +#include <libedataserver/eds-version.h>
  #include <mail/em-event.h>
  #include <mail/mail-tools.h>
++#include <mail/e-mail-folder-utils.h>
  #include "mn-evolution.h"
-@@ -240,7 +241,11 @@
+ #include "mn-evolution-server.h"
+ #include "mn-evolution-plugin.h"
+@@ -240,7 +242,11 @@
  					       EMEventTargetFolder *folder)
  {
    if (evo_server)
@@ -40,21 +43,23 @@
  }
  
  void
-@@ -249,10 +250,16 @@
+@@ -249,10 +255,18 @@
  {
    if (evo_server)
      {
 -      char *url;
-+#if EDS_CHECK_VERSION(2,91,0)
++#if EDS_CHECK_VERSION(3,1,0)
++      char *url = e_mail_folder_uri_from_folder(message->folder);
++#elif EDS_CHECK_VERSION(2,91,0)
 +      const char *url = camel_folder_get_uri(message->folder);
 +#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);
 +
-+#if !EDS_CHECK_VERSION(2,91,0)
++#if EDS_CHECK_VERSION(3,1,0) || !EDS_CHECK_VERSION(2,91,0)
        g_free(url);
 +#endif
      }
diff --git a/mail-notification.spec b/mail-notification.spec
index 3d2b17e..81ef47f 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        46%{?dist}
+Release:        47%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -249,6 +249,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
 
 %changelog
+* Thu Nov 24 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4-47
+- Fixed compatibility with latest evolution
+
 * Sun Oct 30 2011 Bruno Wolff III <bruno at wolff.to> - 5.4-46
 - Rebuild against newer evolution-data-server