[mail-notification] Add support for evolution 2.91+

[epienbro]

commit 100efafd86824363a6d7227066c3aa639322bc08
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Nov 13 15:38:33 2010 +0100

    Add support for evolution 2.91+

 mail-notification-5.4-evolution.patch |   49 +++++++++++++++++++++++++++++++--
 mail-notification.spec                |    5 +++-
 2 files changed, 50 insertions(+), 4 deletions(-)
---
diff --git a/mail-notification-5.4-evolution.patch b/mail-notification-5.4-evolution.patch
index 647e64a..87514c2 100644
--- a/mail-notification-5.4-evolution.patch
+++ b/mail-notification-5.4-evolution.patch
@@ -12,11 +12,14 @@ diff -Nrbu mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c mai
  #include <mail/em-folder-tree.h>
  #include "mn-evolution-plugin.h"
  #include "mn-evolution.h"
-@@ -441,10 +444,14 @@
+@@ -441,10 +444,17 @@
  {
  #line 61 "src/mn-evolution-folder-tree-server.gob"
  	
-+#if EDS_CHECK_VERSION(2,29,0)
++#if 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)
 +    selfp->tree = em_folder_tree_new();
 +#else
      EMFolderTreeModel *model;
@@ -27,10 +30,21 @@ diff -Nrbu mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c mai
  
      selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id);
      gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree);
+@@ -469,6 +479,10 @@
+ {
+ #line 80 "src/mn-evolution-folder-tree-server.gob"
+ 	
++#if EDS_CHECK_VERSION(2,91,0)
++    g_object_unref(selfp->session);
++    selfp->session = NULL;
++#endif
+     g_signal_handlers_disconnect_by_func(selfp->plug, self_plug_destroy_h, self);
+   }}
+ #line 475 "mn-evolution-folder-tree-server.c"
 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-10-12 16:50:40.000000000 +0400
-@@ -27,10 +27,16 @@
+@@ -27,12 +27,22 @@
  #include <stdio.h>
  #include <libintl.h>
  #include <gobject/gvaluecollector.h>
@@ -45,8 +59,14 @@ diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notificati
  #include <mail/em-message-browser.h>
 +#endif
  #include <mail/em-utils.h>
++#if EDS_CHECK_VERSION(2,91,0)
++#include <mail/e-mail-session.h>
++#else
  #include <mail/mail-session.h>
++#endif
  #include <mail/mail-tools.h>
+ #include "mn-evolution.h"
+ #include "mn-evolution-folder-tree-server.h"
 @@ -391,10 +397,18 @@
      info = g_new0(FolderInfo, 1);
      info->uri = g_strdup(uri);
@@ -199,3 +219,26 @@ diff -Nrbu mail-notification-5.4/src/mn-evolution-plugin.c mail-notification-5.4
  {
    static gboolean enabled = FALSE;
    GError *err = NULL;
+--- mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h.orig	2010-11-13 13:55:01.571934066 +0100
++++ mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h	2010-11-13 13:56:07.019487418 +0100
+@@ -4,6 +4,10 @@
+ #define __MN_EVOLUTION_FOLDER_TREE_SERVER_PRIVATE_H__
+ 
+ #include "mn-evolution-folder-tree-server.h"
++#include <libedataserver/eds-version.h>
++#if EDS_CHECK_VERSION(2,91,0)
++#include <mail/e-mail-session.h>
++#endif
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -23,6 +23,9 @@
+ #line 41 "src/mn-evolution-folder-tree-server.gob"
+ 	GtkWidget * tree;
+ #line 26 "mn-evolution-folder-tree-server-private.h"
++#if EDS_CHECK_VERSION(2,91,0)
++       EMailSession * session;
++#endif
+ };
+ 
+ #ifdef __cplusplus
diff --git a/mail-notification.spec b/mail-notification.spec
index a6dbf0f..2666a2c 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        26%{?dist}
+Release:        27%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -199,6 +199,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
 
 %changelog
+* Sat Nov 13 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4-27
+- Add support for evolution 2.91+
+
 * Fri Nov 12 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-26
 - rebuild for new libnotify