talons

commit 4b775a2adb04bf2cd2eb174fb9a81ae48e58dcbf
parent 3b3041f530a981dd4815b02361fd6339f341978d
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 10 Jul 2009 07:18:52 +0000

2009-07-10 [colin]	3.7.2cvs5

	* src/folderview.c
		Fix bug 1952, 'Deleted mails in Queue folder
		highlight it'.

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/folderview.c
 | 
13
+++++++++++--

4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-10 [colin]	3.7.2cvs5
+
+	* src/folderview.c
+		Fix bug 1952, 'Deleted mails in Queue folder 
+		highlight it'.
+
 2009-07-09 [colin]	3.7.2cvs4
 
 	* src/gtk/spell_entry.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3829,3 +3829,4 @@
 ( cvs diff -u -r 1.16.2.37 -r 1.16.2.38 src/prefs_customheader.c;  ) > 3.7.2cvs2.patchset
 ( cvs diff -u -r 1.654.2.3896 -r 1.654.2.3897 configure.ac;  ) > 3.7.2cvs3.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/spell_entry.c;  ) > 3.7.2cvs4.patchset
+( cvs diff -u -r 1.207.2.213 -r 1.207.2.214 src/folderview.c;  ) > 3.7.2cvs5.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folderview.c b/src/folderview.c
@@ -1617,8 +1617,17 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
 	    folder_has_parent_of_type(item, F_TRASH)) {
 		use_bold = use_color = FALSE;
 	} else if (folder_has_parent_of_type(item, F_QUEUE)) {
-		/* highlight queue folder if there are any messages */
-		use_bold = use_color = (item->total_msgs > 0);
+		GSList *list = folder_item_get_msg_list(item);
+		GSList *cur;
+		use_bold = use_color = FALSE;
+		for (cur = list; cur; cur = cur->next) {
+			MsgInfo *msginfo = (MsgInfo *)cur->data;
+			if (!MSG_IS_DELETED(msginfo->flags)) {
+				/* highlight queue folder if there are any messages */
+				use_bold = use_color = TRUE;
+				break;
+			}
+		}
 	} else {
 		/* if unread messages exist, print with bold font */
 		use_bold = (item->unread_msgs > 0|| item->new_msgs > 0)