talons

commit 412b3ba45d81cdeee3d99ff0b10f20258046c035
parent 1b18dccfa338acd6de389af9f6ad36de834ad5d4
Author: Colin Leroy <colin@colino.net>
Date:   Fri,  2 Jan 2009 18:55:15 +0000

2009-01-02 [colin]	3.7.0cvs12

	* src/folderview.c
		Fix (+) sign after collapsed folder names that
		have quicksearch-matching children.
		Fixes bug 1506, 'Recursive search in collapsed
		folders'

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

4 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-02 [colin]	3.7.0cvs12
+
+	* src/folderview.c
+		Fix (+) sign after collapsed folder names that 
+		have quicksearch-matching children.
+		Fixes bug 1506, 'Recursive search in collapsed 
+		folders'
+
 2009-01-02 [colin]	3.7.0cvs11
 
 	* src/stock_pixmap.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3673,3 +3673,4 @@
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/uri_opener.c;  ) > 3.7.0cvs9.patchset
 ( cvs diff -u -r 1.5.2.85 -r 1.5.2.86 src/gtk/gtkutils.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/claws-mail_icon.xpm;  ) > 3.7.0cvs10.patchset
 ( cvs diff -u -r 1.25.2.61 -r 1.25.2.62 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.38 -r 1.18.2.39 src/stock_pixmap.h;  ) > 3.7.0cvs11.patchset
+( cvs diff -u -r 1.207.2.208 -r 1.207.2.209 src/folderview.c;  ) > 3.7.0cvs12.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folderview.c b/src/folderview.c
@@ -1553,7 +1553,7 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
 							(add_unread_mark || add_sub_match_mark) ? "+" : "", 
 							(item->unreadmarked_msgs > 0) ? "!" : "");
 			}
-	} else {
+		} else {
 			if (prefs_common.display_folder_unread == 1) {
 				if (item->unread_msgs > 0) {
 					/* show unread number and signs */
@@ -1582,14 +1582,24 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
 		}
 	}
 	if (str == NULL) {
-		/* last fallback, folder name only or with ! sign */
-		str = g_strdup_printf("%s%s",
-					name, (item->unreadmarked_msgs > 0) ? " (!)" : "");
+		/* last fallback, folder name only or with +! sign */
+		if (item->unreadmarked_msgs > 0 && add_sub_match_mark) {
+			str = g_strdup_printf("%s%s",
+						name, " (+!)");
+		} else if (item->unreadmarked_msgs > 0) {
+			str = g_strdup_printf("%s%s",
+						name, " (!)");
+		} else if (add_sub_match_mark) {
+			str = g_strdup_printf("%s%s",
+						name, " (+)");
+		} else {
+			str = g_strdup_printf("%s", name);
+		}
 	}
-		gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
-					xpm, openxpm, 
-					FALSE, GTK_CMCTREE_ROW(node)->expanded);
-		g_free(str);
+	gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
+				xpm, openxpm, 
+				FALSE, GTK_CMCTREE_ROW(node)->expanded);
+	g_free(str);
 	g_free(name);
 
 	if (!folder_item_parent(item)) {