[evolution/gnome-2-30] Bug 620602 - Next/prev shortcuts should focus message list

[Matthew Barnes <mbarnes src gnome org>]

commit b7a9c695900163e0029cc72ad7000c28e112cbed
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jun 5 13:52:25 2010 -0400

    Bug 620602 - Next/prev shortcuts should focus message list

 mail/message-list.c                      |    6 ++++++
 modules/mail/e-mail-shell-view-private.c |    7 ++-----
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/mail/message-list.c b/mail/message-list.c
index c736108..69633a5 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -637,6 +637,12 @@ message_list_select(MessageList *ml, MessageListSelectDirection direction, guint
 	path = ml_search_path(ml, direction, flags, mask);
 	if (path) {
 		select_path(ml, path);
+
+		/* This function is usually called in response to a key
+		 * press, so grab focus if the message list is visible. */
+		if (gtk_widget_get_visible (GTK_WIDGET (ml)))
+			gtk_widget_grab_focus (GTK_WIDGET (ml));
+
 		return TRUE;
 	} else
 		return FALSE;
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index 2cc46da..54be642 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -304,19 +304,16 @@ mail_shell_view_scroll_cb (EMailShellView *mail_shell_view,
 	reader = E_MAIL_READER (mail_shell_view->priv->mail_shell_content);
 	message_list = e_mail_reader_get_message_list (reader);
 
-	if (scroll_type == GTK_SCROLL_PAGE_FORWARD) {
-		gtk_widget_grab_focus (message_list);
+	if (scroll_type == GTK_SCROLL_PAGE_FORWARD)
 		message_list_select (
 			MESSAGE_LIST (message_list),
 			MESSAGE_LIST_SELECT_NEXT,
 			0, CAMEL_MESSAGE_SEEN);
-	} else {
-		gtk_widget_grab_focus (message_list);
+	else
 		message_list_select (
 			MESSAGE_LIST (message_list),
 			MESSAGE_LIST_SELECT_PREVIOUS,
 			0, CAMEL_MESSAGE_SEEN);
-	}
 }
 
 static void