only execute idle function on button press.

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

3 files changed, 24 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index aa2d1bd5..40cc5f18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-01-27
 
+	* src/summaryview.c: summary_selection_changed(): only execute idle
+	  function on button press.
+
+2006-01-27
+
 	* src/summaryview.c: summary_selection_changed(): display message in
 	  idle function (fixes wrong drag begin state after passphrase dialog
 	  appeared).
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 761dd22d..014d4e85 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2006-01-27
 
+	* src/summaryview.c: summary_selection_changed(): ボタン押下中のみ
+	  idle 関数を実行するようにした。
+
+2006-01-27
+
 	* src/summaryview.c: summary_selection_changed(): idle 関数内で
 	  メッセージを表示するようにした(パスフレーズダイアログを表示した後
 	  誤ってドラッグ開始状態になるのを修正)。
diff --git a/src/summaryview.c b/src/summaryview.c
index 6cd7a325..b46f3a00 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5398,7 +5398,20 @@ static void summary_selection_changed(GtkTreeSelection *selection,
 		summaryview->display_msg = FALSE;
 		if (!gtkut_tree_row_reference_equal(summaryview->displayed,
 						    summaryview->selected)) {
-			g_idle_add(summary_display_msg_idle_func, summaryview);
+			if (summaryview->on_button_press) {
+				MsgInfo *msginfo;
+
+				gtk_tree_model_get(model, &iter,
+						   S_COL_MSG_INFO, &msginfo,
+						   -1);
+				if (MSG_IS_MIME(msginfo->flags))
+					g_idle_add
+						(summary_display_msg_idle_func,
+						 summaryview);
+				else
+					summary_display_msg(summaryview, &iter);
+			} else
+				summary_display_msg(summaryview, &iter);
 			return;
 		}
 	}