From bb4fe1d492d93ce76b517c7bb6b27709c5b877fa Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Sat, 22 Sep 2012 08:34:40 -0700
Subject: [PATCH] backport fix for BGO #678408 (broken message display)

---
 evolution-3.5.92-flatten.patch | 40 ++++++++++++++++++++++++++++++++++
 evolution.spec                 |  9 +++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 evolution-3.5.92-flatten.patch

diff --git a/evolution-3.5.92-flatten.patch b/evolution-3.5.92-flatten.patch
new file mode 100644
index 0000000..509b394
--- /dev/null
+++ b/evolution-3.5.92-flatten.patch
@@ -0,0 +1,40 @@
+diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
+index b1d726d..520d0b1 100644
+--- a/widgets/misc/e-web-view.c
++++ b/widgets/misc/e-web-view.c
+@@ -578,26 +578,23 @@ web_view_navigation_policy_decision_requested_cb (EWebView *web_view,
+ }
+ 
+ static void
+-web_view_load_status_changed_cb (WebKitWebView *web_view,
++web_view_load_status_changed_cb (WebKitWebView *webkit_web_view,
+                                  GParamSpec *pspec,
+                                  gpointer user_data)
+ {
+ 	WebKitLoadStatus status;
+-	GtkAllocation allocation, allocation_copy;
++	EWebView *web_view;
+ 
+-	status = webkit_web_view_get_load_status (web_view);
++	status = webkit_web_view_get_load_status (webkit_web_view);
+ 	if (status != WEBKIT_LOAD_FINISHED)
+ 		return;
+ 
++	web_view = E_WEB_VIEW (webkit_web_view);
++	web_view_update_document_highlights (web_view);
++
+ 	/* Workaround webkit bug https://bugs.webkit.org/show_bug.cgi?id=89553 */
+-	gtk_widget_get_allocation (GTK_WIDGET (web_view), &allocation_copy);
+-	allocation = allocation_copy;
+-	allocation.width -= 10;
+-	allocation.height -= 10;
+-	gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation);
+-	gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation_copy);
+-
+-	web_view_update_document_highlights (E_WEB_VIEW (web_view));
++	e_web_view_zoom_in (web_view);
++	e_web_view_zoom_out (web_view);
+ }
+ 
+ static void
+
diff --git a/evolution.spec b/evolution.spec
index d6d73f1..9bf319a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -29,7 +29,7 @@
 
 Name: evolution
 Version: 3.5.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -49,6 +49,9 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch02: evolution-2.30.1-help-contents.patch
 
+# BGO #678408
+Patch03: evolution-3.5.92-flatten.patch
+
 ## Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -191,6 +194,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %setup -q -n evolution-%{version}
 %patch01 -p1 -b .ldaphack
 %patch02 -p1 -b .help-contents
+%patch03 -p1 -b .flatten
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -527,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Sep 22 2012 Adam Williamson <awilliam@redhat.com> - 3.5.92-3
+- backport fix for BGO #678408 (broken message display)
+
 * Wed Sep 19 2012 Kalev Lember <kalevlember@gmail.com> - 3.5.92-2
 - Fix evolution-NetworkManager obsoletes