[mail-notification] Fixed compatiblity with evolution 3.1

[epienbro]

commit 518052a05c2c299bdd75c3d24132f5de874c0a58
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun May 22 20:19:42 2011 +0200

    Fixed compatiblity with evolution 3.1
    
    - Fixed compatibility with evolution 3.1
    - Fixed an GTK3 warning
    - Clarified the need for the fallback icon patch as it turned out
      to be a regression introduced in gtk 2.21.8 (GNOME BZ #629878)

 mail-notification-5.4-evolution-3-0-support.patch |   27 +++++++++++++++++++++
 mail-notification.spec                            |   11 +++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/mail-notification-5.4-evolution-3-0-support.patch b/mail-notification-5.4-evolution-3-0-support.patch
index 51a0eb5..b3e818e 100644
--- a/mail-notification-5.4-evolution-3-0-support.patch
+++ b/mail-notification-5.4-evolution-3-0-support.patch
@@ -68,3 +68,30 @@
  	if (folder)
  	  self_cache_folder(uri, folder);
  	else
+@@ -677,7 +681,12 @@
+     folder = self_lookup_folder(folder_uri, err);
+     if (folder)
+       {
++#if EDS_CHECK_VERSION(3,1,0)
++	*ret = g_strdup(camel_folder_get_display_name(folder));
++#else
+ 	*ret = g_strdup(camel_folder_get_name(folder));
++#endif
++
+ #if EDS_CHECK_VERSION(2,31,0)
+ 	g_object_unref(folder);
+ #else
+@@ -725,8 +734,12 @@
+ 	shell = e_shell_get_default ();
+ 	shell_backend = e_shell_get_backend_by_name (shell, "mail");
+ 
+-	browser = e_mail_browser_new (shell_backend);
++	browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend));
++#if EDS_CHECK_VERSION(3,1,0)
++	e_mail_reader_set_folder (E_MAIL_READER (browser), folder);
++#else
+ 	e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri);
++#endif
+ 	e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
+ 	gtk_widget_show (browser);
+ #else
diff --git a/mail-notification.spec b/mail-notification.spec
index 40af56c..ac12aef 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        35%{?dist}
+Release:        36%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -95,6 +95,7 @@ Evolution support for Mail Notification.
 
 # Don't throw assertion errors (and a possible crash) when
 # some icons can't be found. Fixes RHBZ #654826
+# This is a temporary workaround until GNOME BZ #629878 is fixed
 %patch12 -p0 -b .fallback_icon
 
 #  Drop #line statements in C sources generated by .gob,
@@ -111,6 +112,8 @@ popd
 pushd ui
 gtk-builder-convert mailbox-properties-dialog.glade mailbox-properties-dialog.ui
 gtk-builder-convert properties-dialog.glade properties-dialog.ui
+sed -i s@'<property name="has_separator">False</property>'@@ ui/mailbox-properties-dialog.ui
+sed -i s@'<property name="has_separator">False</property>'@@ ui/properties-dialog.ui
 popd
 %endif
 
@@ -242,6 +245,12 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
 
 %changelog
+* Sun May 22 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4-36
+- Fixed compatibility with evolution 3.1
+- Fixed an GTK3 warning
+- Clarified the need for the fallback icon patch as it turned out
+  to be a regression introduced in gtk 2.21.8 (GNOME BZ #629878)
+
 * Wed May 11 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-35
 - rebuild for new evolution-data-server-3.1.1