From 320b64d00d7341441f706eaf9aeb802b60978880 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Oct 13 2019 00:01:25 +0000
Subject: Merge fix for copy'n'paste from Emacs (#4257) rhbz#1760557


---

diff --git a/claws-mail-3.17.4-paste-from-emacs.patch b/claws-mail-3.17.4-paste-from-emacs.patch
new file mode 100644
index 0000000..f5386fb
--- /dev/null
+++ b/claws-mail-3.17.4-paste-from-emacs.patch
@@ -0,0 +1,12 @@
+diff -Naur claws-mail-3.17.4-orig/src/compose.c claws-mail-3.17.4/src/compose.c
+--- claws-mail-3.17.4-orig/src/compose.c	2019-07-07 11:06:21.000000000 +0200
++++ claws-mail-3.17.4/src/compose.c	2019-10-11 12:54:39.933991999 +0200
+@@ -11033,7 +11033,7 @@
+ 				  gboolean wrap, GdkAtom clip, GtkTextIter *insert_place)
+ {
+ 	if (GTK_IS_TEXT_VIEW(entry)) {
+-		GdkAtom types = gdk_atom_intern ("TARGETS", FALSE);
++		GdkAtom types = gdk_atom_intern ("MULTIPLE", FALSE);
+ 		GdkAtom *targets = NULL;
+ 		int n_targets = 0, i;
+ 		gboolean paste_done = FALSE;
diff --git a/claws-mail.spec b/claws-mail.spec
index 9ec763a..e90785f 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -11,7 +11,7 @@
 
 Name:           claws-mail
 Version:        3.17.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Email client and news reader based on GTK+
 License:        GPLv3+
 URL:            http://claws-mail.org
@@ -19,6 +19,8 @@ Source0:        http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{versio
 
 # rhbz#1179279
 Patch11:        claws-mail-system-crypto-policies.patch
+# rhbz#1760557
+Patch12: claws-mail-3.17.4-paste-from-emacs.patch
 
 # added 20190729
 %if 0%{?fedora} > 30
@@ -404,6 +406,8 @@ exporting of your meetings or all your calendars.
 %patch11 -p1 -b.syscrypto
 %endif
 
+%patch12 -p1 -b .paste-from-emacs
+
 # guard for pluginapi
 SOURCEAPI=$(grep -A 1 VERSION_NUMERIC src/common/version.h | tr -d '\n' | perl -ne 's/[\\\s]//g; m/(\d+),(\d+),(\d+),(\d+)/; print("$1.$2.$3.$4");')
 [ "%pluginapi" == "$SOURCEAPI" ] || exit -1
@@ -656,6 +660,9 @@ touch -r NEWS %{buildroot}%{_includedir}/%{name}/config.h
 
 
 %changelog
+* Fri Oct 11 2019 Michael Schwendt <mschwendt@fedoraproject.org> - 3.17.4-3
+- Merge fix for copy'n'paste from Emacs (#4257) rhbz#1760557
+
 * Sat Sep 14 2019 Michael Schwendt <mschwendt@fedoraproject.org> - 3.17.4-2
 - Add -dillo plugin to the claws-mail-plugins meta-package.