aboutsummaryrefslogtreecommitdiffstats
path: root/composer/e-msg-composer.c
diff options
context:
space:
mode:
authorTomas Popela <tpopela@redhat.com>2014-06-25 17:41:04 +0800
committerTomas Popela <tpopela@redhat.com>2014-06-25 21:59:50 +0800
commit04bdc935dfa2df5006ca2d8f19b4aa83901506f1 (patch)
tree4084e35dc0a279a7f3c94516300e9ef757cf2546 /composer/e-msg-composer.c
parent93c1357da29c068d1418f8bd07b58b55d05f5c0b (diff)
downloadgsoc2013-evolution-04bdc935dfa2df5006ca2d8f19b4aa83901506f1.tar
gsoc2013-evolution-04bdc935dfa2df5006ca2d8f19b4aa83901506f1.tar.gz
gsoc2013-evolution-04bdc935dfa2df5006ca2d8f19b4aa83901506f1.tar.bz2
gsoc2013-evolution-04bdc935dfa2df5006ca2d8f19b4aa83901506f1.tar.lz
gsoc2013-evolution-04bdc935dfa2df5006ca2d8f19b4aa83901506f1.tar.xz
gsoc2013-evolution-04bdc935dfa2df5006ca2d8f19b4aa83901506f1.tar.zst
gsoc2013-evolution-04bdc935dfa2df5006ca2d8f19b4aa83901506f1.zip
Bug 731507 - [webkit-composer] paste does not work, shift-ins or CTRL-V works
Together with previous commit that removes the usage of deprecated gtk-stock items and unregistering the Ctrl+v shorcut this solves the issue. When the action is triggered and WebView doesn't have focus we have to focus it to insert the clipboard content there.
Diffstat (limited to 'composer/e-msg-composer.c')
-rw-r--r--composer/e-msg-composer.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index b81a764769..2489a2e137 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2422,8 +2422,10 @@ msg_composer_key_press_event (GtkWidget *widget,
return TRUE;
}
- if (((event)->state & GDK_SHIFT_MASK) &&
- ((event)->keyval == GDK_KEY_Insert)) {
+ if ((((event)->state & GDK_SHIFT_MASK) &&
+ ((event)->keyval == GDK_KEY_Insert)) ||
+ (((event)->state & GDK_CONTROL_MASK) &&
+ ((event)->keyval == GDK_KEY_v))) {
g_signal_emit_by_name (
WEBKIT_WEB_VIEW (view), "paste-clipboard");
return TRUE;