From: Michael Rasmussen Date: Sat, 22 Sep 2012 14:35:13 +0000 (+0000) Subject: 2012-09-22 [mir] 3.8.1cvs72 X-Git-Tag: REL_3_9_0~52 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=b64d8c298c3f7dfc8d600fda46a5afd41fca9359;ds=sidebyside 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 831310529..963fa663a 100644 --- 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 1185fad3c..97f5d35f7 100644 --- 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 cfa91b136..18dc3de70 100644 --- 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 08e6dd5cb..0e5ca69ff 100644 --- 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;