r3083 - in /unstable/evolution/debian: changelog patches/git_fix-reply-with-inline-images.patch patches/git_fix-saving-email-signatures.patch patches/series

Sat Oct 15 10:20:56 UTC 2016

Author: jbicha-guest
Date: Sat Oct 15 10:20:54 2016
New Revision: 3083

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=3083
Log:
Add 2 patches from 3.22 branch to fix regressions

Added:
    unstable/evolution/debian/patches/git_fix-reply-with-inline-images.patch
    unstable/evolution/debian/patches/git_fix-saving-email-signatures.patch
Modified:
    unstable/evolution/debian/changelog
    unstable/evolution/debian/patches/series

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=3083&op=diff
==============================================================================

--- unstable/evolution/debian/changelog	(original)
+++ unstable/evolution/debian/changelog	Sat Oct 15 10:20:54 2016
@@ -1,3 +1,14 @@
+evolution (3.22.1-2) UNRELEASED; urgency=medium
+
+  * Add git_fix-reply-with-inline-images.patch:
+    - Backport patch from 3.22 branch to fix replying to emails with
+      inline images. This was a regression introduced in 3.22.1.
+  * Add git_fix-saving-email-signatures.patch:
+    - Backport patch from 3.22 branch to fix adding or editing
+      email signatures
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Sat, 15 Oct 2016 06:18:19 -0400
+
 evolution (3.22.1-1) unstable; urgency=medium
 
   * New upstream release.

Added: unstable/evolution/debian/patches/git_fix-reply-with-inline-images.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/git_fix-reply-with-inline-images.patch?rev=3083&op=file
==============================================================================
--- unstable/evolution/debian/patches/git_fix-reply-with-inline-images.patch	(added)
+++ unstable/evolution/debian/patches/git_fix-reply-with-inline-images.patch	Sat Oct 15 10:20:54 2016
@@ -0,0 +1,24 @@
+From 94d226c1255c0fb08e3d3dde2f84d22c19b01752 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Thu, 13 Oct 2016 13:00:36 +0200
+Subject: Bug 772803 - Inline images cause busy loop on Reply in
+ WebKitWebProcess
+
+---
+ modules/webkit-editor/web-extension/e-editor-dom-functions.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+index 1d32565..6c90e21 100644
+--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c
++++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+@@ -8421,7 +8421,7 @@ change_cid_images_src_to_base64 (EEditorPage *editor_page)
+ 
+ 			list = webkit_dom_document_query_selector_all (
+ 				document, selector, NULL);
+-			for (jj = webkit_dom_node_list_get_length (list) - 1; jj--;) {
++			for (jj = webkit_dom_node_list_get_length (list); jj--;) {
+ 				WebKitDOMNode *node = webkit_dom_node_list_item (list, jj);
+ 
+ 				set_base64_to_element_attribute (
+

Added: unstable/evolution/debian/patches/git_fix-saving-email-signatures.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/git_fix-saving-email-signatures.patch?rev=3083&op=file
==============================================================================
--- unstable/evolution/debian/patches/git_fix-saving-email-signatures.patch	(added)
+++ unstable/evolution/debian/patches/git_fix-saving-email-signatures.patch	Sat Oct 15 10:20:54 2016
@@ -0,0 +1,34 @@
+From 77df5f4590c9cf0f63e1c0d376606ecc29258e04 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Wed, 12 Oct 2016 19:38:34 +0200
+Subject: Bug 772150 - Can't add or edit email signatures
+
+---
+ e-util/e-misc-utils.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/e-util/e-misc-utils.c b/e-util/e-misc-utils.c
+index 13ce806..ea22732 100644
+--- a/e-util/e-misc-utils.c
++++ b/e-util/e-misc-utils.c
+@@ -3798,6 +3798,7 @@ e_util_invoke_g_dbus_proxy_call_sync_wrapper_full (GDBusProxy *dbus_proxy,
+ {
+ 	GAsyncResult *async_result = NULL;
+ 	GVariant *var_result;
++	GMainContext *main_context;
+ 
+ 	g_return_val_if_fail (G_IS_DBUS_PROXY (dbus_proxy), NULL);
+ 	g_return_val_if_fail (method_name != NULL, NULL);
+@@ -3808,8 +3809,10 @@ e_util_invoke_g_dbus_proxy_call_sync_wrapper_full (GDBusProxy *dbus_proxy,
+ 		dbus_proxy, method_name, parameters, flags, timeout_msec, cancellable,
+ 		sync_wrapper_result_callback, &async_result);
+ 
++	main_context = g_main_context_get_thread_default ();
++
+ 	while (!async_result) {
+-		g_main_context_iteration (NULL, TRUE);
++		g_main_context_iteration (main_context, TRUE);
+ 	}
+ 
+ 	var_result = g_dbus_proxy_call_finish (dbus_proxy, async_result, error);
+

Modified: unstable/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/series?rev=3083&op=diff
==============================================================================
--- unstable/evolution/debian/patches/series	(original)
+++ unstable/evolution/debian/patches/series	Sat Oct 15 10:20:54 2016
@@ -1,2 +1,4 @@
 02_nss_paths.patch
 10_revert_libevolution_avoid-version.patch
+git_fix-reply-with-inline-images.patch
+git_fix-saving-email-signatures.patch


