don't show '+' (unread) mark even if unread messages are in Trash.

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

3 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ff8ebba..cc972ff2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-11-16
 
+	* src/folderview.c: folderview_search_unread_recursive(): don't show
+	  '+' (unread) mark even if unread messages are in Trash.
+
+2005-11-16
+
 	* src/summaryview.c: fixed a bug that the selection was broken (and
 	  sometimes crashed) when mark, unread, and colorlabel flags were
 	  changed while the summary was sorted by the flags.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 124d1cfc..7feb66f8 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2005-11-16
 
+	* src/folderview.c: folderview_search_unread_recursive(): 未読メッセー
+	  ジがごみ箱にあっても '+' (未読)マークを表示しないようにした。
+
+2005-11-16
+
 	* src/summaryview.c: サマリがマーク、未読、カラーラベルフラグでソート
 	  された状態でそれらが変更された場合、セレクションが壊れる(クラッシュ
 	  する場合もある)バグを修正。
diff --git a/src/folderview.c b/src/folderview.c
index 4cb0ceb8..8d88774a 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1032,6 +1032,8 @@ static gboolean folderview_search_unread_recursive(GtkTreeModel *model,
 	if (iter) {
 		gtk_tree_model_get(model, iter, COL_FOLDER_ITEM, &item, -1);
 		if (item) {
+			if (item->stype == F_TRASH)
+				return FALSE;
 			if (item->unread > 0 ||
 			    (item->stype == F_QUEUE && item->total > 0))
 				return TRUE;