don't move focus from text view to summary view when displaying messages.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1991 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 16 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 783466bb..831fac94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-14
+
+	* src/summaryview.c: summary_display_msg_full(): don't move focus
+	  from text view to summary view.
+
 2008-05-08
 
 	* libsylph/prefs_common.[ch] 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 9ca67d51..b526a61d 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2008-05-14
+
+	* src/summaryview.c: summary_display_msg_full(): テキストビューから
+	  サマリビューへフォーカスを移さないようにした。
+
 2008-05-08
 
 	* libsylph/prefs_common.[ch]
diff --git a/src/summaryview.c b/src/summaryview.c
index e3bf6f2f..31e7d1f5 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2578,17 +2578,18 @@ static void summary_display_msg_full(SummaryView *summaryview,
 		val = messageview_show(msgview, msginfo, all_headers);
 	} else {
 		MessageView *msgview = summaryview->messageview;
+		gboolean prev_mimeview;
 
 		if (!messageview_is_visible(msgview)) {
 			main_window_toggle_message_view(summaryview->mainwin);
 			GTK_EVENTS_FLUSH();
 		}
+		prev_mimeview =
+			messageview_get_selected_mime_part(msgview) != NULL;
+
 		val = messageview_show(msgview, msginfo, all_headers);
-		if (msgview->type == MVIEW_TEXT ||
-		    (msgview->type == MVIEW_MIME &&
-		     (msgview->mimeview->opened == NULL ||
-		      gtk_notebook_get_current_page
-			(GTK_NOTEBOOK(msgview->notebook)) == 0)))
+		if (prev_mimeview &&
+		    !messageview_get_selected_mime_part(msgview))
 			gtk_widget_grab_focus(summaryview->treeview);
 	}