[evolution/wip/webkit-composer: 847/966] EEditorActions: Fix response id for Open button in Insert->HTML File dialog

[Tomas Popela <tpopela src gnome org>]

commit d21ef0909753d5cf30553d79618be0af97ed7c48
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Feb 28 07:28:55 2014 +0100

    EEditorActions: Fix response id for Open button in Insert->HTML File dialog

 e-util/e-editor-actions.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/e-util/e-editor-actions.c b/e-util/e-editor-actions.c
index c06b346..d5364a9 100644
--- a/e-util/e-editor-actions.c
+++ b/e-util/e-editor-actions.c
@@ -468,7 +468,7 @@ action_insert_html_file_cb (GtkToggleAction *action,
                _("Insert HTML File"), NULL,
                GTK_FILE_CHOOSER_ACTION_OPEN,
                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-               GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
+               GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
 
        filter = gtk_file_filter_new ();
        gtk_file_filter_set_name (filter, _("HTML file"));
@@ -680,10 +680,14 @@ static void
 action_paste_cb (GtkAction *action,
                  EEditor *editor)
 {
+       EEditorWidget *widget = e_editor_get_editor_widget (editor);
+
        /* Paste only into WebView when it has focus */
-       if (gtk_widget_has_focus (GTK_WIDGET (e_editor_get_editor_widget (editor)))) {
+       if (gtk_widget_has_focus (GTK_WIDGET (widget))) {
                webkit_web_view_paste_clipboard (
-                       WEBKIT_WEB_VIEW (e_editor_get_editor_widget (editor)));
+                       WEBKIT_WEB_VIEW (widget));
+
+               e_editor_widget_force_spellcheck (widget);
        }
 }
 
@@ -693,6 +697,9 @@ action_paste_quote_cb (GtkAction *action,
 {
        e_editor_widget_paste_clipboard_quoted (
                e_editor_get_editor_widget (editor));
+
+       e_editor_widget_force_spellcheck (
+               e_editor_get_editor_widget (editor));
 }
 
 static void