rpms/mail-notification/devel mail-notification-5.4-evolution.patch, 1.1, 1.2 mail-notification.spec, 1.76, 1.77

[Dmitry Butskoy]

Author: buc

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6869

Modified Files:
	mail-notification-5.4-evolution.patch mail-notification.spec 
Log Message:
update evolution patch


mail-notification-5.4-evolution.patch:
 build/src/mn-evolution-folder-tree-server.c |    7 +++++++
 build/src/mn-evolution-server.c             |   25 +++++++++++++++++++++++++
 src/mn-evolution-plugin.c                   |    2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)

Index: mail-notification-5.4-evolution.patch
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification-5.4-evolution.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mail-notification-5.4-evolution.patch	1 Oct 2008 14:30:31 -0000	1.1
+++ mail-notification-5.4-evolution.patch	1 Feb 2010 17:58:17 -0000	1.2
@@ -21,3 +21,82 @@
  
  	    if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0)
  	      g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info));
+--- build/src/mn-evolution-folder-tree-server.c.evolution	2010-02-01 10:00:12.128683776 -0500
++++ build/src/mn-evolution-folder-tree-server.c	2010-02-01 10:02:32.809697243 -0500
+@@ -26,5 +26,8 @@
+ #include <dbus/dbus.h>
++#include <libedataserver/eds-version.h>
++#if !EDS_CHECK_VERSION(2,29,0)
+ #include <mail/mail-component.h>
++#endif
+ #include <mail/em-folder-tree.h>
+ #include "mn-evolution-plugin.h"
+ #include "mn-evolution.h"
+@@ -396,7 +399,11 @@ mn_evolution_folder_tree_server_construc
+ 	
++#if EDS_CHECK_VERSION(2,29,0)
++    selfp->tree = em_folder_tree_new();
++#else
+     EMFolderTreeModel *model;
+
+     model = mail_component_peek_tree_model(mail_component_peek());
+     selfp->tree = em_folder_tree_new_with_model(model);
++#endif
+ 
+     selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id);
+--- build/src/mn-evolution-server.c.evolution	2010-02-01 10:06:36.484698060 -0500
++++ build/src/mn-evolution-server.c	2010-02-01 10:09:01.946682081 -0500
+@@ -28,9 +28,14 @@
+ #include <gobject/gvaluecollector.h>
+ #include <libedataserver/eds-version.h>
+ #include <camel/camel-folder.h>
++#if EDS_CHECK_VERSION(2,29,0)
++#include <shell/e-shell.h>
++#include <mail/e-mail-browser.h>
++#else
+ #include <mail/em-folder-view.h>
+ #include <mail/em-format.h>
+ #include <mail/em-message-browser.h>
++#endif
+ #include <mail/em-utils.h>
+ #include <mail/mail-session.h>
+ #include <mail/mail-tools.h>
+@@ -568,6 +573,19 @@ mn_evolution_server_open_message (MNEvol
+     folder = self_lookup_folder(folder_uri, err);
+     if (folder)
+       {
++#if EDS_CHECK_VERSION(2,29,0)
++	EShell *shell;
++	EShellBackend *shell_backend;
++	GtkWidget *browser;
++
++	shell = e_shell_get_default ();
++	shell_backend = e_shell_get_backend_by_name (shell, "mail");
++
++	browser = e_mail_browser_new (shell_backend);
++	e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri);
++	e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
++	gtk_widget_show (browser);
++#else
+ 	GtkWidget *browser;
+ 
+ 	/* modelled after Evolution's handleuri_got_folder() */
+@@ -578,6 +596,7 @@ mn_evolution_server_open_message (MNEvol
+ 	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);
++#endif
+ 
+ 	camel_object_unref(folder);
+       }
+--- src/mn-evolution-plugin.c.evolution	2008-05-22 11:45:35.000000000 -0400
++++ src/mn-evolution-plugin.c	2010-02-01 11:52:06.141664757 -0500
+@@ -204,7 +204,7 @@ connect_to_session_bus (void)
+ }
+ 
+ int
+-e_plugin_lib_enable (EPluginLib *ep, int enable)
++e_plugin_lib_enable (EPlugin *ep, int enable)
+ {
+   static gboolean enabled = FALSE;
+   GError *err = NULL;


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- mail-notification.spec	22 Aug 2009 14:03:53 -0000	1.76
+++ mail-notification.spec	1 Feb 2010 17:58:17 -0000	1.77
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -185,6 +185,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 
 %changelog
+* Mon Feb  1 2010 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-17
+- update evolution patch (#538956, by Matthew Barnes <mbarnes at redhat.com>)
+
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 5.4-16
 - rebuilt with new openssl