[mail-notification] support evolution 2.90+

[Dmitry Butskoy]

commit 0a002ddd116bd02343a4f9bbf4d0efdf594557ee
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Tue Oct 12 16:57:58 2010 +0400

    support evolution 2.90+

 mail-notification-5.4-evolution.patch |   29 +++++++++++++++++++++--------
 mail-notification.spec                |    1 +
 2 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/mail-notification-5.4-evolution.patch b/mail-notification-5.4-evolution.patch
index 2900186..647e64a 100644
--- a/mail-notification-5.4-evolution.patch
+++ b/mail-notification-5.4-evolution.patch
@@ -1,6 +1,6 @@
 diff -Nrbu mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c mail-notification-5.4-OK/build/src/mn-evolution-folder-tree-server.c
 --- mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c	2008-05-22 19:47:48.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-folder-tree-server.c	2010-09-17 17:45:05.000000000 +0400
++++ mail-notification-5.4-OK/build/src/mn-evolution-folder-tree-server.c	2010-10-12 16:50:15.000000000 +0400
 @@ -25,7 +25,10 @@
  #line 24 "src/mn-evolution-folder-tree-server.gob"
  
@@ -29,7 +29,7 @@ diff -Nrbu mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c mai
      gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree);
 diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notification-5.4-OK/build/src/mn-evolution-server.c
 --- mail-notification-5.4/build/src/mn-evolution-server.c	2008-05-22 19:47:48.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-server.c	2010-09-17 17:45:32.000000000 +0400
++++ mail-notification-5.4-OK/build/src/mn-evolution-server.c	2010-10-12 16:50:40.000000000 +0400
 @@ -27,10 +27,16 @@
  #include <stdio.h>
  #include <libintl.h>
@@ -92,7 +92,20 @@ diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notificati
  	  }
        }
      else
-@@ -595,14 +618,23 @@
+@@ -469,7 +492,11 @@
+ 
+     if (! folder)
+       {
+-	folder = mail_tool_uri_to_folder(uri, 0, NULL);
++	folder = mail_tool_uri_to_folder(uri, 0,
++#if EDS_CHECK_VERSION(2,91,0)
++	      NULL,
++#endif
++	      NULL);
+ 	if (folder)
+ 	  self_cache_folder(uri, folder);
+ 	else
+@@ -595,14 +622,23 @@
  
  	for (i = 0; i < summary->len; i++)
  	  {
@@ -116,7 +129,7 @@ diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notificati
        }
  
      GDK_THREADS_LEAVE();
-@@ -638,7 +670,11 @@
+@@ -638,7 +674,11 @@
      if (folder)
        {
  	*ret = g_strdup(camel_folder_get_name(folder));
@@ -128,7 +141,7 @@ diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notificati
        }
  
      GDK_THREADS_LEAVE();
-@@ -673,6 +709,19 @@
+@@ -673,6 +713,19 @@
      folder = self_lookup_folder(folder_uri, err);
      if (folder)
        {
@@ -148,7 +161,7 @@ diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notificati
  	GtkWidget *browser;
  
  	/* modelled after Evolution's handleuri_got_folder() */
-@@ -683,8 +732,13 @@
+@@ -683,8 +736,13 @@
  	em_folder_view_set_folder((EMFolderView *) browser, folder, folder_uri);
  	em_folder_view_set_message((EMFolderView *) browser, message_uid, FALSE);
  	gtk_widget_show(((EMMessageBrowser *) browser)->window);
@@ -162,7 +175,7 @@ diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notificati
        }
  
      GDK_THREADS_LEAVE();
-@@ -721,7 +775,11 @@
+@@ -721,7 +779,11 @@
      if (folder)
        {
  	status = camel_folder_set_message_flags(folder, message_uid, flags, flags);
@@ -176,7 +189,7 @@ diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notificati
  	  g_set_error(err,
 diff -Nrbu mail-notification-5.4/src/mn-evolution-plugin.c mail-notification-5.4-OK/src/mn-evolution-plugin.c
 --- mail-notification-5.4/src/mn-evolution-plugin.c	2008-05-22 19:45:35.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-evolution-plugin.c	2010-09-17 17:45:05.000000000 +0400
++++ mail-notification-5.4-OK/src/mn-evolution-plugin.c	2010-10-12 16:50:15.000000000 +0400
 @@ -204,7 +204,7 @@
  }
  
diff --git a/mail-notification.spec b/mail-notification.spec
index 7cedd31..7b5f4cf 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -203,6 +203,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 - fix popup window place
   (#608372, by Erik van Pienbroek <erik-fedora at vanpienbroek.nl>)
 - fix tray icon freezes on KDE when unread count reaches zero (#641580)
+- support evolution 2.90+ (#642158, <mcrha at redhat.com>)
 
 * Fri Sep 17 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-24
 - add support for evolution 2.31+