[evolution] Bug 751309 - Message drop into composer body attached as file

[Milan Crha <mcrha src gnome org>]

commit 8cafaf50b5663d1d5da3063d22edf6eb88718de9
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jun 24 18:50:09 2015 +0200

    Bug 751309 - Message drop into composer body attached as file

 composer/e-msg-composer.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 819b233..2dc8225 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2352,6 +2352,9 @@ msg_composer_constructed (GObject *object)
        EHTMLEditorView *html_editor_view;
        GtkUIManager *ui_manager;
        GtkToggleAction *action;
+       GtkTargetList *target_list;
+       GtkTargetEntry *targets;
+       gint n_targets;
        GSettings *settings;
        const gchar *id;
        gboolean active;
@@ -2494,11 +2497,15 @@ msg_composer_constructed (GObject *object)
        /* Initialization may have tripped the "changed" state. */
        e_html_editor_view_set_changed (html_editor_view, FALSE);
 
-       gtk_target_list_add_table (
-               gtk_drag_dest_get_target_list (
-                       GTK_WIDGET (html_editor_view)),
-               drag_dest_targets,
-               G_N_ELEMENTS (drag_dest_targets));
+       target_list = e_attachment_view_get_target_list (view);
+       targets = gtk_target_table_new_from_list (target_list, &n_targets);
+
+       target_list = gtk_drag_dest_get_target_list (GTK_WIDGET (html_editor_view));
+
+       gtk_target_list_add_table (target_list, drag_dest_targets, G_N_ELEMENTS (drag_dest_targets));
+       gtk_target_list_add_table (target_list, targets, n_targets);
+
+       gtk_target_table_free (targets, n_targets);
 
        id = "org.gnome.evolution.composer";
        e_plugin_ui_register_manager (ui_manager, id, composer);