2012-09-22 [mir] 3.8.1cvs72

	* src/advsearch.c
	    Fix for not searching in folders marked 'no_select'
	    patch provide by colin.

diff --git a/ChangeLog b/ChangeLog
index 83131052954789ec3aa789f1d97ba7ac35919451..963fa663a6288ede8e4cd673b93fa333fdceb1e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-22 [mir]       3.8.1cvs72
+
+       * src/advsearch.c
+           Fix for not searching in folders marked 'no_select'
+           patch provide by colin.
+
 2012-09-22 [mones]     3.8.1cvs71
 
        * src/advsearch.c

diff --git a/PATCHSETS b/PATCHSETS
index 1185fad3cdea7ab80d005838ff57394c4aa0c0d0..97f5d35f76656403a970cb06c930ad9baacd2e41 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4446,3 +4446,4 @@
 ( cvs diff -u -r 1.1.2.112 -r 1.1.2.113 src/gtk/quicksearch.c;  ) > 3.8.1cvs69.patchset
 ( cvs diff -u -r 1.213.2.212 -r 1.213.2.213 src/folder.c;  ) > 3.8.1cvs70.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/advsearch.c;  ) > 3.8.1cvs71.patchset
+( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/advsearch.c;  ) > 3.8.1cvs72.patchset

diff --git a/configure.ac b/configure.ac
index cfa91b136810181fd56a7d8ce9f616a2a1f5da64..18dc3de7067ee5a058b56efd073ee283869bc4d9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=71
+EXTRA_VERSION=72
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/advsearch.c b/src/advsearch.c
index 08e6dd5cb8f8769842886165af501367c003518c..0e5ca69ffd24afe1fb47732e87b14ec39577bdeb 100644 (file)
--- a/src/advsearch.c
+++ b/src/advsearch.c
@@ -482,7 +482,7 @@ static gboolean search_impl(MsgInfoList **messages, AdvancedSearch* search,
                                        return FALSE;
                        }
                }
-       } else {
+       } else if (!folderItem->no_select) {
                MsgNumberList *msgnums = NULL;
                MsgNumberList *cur;
                MsgInfoList *msgs = NULL;