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'

diff --git a/ChangeLog b/ChangeLog
index 6cf812a4640e9db33d13c44318d87021c405e3d4..c02744904c1639cdc9cd4b5c150594ed675bf48b 100644 (file)
--- 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
index afc468c7e7695e4bb49f18c66390c135cb7acdfa..ec82967ed233ba04f9ad7609498dd46ec94170cf 100644 (file)
--- 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
index 31e3bc597207df4b253b2ae59fa3d1ad45823ee4..f0d23e363cc475ddb764549d5d7982edbf8ada36 100644 (file)
--- 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
index 3c116fd535127dc432cf70bfadce33df046df8a2..9195590d90839d57bf85bc0f5f47b4480bb25fe4 100644 (file)
--- 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)) {