talons

commit 98d859a0e4ac457b8f06763bf1cc7a2800891440
parent e8ad1f4d7c84b3f6624ad69ab4d45c6ea7bd488f
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 12 Nov 2012 19:22:43 +0000

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"

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/messageview.c
 | 
6
+++++-

4 files changed, 13 insertions(+), 2 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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;
 }