rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

backport fix for BGO #678408 (broken message display)

Browse Source
This commit is contained in:
Adam Williamson 2012-09-22 08:34:40 -07:00
parent f5d514c4b7
commit bb4fe1d492
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
evolution-3.5.92-flatten.patch Normal file
View File

@ -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

9
evolution.spec
View File

@ -29,7 +29,7 @@
Name: evolution Name: evolution
Version: 3.5.92 Version: 3.5.92
Release: 2%{?dist} Release: 3%{?dist}
Group: Applications/Productivity Group: Applications/Productivity
Summary: Mail and calendar client for GNOME Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL License: GPLv2+ and GFDL
@ -49,6 +49,9 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
# RH bug #589555 # RH bug #589555
Patch02: evolution-2.30.1-help-contents.patch Patch02: evolution-2.30.1-help-contents.patch
# BGO #678408
Patch03: evolution-3.5.92-flatten.patch
## Dependencies ### ## Dependencies ###
Requires: gnome-icon-theme >= %{gnome_icon_theme_version} 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} %setup -q -n evolution-%{version}
%patch01 -p1 -b .ldaphack %patch01 -p1 -b .ldaphack
%patch02 -p1 -b .help-contents %patch02 -p1 -b .help-contents
%patch03 -p1 -b .flatten
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -527,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %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 * Wed Sep 19 2012 Kalev Lember <kalevlember@gmail.com> - 3.5.92-2
- Fix evolution-NetworkManager obsoletes - Fix evolution-NetworkManager obsoletes