From: Colin Leroy Date: Sun, 28 Nov 2010 16:57:02 +0000 (+0000) Subject: 2010-11-28 [colin] 3.7.7cvs7 X-Git-Tag: rel_3_7_8~6 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d6502d5e4a4960d69be92568cc31720d0261a5d4 2010-11-28 [colin] 3.7.7cvs7 * src/gtk/quicksearch.c Fix bug #2313, 'CLI quicksearch sometimes returns the same messages twice'. Patch by Sebastien Bigaret --- diff --git a/ChangeLog b/ChangeLog index 8eccbe862..637a4f630 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-11-28 [colin] 3.7.7cvs7 + + * src/gtk/quicksearch.c + Fix bug #2313, 'CLI quicksearch sometimes returns + the same messages twice'. Patch by Sebastien Bigaret + 2010-11-25 [paul] 3.7.7cvs6 * src/prefs_common.c diff --git a/PATCHSETS b/PATCHSETS index edf7241f3..b26ea4dac 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4068,3 +4068,4 @@ ( cvs diff -u -r 1.382.2.560 -r 1.382.2.561 src/compose.c; ) > 3.7.7cvs4.patchset ( cvs diff -u -r 1.274.2.318 -r 1.274.2.319 src/mainwindow.c; ) > 3.7.7cvs5.patchset ( cvs diff -u -r 1.204.2.197 -r 1.204.2.198 src/prefs_common.c; ) > 3.7.7cvs6.patchset +( cvs diff -u -r 1.1.2.98 -r 1.1.2.99 src/gtk/quicksearch.c; ) > 3.7.7cvs7.patchset diff --git a/configure.ac b/configure.ac index 56c533f4b..c3653f907 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=7 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=6 +EXTRA_VERSION=7 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c index 123a47d77..95fb722f8 100644 --- a/src/gtk/quicksearch.c +++ b/src/gtk/quicksearch.c @@ -1597,9 +1597,10 @@ void search_msgs_in_folders(GSList **messages, QuickSearch* quicksearch, for (; node != NULL; node = node->next) { cur = FOLDER_ITEM(node->data); debug_print("in: %s\n",cur->path); - search_msgs_in_folder(messages, quicksearch, cur); if (cur->node->children) search_msgs_in_folders(messages, quicksearch, cur); + else + search_msgs_in_folder(messages, quicksearch, cur); } *messages = g_slist_reverse(*messages); }