[mail-notification] Evolution 3.4 and gtk3 compatibility fixes

[Erik van Pienbroek]

commit d50843d5ee85bfd062a2ac891894b27fd14f4935
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Apr 9 16:25:29 2012 +0200

    Evolution 3.4 and gtk3 compatibility fixes
    
    - Adding mailboxes was broken with evolution 3.4. Fixed
    - Various minor improvements in the gtk3 user interface

 mail-notification-5.4-evolution-3-0-support.patch |    6 +++-
 mail-notification-5.4-gtk3-support.patch          |   31 +++++++++++++++++++++
 mail-notification.spec                            |   25 +++++++++-------
 3 files changed, 50 insertions(+), 12 deletions(-)
---
diff --git a/mail-notification-5.4-evolution-3-0-support.patch b/mail-notification-5.4-evolution-3-0-support.patch
index 988b381..0cc1194 100644
--- a/mail-notification-5.4-evolution-3-0-support.patch
+++ b/mail-notification-5.4-evolution-3-0-support.patch
@@ -153,7 +153,7 @@
  #line 79 "mn-evolution-folder-tree-server.c"
  
  /*
-@@ -444,7 +455,13 @@
+@@ -444,7 +455,17 @@
  {
  #line 61 "src/mn-evolution-folder-tree-server.gob"
  	
@@ -163,7 +163,11 @@
 +    EShellBackend *shell_backend = e_shell_get_backend_by_name(shell, "mail");
 +    GtkWidget *browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend));
 +    EAlertSink *alert_sink = e_mail_reader_get_alert_sink(E_MAIL_READER(browser));
++#if EDS_CHECK_VERSION(3,4,0)
++    selfp->tree = em_folder_tree_new(e_mail_session_new(), alert_sink);
++#else
 +    selfp->tree = em_folder_tree_new(E_MAIL_BACKEND(shell_backend), alert_sink);
++#endif
 +#elif EDS_CHECK_VERSION(2,91,0)
      selfp->session = e_mail_session_new();
      selfp->tree = em_folder_tree_new(selfp->session);
diff --git a/mail-notification-5.4-gtk3-support.patch b/mail-notification-5.4-gtk3-support.patch
index 02feada..42c627e 100644
--- a/mail-notification-5.4-gtk3-support.patch
+++ b/mail-notification-5.4-gtk3-support.patch
@@ -1414,3 +1414,34 @@
  Terminal=false
  StartupNotify=true
  X-GNOME-DocPath=mail-notification/mail-notification.xml
+--- build/src/mn-mailbox-properties.c.orig	2012-04-09 15:49:18.093348313 +0200
++++ build/src/mn-mailbox-properties.c	2012-04-09 15:50:03.182466264 +0200
+@@ -457,7 +457,7 @@
+     GSList *l;
+ 
+     MN_LIST_FOREACH(l, selfp->general_sections)
+-      gtk_box_pack_start(GTK_BOX(MN_MAILBOX_PROPERTIES_DIALOG(properties->dialog)->general_vbox), l->data, FALSE, FALSE, 0);
++      gtk_box_pack_start(GTK_BOX(MN_MAILBOX_PROPERTIES_DIALOG(properties->dialog)->general_vbox), l->data, TRUE, TRUE, 0);
+   }}
+ #line 463 "mn-mailbox-properties.c"
+ #undef __GOB_FUNCTION__
+--- ui/properties-dialog.ui.orig	2012-04-06 16:04:55.392070305 +0200
++++ ui/properties-dialog.ui	2012-04-09 15:46:50.894046104 +0200
+@@ -37,6 +37,7 @@
+                       <object class="GtkVBox" id="vbox22">
+                         <property name="visible">True</property>
+                         <property name="spacing">6</property>
++                        <property name="expand">False</property>
+                         <child>
+                           <object class="GtkLabel" id="label36">
+                             <property name="visible">True</property>
+--- ui/mailbox-properties-dialog.ui.orig	2012-04-06 15:58:00.449269640 +0200
++++ ui/mailbox-properties-dialog.ui	2012-04-09 16:15:19.602051281 +0200
+@@ -31,6 +31,7 @@
+                   <object class="GtkVBox" id="vbox2">
+                     <property name="visible">True</property>
+                     <property name="spacing">6</property>
++                    <property name="expand">False</property>
+                     <child>
+                       <object class="GtkLabel" id="label2">
+                         <property name="visible">True</property>
diff --git a/mail-notification.spec b/mail-notification.spec
index c1d5466..ec79140 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        54%{?dist}
+Release:        55%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -89,6 +89,15 @@ Evolution support for Mail Notification.
 # Evolution 3.0 requires a patch as the pkgconfig names have changed
 # GTK3 requires various changes as well
 %if 0%{?fedora} >= 15
+
+# Convert the Glade UI to GtkBuilder
+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>'@@ mailbox-properties-dialog.ui
+sed -i s@'<property name="has_separator">False</property>'@@ properties-dialog.ui
+popd
+
 %patch9 -p0 -b .evolution30
 %patch10 -p0 -b .gtk3
 %endif
@@ -125,16 +134,6 @@ do
 done
 popd
 
-# Convert the Glade UI to GtkBuilder
-%if 0%{?fedora} >= 15
-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>'@@ mailbox-properties-dialog.ui
-sed -i s@'<property name="has_separator">False</property>'@@ properties-dialog.ui
-popd
-%endif
-
 #  Adapt to evolution 3.3.5 libemail changes
 %patch16 -p1 -b .libemail
 
@@ -240,6 +239,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %changelog
+* Mon Apr  9 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4-55
+- Adding mailboxes was broken with evolution 3.4. Fixed
+- Various minor improvements in the gtk3 user interface
+
 * Thu Apr  5 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4-54
 - Fixed a stack overflow which occured while verifying SSL certificates
   for POP3 and IMAP mailboxes. RHBZ #810054