From f48d5f536e0de866eaa1894a96e172980171e765 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Wed, 16 Nov 2005 07:04:09 +0000
Subject: 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
---
 ChangeLog        | 5 +++++
 ChangeLog.ja     | 5 +++++
 src/folderview.c | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4ff8ebba..cc972ff2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 124d1cfc..7feb66f8 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+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;
-- 
cgit v1.2.3