aboutsummaryrefslogtreecommitdiffstats
path: root/composer/e-composer-private.c
diff options
context:
space:
mode:
authorTomas Popela <tpopela@redhat.com>2014-07-15 16:59:08 +0800
committerTomas Popela <tpopela@redhat.com>2014-07-15 17:10:00 +0800
commitbf860b3f99d7588469f16acd10f7758889e11fd1 (patch)
tree215f7675da48658615e4ea7063f3b2152e390bfb /composer/e-composer-private.c
parent127d946dffef95579d68cb195ec0b06f6032fcd9 (diff)
downloadgsoc2013-evolution-bf860b3f99d7588469f16acd10f7758889e11fd1.tar
gsoc2013-evolution-bf860b3f99d7588469f16acd10f7758889e11fd1.tar.gz
gsoc2013-evolution-bf860b3f99d7588469f16acd10f7758889e11fd1.tar.bz2
gsoc2013-evolution-bf860b3f99d7588469f16acd10f7758889e11fd1.tar.lz
gsoc2013-evolution-bf860b3f99d7588469f16acd10f7758889e11fd1.tar.xz
gsoc2013-evolution-bf860b3f99d7588469f16acd10f7758889e11fd1.tar.zst
gsoc2013-evolution-bf860b3f99d7588469f16acd10f7758889e11fd1.zip
Bug 732608 - Composer paste issues
We have to treat the pasting into the normal and the quoted content separately. We have to also correctly process the new lines on the beginning/end of the pasted content to avoid their lose.
Diffstat (limited to 'composer/e-composer-private.c')
-rw-r--r--composer/e-composer-private.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index f36f217f4d..6b5ac2cce6 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -492,12 +492,11 @@ e_composer_paste_html (EMsgComposer *composer,
editor = e_msg_composer_get_editor (composer);
view = e_html_editor_get_view (editor);
editor_selection = e_html_editor_view_get_selection (view);
+ /* If Web View doesn't have focus, focus it */
+ if (!gtk_widget_has_focus (GTK_WIDGET (view)))
+ gtk_widget_grab_focus (GTK_WIDGET (view));
e_html_editor_selection_insert_html (editor_selection, html);
- e_html_editor_view_check_magic_links (view, FALSE);
- e_html_editor_view_force_spell_check (view);
-
- e_html_editor_selection_scroll_to_caret (editor_selection);
g_free (html);
return TRUE;
@@ -607,10 +606,6 @@ e_composer_paste_text (EMsgComposer *composer,
e_html_editor_selection_insert_text (editor_selection, text);
- e_html_editor_view_check_magic_links (view, FALSE);
- e_html_editor_view_force_spell_check (view);
- e_html_editor_selection_scroll_to_caret (editor_selection);
-
g_free (text);
return TRUE;