From 98d859a0e4ac457b8f06763bf1cc7a2800891440 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 12 Nov 2012 19:22:43 +0000 Subject: [PATCH] 2012-11-12 [colin] 3.8.1cvs118 * src/messageview.c Fix initial focus on textview. Fixes bug #2776, "Make all menu shortcuts work properly in the message window" --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/messageview.c | 6 +++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a6dc2229e..4f03ab8cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-11-12 [colin] 3.8.1cvs118 + + * src/messageview.c + Fix initial focus on textview. Fixes bug #2776, + "Make all menu shortcuts work properly in the message window" + 2012-11-09 [colin] 3.8.1cvs117 * src/etpan/imap-thread.c diff --git a/PATCHSETS b/PATCHSETS index 6824fad26..6289f8403 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4492,3 +4492,4 @@ ( cvs diff -u -r 1.1.2.74 -r 1.1.2.75 src/plugins/pgpcore/sgpgme.c; ) > 3.8.1cvs115.patchset ( cvs diff -u -r 1.13.2.50 -r 1.13.2.51 src/common/socket.c; cvs diff -u -r 1.5.2.104 -r 1.5.2.105 src/gtk/gtkutils.c; ) > 3.8.1cvs116.patchset ( cvs diff -u -r 1.1.4.123 -r 1.1.4.124 src/etpan/imap-thread.c; ) > 3.8.1cvs117.patchset +( cvs diff -u -r 1.94.2.240 -r 1.94.2.241 src/messageview.c; ) > 3.8.1cvs118.patchset diff --git a/configure.ac b/configure.ac index b2080f8e4..c12aec8ce 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=117 +EXTRA_VERSION=118 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/messageview.c b/src/messageview.c index 088a129db..48ae56093 100644 --- a/src/messageview.c +++ b/src/messageview.c @@ -758,7 +758,6 @@ static MessageView *messageview_create_with_new_window_visible(MainWindow *mainw messageview_add_toolbar(msgview, window); if (show) { - gtk_widget_grab_focus(msgview->mimeview->textview->text); gtk_widget_show(window); } else { gtk_widget_realize(window); @@ -772,6 +771,11 @@ static MessageView *messageview_create_with_new_window_visible(MainWindow *mainw prefs_common.toolbar_style); messageview_init(msgview); + if (show) { + GTK_EVENTS_FLUSH(); + gtk_widget_grab_focus(msgview->mimeview->textview->text); + } + return msgview; } -- 2.25.1