diff -up evolution-3.22.6/composer/e-composer-private.c.composer-image-insert-undo evolution-3.22.6/composer/e-composer-private.c

--- evolution-3.22.6/composer/e-composer-private.c.composer-image-insert-undo	2016-09-19 10:22:58.000000000 +0200

+++ evolution-3.22.6/composer/e-composer-private.c	2017-03-24 15:12:21.893422514 +0100

@@ -134,8 +134,6 @@ e_composer_private_constructed (EMsgComp

 	priv->disable_signature = FALSE;

 	priv->busy = FALSE;

 	priv->saved_editable = FALSE;

-	priv->drop_occured = FALSE;

-	priv->dnd_is_uri = FALSE;

 	priv->dnd_history_saved = FALSE;

 	priv->check_if_signature_is_changed = FALSE;

 	priv->ignore_next_signature_change = FALSE;

diff -up evolution-3.22.6/composer/e-composer-private.h.composer-image-insert-undo evolution-3.22.6/composer/e-composer-private.h

--- evolution-3.22.6/composer/e-composer-private.h.composer-image-insert-undo	2016-09-19 10:22:58.000000000 +0200

+++ evolution-3.22.6/composer/e-composer-private.h	2017-03-24 15:12:21.893422514 +0100

@@ -100,8 +100,6 @@ struct _EMsgComposerPrivate {

 	 * This is used to restore the previous editable state. */

 	gboolean saved_editable;

 	gboolean set_signature_from_message;

-	gboolean drop_occured;

-	gboolean dnd_is_uri;

 	gboolean is_sending_message;

 	gboolean dnd_history_saved;

 	gboolean check_if_signature_is_changed;

@@ -119,6 +117,8 @@ struct _EMsgComposerPrivate {

 	gulong notify_signature_uid_handler;

 	gulong notify_subject_handler;

 	gulong notify_subject_changed_handler;

+

+	gulong drag_data_received_handler_id;

 };

 void		e_composer_private_constructed	(EMsgComposer *composer);

diff -up evolution-3.22.6/composer/e-msg-composer.c.composer-image-insert-undo evolution-3.22.6/composer/e-msg-composer.c

--- evolution-3.22.6/composer/e-msg-composer.c.composer-image-insert-undo	2016-11-30 20:06:07.000000000 +0100

+++ evolution-3.22.6/composer/e-msg-composer.c	2017-03-24 15:12:21.894422514 +0100

@@ -105,24 +105,14 @@ enum {

 	LAST_SIGNAL

 };

-enum DndTargetType {

-	DND_TARGET_TYPE_TEXT_URI_LIST,

-	DND_TARGET_TYPE_MOZILLA_URL,

-	DND_TARGET_TYPE_TEXT_HTML,

-	DND_TARGET_TYPE_UTF8_STRING,

-	DND_TARGET_TYPE_TEXT_PLAIN,

-	DND_TARGET_TYPE_STRING,

-	DND_TARGET_TYPE_TEXT_PLAIN_UTF8

-};

-

 static GtkTargetEntry drag_dest_targets[] = {

-	{ (gchar *) "text/uri-list", 0, DND_TARGET_TYPE_TEXT_URI_LIST },

-	{ (gchar *) "_NETSCAPE_URL", 0, DND_TARGET_TYPE_MOZILLA_URL },

-	{ (gchar *) "text/html", 0, DND_TARGET_TYPE_TEXT_HTML },

-	{ (gchar *) "UTF8_STRING", 0, DND_TARGET_TYPE_UTF8_STRING },

-	{ (gchar *) "text/plain", 0, DND_TARGET_TYPE_TEXT_PLAIN },

-	{ (gchar *) "STRING", 0, DND_TARGET_TYPE_STRING },

-	{ (gchar *) "text/plain;charset=utf-8", 0, DND_TARGET_TYPE_TEXT_PLAIN_UTF8 },

+	{ (gchar *) "text/uri-list", 0, E_DND_TARGET_TYPE_TEXT_URI_LIST },

+	{ (gchar *) "_NETSCAPE_URL", 0, E_DND_TARGET_TYPE_MOZILLA_URL },

+	{ (gchar *) "text/html", 0, E_DND_TARGET_TYPE_TEXT_HTML },

+	{ (gchar *) "UTF8_STRING", 0, E_DND_TARGET_TYPE_UTF8_STRING },

+	{ (gchar *) "text/plain", 0, E_DND_TARGET_TYPE_TEXT_PLAIN },

+	{ (gchar *) "STRING", 0, E_DND_TARGET_TYPE_STRING },

+	{ (gchar *) "text/plain;charset=utf-8", 0, E_DND_TARGET_TYPE_TEXT_PLAIN_UTF8 },

 };

 static guint signals[LAST_SIGNAL];

@@ -1784,160 +1774,6 @@ msg_composer_paste_clipboard_cb (EConten

 	return TRUE;

 }

-#if 0 /* FIXME WK2 */

-static gboolean

-msg_composer_drag_motion_cb (GtkWidget *widget,

-                             GdkDragContext *context,

-                             gint x,

-                             gint y,

-                             guint time,

-                             EMsgComposer *composer)

-{

-	GtkWidget *source_widget;

-	EHTMLEditor *editor = e_msg_composer_get_editor (composer);

-	EHTMLEditorView *editor_view = e_html_editor_get_view (editor);

-

-	source_widget = gtk_drag_get_source_widget (context);

-	/* When we are doind DnD just inside the web view, the DnD is supposed

-	 * to move things around. */

-	if (E_IS_HTML_EDITOR_VIEW (source_widget)) {

-		if ((gpointer) editor_view == (gpointer) source_widget) {

-			gdk_drag_status (context, GDK_ACTION_MOVE, time);

-

-			return FALSE;

-		}

-	}

-

-	gdk_drag_status (context, GDK_ACTION_COPY, time);

-

-	return FALSE;

-}

-

-static gboolean

-msg_composer_drag_drop_cb (GtkWidget *widget,

-                           GdkDragContext *context,

-                           gint x,

-                           gint y,

-                           guint time,

-                           EMsgComposer *composer)

-{

-	GdkAtom target;

-	GtkWidget *source_widget;

-

-	/* When we are doing DnD just inside the web view, the DnD is supposed

-	 * to move things around. */

-	source_widget = gtk_drag_get_source_widget (context);

-	if (E_IS_HTML_EDITOR_VIEW (source_widget)) {

-		EHTMLEditor *editor = e_msg_composer_get_editor (composer);

-		EHTMLEditorView *editor_view = e_html_editor_get_view (editor);

-

-		if ((gpointer) editor_view == (gpointer) source_widget) {

-			GDBusProxy *web_extension;

-

-			web_extension = e_html_editor_view_get_web_extension_proxy (editor_view);

-			if (web_extension) {

-				e_util_invoke_g_dbus_proxy_call_sync_wrapper_with_error_check (

-					web_extension,

-					"DOMSaveDragAndDropHistory",

-					g_variant_new (

-						"(t)",

-						webkit_web_view_get_page_id (WEBKIT_WEB_VIEW (editor_view))),

-					NULL);

-			}

-			return FALSE;

-		}

-	}

-

-	target = gtk_drag_dest_find_target (widget, context, NULL);

-	if (target == GDK_NONE)

-		gdk_drag_status (context, 0, time);

-	else {

-		/* Prevent WebKit from pasting the URI of file into the view. Also

-		 * prevent it from inserting the text/plain or text/html content as we

-		 * want to insert it ourselves. */

-		if (composer->priv->dnd_is_uri || !E_IS_HTML_EDITOR_VIEW (source_widget))

-			g_signal_stop_emission_by_name (widget, "drag-drop");

-

-		composer->priv->dnd_is_uri = FALSE;

-

-		if (E_IS_HTML_EDITOR_VIEW (source_widget))

-			gdk_drag_status (context, GDK_ACTION_MOVE, time);

-		else

-			gdk_drag_status (context, GDK_ACTION_COPY, time);

-

-		composer->priv->drop_occured = TRUE;

-		gtk_drag_get_data (widget, context, target, time);

-

-		return TRUE;

-	}

-

-	return FALSE;

-}

-

-static void

-msg_composer_drag_data_received_after_cb (GtkWidget *widget,

-                                          GdkDragContext *context,

-                                          gint x,

-                                          gint y,

-                                          GtkSelectionData *selection,

-                                          guint info,

-                                          guint time,

-                                          EMsgComposer *composer)

-{

-	EHTMLEditor *editor;

-	EHTMLEditorView *view;

-	GDBusProxy *web_extension;

-

-	if (!composer->priv->drop_occured)

-		goto out;

-

-	/* Save just history for events handled by WebKit. */

-	if (composer->priv->dnd_history_saved)

-		goto out;

-

-	editor = e_msg_composer_get_editor (composer);

-	view = e_html_editor_get_view (editor);

-	web_extension = e_html_editor_view_get_web_extension_proxy (view);

-	if (!web_extension)

-		goto out;

-

-	e_util_invoke_g_dbus_proxy_call_sync_wrapper_with_error_check (

-		web_extension,

-		"DOMCleanAfterDragAndDrop",

-		g_variant_new (

-			"(t)",

-			webkit_web_view_get_page_id (WEBKIT_WEB_VIEW (view))),

-		NULL);

-

- out:

-	composer->priv->drop_occured = FALSE;

-	composer->priv->dnd_history_saved = FALSE;

-}

-

-static gchar *

-next_uri (guchar **uri_list,

-          gint *len,

-          gint *list_len)

-{

-	guchar *uri, *begin;

-

-	begin = *uri_list;

-	*len = 0;

-	while (**uri_list && **uri_list != '\n' && **uri_list != '\r' && *list_len) {

-		(*uri_list) ++;

-		(*len) ++;

-		(*list_len) --;

-	}

-

-	uri = (guchar *) g_strndup ((gchar *) begin, *len);

-

-	while ((!**uri_list || **uri_list == '\n' || **uri_list == '\r') && *list_len) {

-		(*uri_list) ++;

-		(*list_len) --;

-	}

-

-	return (gchar *) uri;

-}

 static void

 msg_composer_drag_data_received_cb (GtkWidget *widget,

@@ -1951,90 +1787,16 @@ msg_composer_drag_data_received_cb (GtkW

 {

 	EHTMLEditor *editor;

 	EContentEditor *cnt_editor;

-	gboolean html_mode, same_widget = FALSE;

-	GtkWidget *source_widget;

+	gboolean html_mode, is_move;

 	editor = e_msg_composer_get_editor (composer);

 	cnt_editor = e_html_editor_get_content_editor (editor);

 	html_mode = e_content_editor_get_html_mode (cnt_editor);

-	composer->priv->dnd_history_saved = TRUE;

-

-	/* When we are doing DnD just inside the web view, the DnD is supposed

-	 * to move things around. */

-	source_widget = gtk_drag_get_source_widget (context);

-	if (E_IS_CONTENT_EDITOR (source_widget) &&

-	    ((gpointer) cnt_editor == (gpointer) source_widget))

-		same_widget = TRUE;

-

-	/* Leave DnD inside the view on WebKit. */

-	if (composer->priv->drop_occured && same_widget) {

-		gdk_drag_status (context, 0, time);

-		return;

-	}

-

-	if (!composer->priv->drop_occured) {

-		if (!same_widget) {

-			/* Check if we are DnD'ing some URI, if so WebKit will

-			 * insert the URI into the view and we have to prevent it

-			 * from doing that. */

-			if (info == DND_TARGET_TYPE_TEXT_URI_LIST) {

-				gchar **uris;

-

-				uris = gtk_selection_data_get_uris (selection);

-				/* I don't know what regressed outside of Evo, but

-				 * this is called twice. Firstly with uris set

-				 * following by one with uris not set. */

-				if (!composer->priv->dnd_is_uri)

-					composer->priv->dnd_is_uri = uris != NULL;

-				g_strfreev (uris);

-			}

-		}

-		return;

-	}

+	g_signal_handler_disconnect (cnt_editor, composer->priv->drag_data_received_handler_id);

+	composer->priv->drag_data_received_handler_id = 0;

-	composer->priv->dnd_is_uri = FALSE;

-

-	/* Leave the text on WebKit to handle it. */

-	if (info == DND_TARGET_TYPE_UTF8_STRING ||

-	    info == DND_TARGET_TYPE_STRING ||

-	    info == DND_TARGET_TYPE_TEXT_PLAIN ||

-	    info == DND_TARGET_TYPE_TEXT_PLAIN_UTF8) {

-		composer->priv->dnd_history_saved = FALSE;

-		gdk_drag_status (context, 0, time);

-		return;

-	}

-

-	if (info == DND_TARGET_TYPE_TEXT_HTML) {

-		const guchar *data;

-		gint length;

-		gint list_len, len;

-		gchar *text;

-

-		data = gtk_selection_data_get_data (selection);

-		length = gtk_selection_data_get_length (selection);

-

-		if (!data || length < 0) {

-			gtk_drag_finish (context, FALSE, FALSE, time);

-			return;

-		}

-

-		e_content_editor_move_caret_on_coordinates (cnt_editor, x, y, FALSE);

-

-		list_len = length;

-		do {

-			text = next_uri ((guchar **) &data, &len, &list_len);

-			e_content_editor_insert_content (

-				cnt_editor,

-				text,

-				E_CONTENT_EDITOR_INSERT_TEXT_HTML);

-			g_free (text);

-		} while (list_len);

-

-		gtk_drag_finish (context, TRUE, FALSE, time);

-

-		return;

-	}

+	is_move = gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE;

 	/* HTML mode has a few special cases for drops... */

 	/* If we're receiving URIs and -all- the URIs point to

@@ -2060,12 +1822,12 @@ msg_composer_drag_data_received_cb (GtkW

 		list_len = length;

 		do {

-			uri = next_uri ((guchar **) &data, &len, &list_len);

+			uri = e_util_next_uri_from_uri_list ((guchar **) &data, &len, &list_len);

 			e_content_editor_insert_image (cnt_editor, uri);

 			g_free (uri);

 		} while (list_len);

-		gtk_drag_finish (context, TRUE, FALSE, time);

+		gtk_drag_finish (context, TRUE, is_move, time);

 	} else {

 		EAttachmentView *attachment_view =

 			e_msg_composer_get_attachment_view (composer);

@@ -2078,7 +1840,43 @@ msg_composer_drag_data_received_cb (GtkW

 			context, x, y, selection, info, time);

 	}

 }

-#endif

+

+static gboolean

+msg_composer_drag_drop_cb (GtkWidget *widget,

+                           GdkDragContext *context,

+                           gint x,

+                           gint y,

+                           guint time,

+                           EMsgComposer *composer)

+{

+	GdkAtom target = gtk_drag_dest_find_target (widget, context, NULL);

+

+	if (target == GDK_NONE) {

+		gdk_drag_status (context, 0, time);

+	} else {

+		composer->priv->drag_data_received_handler_id = g_signal_connect (

+			E_CONTENT_EDITOR (widget), "drag-data-received",

+			G_CALLBACK (msg_composer_drag_data_received_cb), composer);

+

+		gtk_drag_get_data (widget, context, target, time);

+

+		return TRUE;

+	}

+

+	return FALSE;

+}

+

+static void

+msg_composer_drag_begin_cb (GtkWidget *widget,

+                            GdkDragContext *context,

+                            EMsgComposer *composer)

+{

+	if (composer->priv->drag_data_received_handler_id != 0) {

+		g_signal_handler_disconnect (E_CONTENT_EDITOR( widget), composer->priv->drag_data_received_handler_id);

+		composer->priv->drag_data_received_handler_id = 0;

+	}

+}

+

 static void

 msg_composer_notify_header_cb (EMsgComposer *composer)

 {

@@ -2465,28 +2263,14 @@ msg_composer_constructed (GObject *objec

 		G_CALLBACK (msg_composer_paste_primary_clipboard_cb), composer);

 	/* Drag-and-Drop Support */

-#if 0 /* FIXME WK2 */

-	EHTMLEditorView *view;

-

-	view = e_html_editor_get_view (editor);

-

 	g_signal_connect (

-		view, "drag-motion",

-		G_CALLBACK (msg_composer_drag_motion_cb), composer);

-

-	 g_signal_connect (

-		view, "drag-drop",

+		cnt_editor, "drag-drop",

 		G_CALLBACK (msg_composer_drag_drop_cb), composer);

 	g_signal_connect (

-		view, "drag-data-received",

-		G_CALLBACK (msg_composer_drag_data_received_cb), composer);

+		cnt_editor, "drag-begin",

+		G_CALLBACK (msg_composer_drag_begin_cb), composer);

-	/* Used for fixing various stuff after WebKit processed the DnD data. */

-	g_signal_connect_after (

-		view, "drag-data-received",

-		G_CALLBACK (msg_composer_drag_data_received_after_cb), composer);

-#endif

 	g_signal_connect (

 		composer->priv->gallery_icon_view, "drag-data-get",

 		G_CALLBACK (msg_composer_gallery_drag_data_get), NULL);

@@ -5531,8 +5315,6 @@ e_msg_composer_restore_focus_on_composer

 	if (E_IS_CONTENT_EDITOR (widget)) {

 		EContentEditor *cnt_editor = E_CONTENT_EDITOR (widget);

-		/* FIXME WK2

-		e_html_editor_view_force_spell_check (view);*/

 		e_content_editor_selection_restore (cnt_editor);

 	}

diff -up evolution-3.22.6/e-util/e-attachment-view.c.composer-image-insert-undo evolution-3.22.6/e-util/e-attachment-view.c

--- evolution-3.22.6/e-util/e-attachment-view.c.composer-image-insert-undo	2016-09-19 10:22:58.000000000 +0200

+++ evolution-3.22.6/e-util/e-attachment-view.c	2017-03-24 15:12:21.894422514 +0100

@@ -39,6 +39,7 @@ enum {

 /* Note: Do not use the info field. */

 static GtkTargetEntry target_table[] = {

+	{ (gchar *) "text/uri-list", 0, 0 },

 	{ (gchar *) "_NETSCAPE_URL", 0, 0 }

 };

@@ -428,6 +429,125 @@ attachment_view_netscape_url (EAttachmen

 }

 static void

+attachment_view_uri_list (EAttachmentView *view,

+                          GdkDragContext *drag_context,

+                          gint x,

+                          gint y,

+                          GtkSelectionData *selection_data,

+                          guint info,

+                          guint time)

+{

+	static GdkAtom atom = GDK_NONE;

+	EAttachmentStore *store;

+	EAttachment *attachment;

+	const gchar *data;

+	gpointer parent;

+	gint length = 0, list_length = 0, uri_length = 0;

+	gchar *uri;

+

+

+	if (G_UNLIKELY (atom == GDK_NONE))

+		atom = gdk_atom_intern_static_string ("text/uri-list");

+

+	if (gtk_selection_data_get_target (selection_data) != atom)

+		return;

+

+	g_signal_stop_emission_by_name (view, "drag-data-received");

+

+	data = (const gchar *) gtk_selection_data_get_data (selection_data);

+	length = gtk_selection_data_get_length (selection_data);

+

+	if (!data || length < 0) {

+		gtk_drag_finish (drag_context, FALSE, FALSE, time);

+		return;

+	}

+

+	store = e_attachment_view_get_store (view);

+

+	parent = gtk_widget_get_toplevel (GTK_WIDGET (view));

+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;

+

+	list_length = length;

+	do {

+		uri = e_util_next_uri_from_uri_list ((guchar **) &data, &uri_length, &list_length);

+

+		if (strstr (uri, ";base64,")) {

+			/* base64 encoded data */

+			CamelMimePart *mime_part;

+			gchar *mime_type = NULL, *filename = NULL;

+			guchar *base64_data;

+			gsize base64_data_length;

+

+			if (g_str_has_prefix (uri, "data:")) {

+				const gchar *base64 = strstr (uri, ";") + 1;

+				/* strlen ("data:") == 5 */

+				mime_type = g_strndup (uri + 5, base64 - uri - 5 - 1);

+

+				base64 = strstr (base64, ",") + 1;

+				base64_data = g_base64_decode (base64, &base64_data_length);

+			} else if (strstr (uri, ";data")) {

+				/* CID attachment from mail preview that has

+				 * the filename prefixed before the base64 data -

+				 * see EMailDisplay. */

+				const gchar *base64 = strstr (uri, ";") + 1;

+				glong filename_length, mime_type_length, base64_length;

+

+				base64_length = g_utf8_strlen (base64, -1);

+

+				filename_length = uri_length - base64_length - 1;

+				filename = g_strndup (uri, filename_length);

+

+				/* strlen ("data:") == 5 */

+				mime_type_length = base64_length - g_utf8_strlen (strstr (base64, ";"), -1) - 5;

+				mime_type = g_strndup (uri + filename_length + 5 + 1, mime_type_length);

+

+				base64 = strstr (base64, ",") + 1;

+				base64_data = g_base64_decode (base64, &base64_data_length);

+			} else {

+				g_free (uri);

+				gtk_drag_finish (drag_context, FALSE, FALSE, time);

+				return;

+			}

+

+			mime_part = camel_mime_part_new ();

+

+			camel_mime_part_set_content (mime_part, (const gchar *) base64_data, base64_data_length, mime_type);

+			camel_mime_part_set_disposition (mime_part, "inline");

+			if (filename && *filename)

+				camel_mime_part_set_filename (mime_part, filename);

+			camel_mime_part_set_encoding (mime_part, CAMEL_TRANSFER_ENCODING_BASE64);

+

+			attachment = e_attachment_new ();

+			e_attachment_set_mime_part (attachment, mime_part);

+			e_attachment_store_add_attachment (store, attachment);

+			e_attachment_load_async (

+				attachment, (GAsyncReadyCallback)

+				call_attachment_load_handle_error, parent ? g_object_ref (parent) : NULL);

+

+			g_object_unref (attachment);

+			g_object_unref (mime_part);

+			if (mime_type)

+				g_free (mime_type);

+			if (filename)

+				g_free (filename);

+			g_free (base64_data);

+		} else {

+			/* regular URIs */

+			attachment = e_attachment_new_for_uri (uri);

+			e_attachment_store_add_attachment (store, attachment);

+			e_attachment_load_async (

+				attachment, (GAsyncReadyCallback)

+				call_attachment_load_handle_error, parent ? g_object_ref (parent) : NULL);

+			g_object_unref (attachment);

+		}

+

+		g_free (uri);

+	} while (list_length);

+

+	gtk_drag_finish (drag_context, TRUE, FALSE, time);

+}

+

+static void

 attachment_view_text_calendar (EAttachmentView *view,

                                GdkDragContext *drag_context,

                                gint x,

@@ -809,6 +929,10 @@ e_attachment_view_init (EAttachmentView

 	g_signal_connect (

 		view, "drag-data-received",

+		G_CALLBACK (attachment_view_uri_list), NULL);

+

+	g_signal_connect (

+		view, "drag-data-received",

 		G_CALLBACK (attachment_view_text_x_vcard), NULL);

 	g_signal_connect (

diff -up evolution-3.22.6/e-util/e-html-editor-dialog.h.composer-image-insert-undo evolution-3.22.6/e-util/e-html-editor-dialog.h

--- evolution-3.22.6/e-util/e-html-editor-dialog.h.composer-image-insert-undo	2016-09-19 10:22:58.000000000 +0200

+++ evolution-3.22.6/e-util/e-html-editor-dialog.h	2017-03-24 15:12:21.894422514 +0100

@@ -62,16 +62,6 @@ struct _EHTMLEditorDialogClass {

 	GtkWindowClass parent_class;

 };

-#if 0 /* FIXME WK2 */

-struct _EContentEditorDialogInterface {

-	GTypeInterface parent_interface;

-

-	void		(*dialog_opened)		(EContentEditorDialog *dialog);

-

-	void		(*dialog_closed)		(EContentEditorDialog *dialog);

-};

-#endif

-

 GType		e_html_editor_dialog_get_type	(void) G_GNUC_CONST;

 EHTMLEditor *	e_html_editor_dialog_get_editor	(EHTMLEditorDialog *dialog);

 GtkBox *	e_html_editor_dialog_get_button_box

diff -up evolution-3.22.6/e-util/e-misc-utils.c.composer-image-insert-undo evolution-3.22.6/e-util/e-misc-utils.c

--- evolution-3.22.6/e-util/e-misc-utils.c.composer-image-insert-undo	2017-01-18 11:36:05.000000000 +0100

+++ evolution-3.22.6/e-util/e-misc-utils.c	2017-03-24 15:12:21.894422514 +0100

@@ -3908,3 +3908,38 @@ e_util_get_webkit_developer_mode_enabled

 	return enabled != 0;

 }

+

+/**

+ * e_util_next_uri_from_uri_list:

+ * @uri_list: array of URIs separated by new lines

+ * @len: (out): a length of the found URI

+ * @list_len: (out): a length of the array

+ *

+ * Returns: A newly allocated string with found URI.

+ *

+ * Since: 3.26

+ **/

+gchar *

+e_util_next_uri_from_uri_list (guchar **uri_list,

+                               gint *len,

+                               gint *list_len)

+{

+	guchar *uri, *begin;

+

+	begin = *uri_list;

+	*len = 0;

+	while (**uri_list && **uri_list != '\n' && **uri_list != '\r' && *list_len) {

+		(*uri_list) ++;

+		(*len) ++;

+		(*list_len) --;

+	}

+

+	uri = (guchar *) g_strndup ((gchar *) begin, *len);

+

+	while ((!**uri_list || **uri_list == '\n' || **uri_list == '\r') && *list_len) {

+		(*uri_list) ++;

+		(*list_len) --;

+	}

+

+	return (gchar *) uri;

+}

diff -up evolution-3.22.6/e-util/e-misc-utils.h.composer-image-insert-undo evolution-3.22.6/e-util/e-misc-utils.h

--- evolution-3.22.6/e-util/e-misc-utils.h.composer-image-insert-undo	2017-01-18 11:36:05.000000000 +0100

+++ evolution-3.22.6/e-util/e-misc-utils.h	2017-03-24 15:12:21.894422514 +0100

@@ -332,6 +332,9 @@ void		e_util_save_file_chooser_folder	(G

 void		e_util_load_file_chooser_folder	(GtkFileChooser *file_chooser);

 gboolean	e_util_get_webkit_developer_mode_enabled

 						(void);

+gchar *		e_util_next_uri_from_uri_list	(guchar **uri_list,

+						 gint *len,

+						 gint *list_len);

 G_END_DECLS

diff -up evolution-3.22.6/e-util/e-util-enums.h.composer-image-insert-undo evolution-3.22.6/e-util/e-util-enums.h

--- evolution-3.22.6/e-util/e-util-enums.h.composer-image-insert-undo	2016-11-28 16:56:59.000000000 +0100

+++ evolution-3.22.6/e-util/e-util-enums.h	2017-03-24 15:12:21.894422514 +0100

@@ -548,6 +548,30 @@ typedef enum {

 	E_CLIPBOARD_CAN_PASTE	= 1 << 2 */

 } EClipboardFlags;

+/**

+ * EDnDTargetType:

+ * DND_TARGET_TYPE_TEXT_URI_LIST: text/uri-list

+ * DND_TARGET_TYPE_MOZILLA_URL: _NETSCAPE_URL

+ * DND_TARGET_TYPE_TEXT_HTML: text/html

+ * DND_TARGET_TYPE_UTF8_STRING: UTF8_STRING

+ * DND_TARGET_TYPE_TEXT_PLAIN: text/plain

+ * DND_TARGET_TYPE_STRING: STRING

+ * DND_TARGET_TYPE_TEXT_PLAIN_UTF8: text/plain;charser=utf-8

+ *

+ * Drag and drop targets supported by EContentEditor.

+ *

+ * Since: 3.26

+ **/

+typedef enum {

+	E_DND_TARGET_TYPE_TEXT_URI_LIST = 0,

+	E_DND_TARGET_TYPE_MOZILLA_URL,

+	E_DND_TARGET_TYPE_TEXT_HTML,

+	E_DND_TARGET_TYPE_UTF8_STRING,

+	E_DND_TARGET_TYPE_TEXT_PLAIN,

+	E_DND_TARGET_TYPE_STRING,

+	E_DND_TARGET_TYPE_TEXT_PLAIN_UTF8

+} EDnDTargetType;

+

 G_END_DECLS

 #endif /* E_UTIL_ENUMS_H */

diff -up evolution-3.22.6/e-util/e-web-view.c.composer-image-insert-undo evolution-3.22.6/e-util/e-web-view.c

--- evolution-3.22.6/e-util/e-web-view.c.composer-image-insert-undo	2017-01-27 12:06:11.000000000 +0100

+++ evolution-3.22.6/e-util/e-web-view.c	2017-03-24 15:12:21.895422514 +0100

@@ -2386,11 +2386,7 @@ e_web_view_init (EWebView *web_view)

 	g_signal_connect (

 		web_view, "load-changed",

 		G_CALLBACK (web_view_load_changed_cb), NULL);

-/* FIXME WK2

-	g_signal_connect (

-		web_view, "document-load-finished",

-		G_CALLBACK (style_updated_cb), NULL);

-*/

+

 	g_signal_connect (

 		web_view, "style-updated",

 		G_CALLBACK (style_updated_cb), NULL);

diff -up evolution-3.22.6/e-util/test-html-editor-units.c.composer-image-insert-undo evolution-3.22.6/e-util/test-html-editor-units.c

--- evolution-3.22.6/e-util/test-html-editor-units.c.composer-image-insert-undo	2017-03-24 15:12:21.888422514 +0100

+++ evolution-3.22.6/e-util/test-html-editor-units.c	2017-03-24 15:12:21.895422514 +0100

@@ -978,6 +978,8 @@ test_image_insert (TestFixture *fixture)

 	/* Mimic what the action:insert-image does, without invoking the image chooser dialog */

 	cnt_editor = e_html_editor_get_content_editor (fixture->editor);

 	e_content_editor_insert_image (cnt_editor, uri);

+	/* Wait some time until the operation is finished */

+	test_utils_wait_milliseconds (500);

 	g_free (uri);

@@ -991,6 +993,10 @@ test_image_insert (TestFixture *fixture)

 	g_free (image_data);

 	if (!test_utils_run_simple_test (fixture,

+		"undo:save\n" /* 1 */

+		"undo:undo\n"

+		"undo:redo\n"

+		"undo:test:1\n"

 		"type:+after\n",